[meta-ti] [PATCH] multi-kernel.inc: Change variable from config -> alt_config

Franklin S. Cooper Jr fcooperjr27 at gmail.com
Wed Jan 23 05:23:15 PST 2013


* Some where after the do_configure, kernel_do_compile, do_compile_kernelmodules
  and kernel_do_install inside of the compileconfigs task the variable config
  used in the for loop is set to an empty string.
* This results in the basename $config statements outputting a basename missing
  operand error which isn't a bitbake error but shows up in compileconfigs log.
* In the images directory you end up seeing similar files as below:
  config-am180x-evm..config ( should be config-am180x-evm.static.config)
  uImage-am180x-evm..bin ( should be uImage-am180x-evm.static.bin)
* This is due to basename $config returning "" instead of "static" when
  bitbaking linux-omapl138-psp_2.6.37.
* By simply renaming config to alt_config this issue is resolved.

Signed-off-by: Franklin S. Cooper Jr <fcooper at ti.com>
---
 recipes-kernel/linux/multi-kernel.inc |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/recipes-kernel/linux/multi-kernel.inc b/recipes-kernel/linux/multi-kernel.inc
index e5ebe56..52129ea 100644
--- a/recipes-kernel/linux/multi-kernel.inc
+++ b/recipes-kernel/linux/multi-kernel.inc
@@ -55,11 +55,11 @@ do_compileconfigs () {
       # Context Save the regular 'defconfig'
       cp ${WORKDIR}/defconfig ${WORKDIR}/defconfig.save
 
-      for config in ${WORKDIR}/configs/* ; do
+      for alt_config in ${WORKDIR}/configs/* ; do
 
         # Copy in alternative config
         cd ${S}
-        cp $config ${WORKDIR}/defconfig
+        cp $alt_config ${WORKDIR}/defconfig
 
         # Enable config to be viewed on the target
         echo "CONFIG_IKCONFIG=y" >> ${WORKDIR}/defconfig
@@ -73,23 +73,23 @@ do_compileconfigs () {
 
         # Drop the resulting images in the deploy dir
         install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).bin
+        install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).bin
 
         if [ -d "${D}/lib" ]; then
-            tar --owner=root --group=root -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz -C ${D} lib
+            tar --owner=root --group=root -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).tgz -C ${D} lib
         fi
  
         # Install the final config alongside the images
-        cp .config ${DEPLOY_DIR_IMAGE}/config-${PV}-${PR}-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).config
+        cp .config ${DEPLOY_DIR_IMAGE}/config-${PV}-${PR}-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).config
 
         # Create symlinks
         cd ${DEPLOY_DIR_IMAGE}
-        rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).bin
-        ln -sf ${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).bin ${KERNEL_IMAGE_SYMLINK_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).bin
-        rm -f modules-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz
-        ln -sf ${MODULES_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz modules-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).tgz
-        rm -f config-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).config
-        ln -sf config-${PV}-${PR}-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).config config-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $config).config
+        rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).bin
+        ln -sf ${KERNEL_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).bin ${KERNEL_IMAGE_SYMLINK_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).bin
+        rm -f modules-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).tgz
+        ln -sf ${MODULES_IMAGE_BASE_NAME}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).tgz modules-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).tgz
+        rm -f config-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).config
+        ln -sf config-${PV}-${PR}-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).config config-${MACHINE}.${MULTI_CONFIG_BASE_SUFFIX}$(basename $alt_config).config
 
       done
 
-- 
1.7.0.4




More information about the meta-ti mailing list