compulab-pxa270_2.6.22.bb: fix issues caused by inclusion of linux.inc

the compulab kernel recipe has an extra task that is used to
create images with a special header.  This task needs to know
the image file name created in linux.inc

diff --git a/packages/linux/compulab-pxa270_2.6.22.bb b/packages/linux/compulab-pxa270_2.6.22.bb
index 31a925d..c1d0116 100644 (file)
--- a/packages/linux/compulab-pxa270_2.6.22.bb
+++ b/packages/linux/compulab-pxa270_2.6.22.bb
@@ -44,13 +44,12 @@ python do_compulab_image() {
        import struct
 
        deploy_dir = bb.data.getVar('DEPLOY_DIR_IMAGE', d, 1)
-       kernel_name = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGETYPE}-${MACHINE}.bin', d))
-
-       img_file = os.path.join(deploy_dir, 'zImage-compulab-pxa270.cmx270')
+       kernel_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.bin')
+       img_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.cmx270')
 
        fo = open(img_file, 'wb')
 
-       image_data = open(kernel_name, 'rb').read()
+       image_data = open(kernel_file, 'rb').read()
 
        # first write size into first 4 bytes
        size_s = struct.pack('i', len(image_data))
@@ -63,5 +62,5 @@ python do_compulab_image() {
        fo.close()
 }
 
-addtask compulab_image before do_install after do_deploy
+addtask compulab_image after do_deploy before do_package
 

diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index de4b2cc..2b7df69 100644 (file)
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -61,9 +61,11 @@ do_install_prepend() {
 
 UBOOT_ENTRYPOINT ?= "20008000"
 
+KERNEL_IMAGE_BASE_NAME = ${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}
+
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
         tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
         
         if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then