[oe-commits] org.oe.dev compulab-pxa270_2.6.22.bb: fix issues caused by inclusion of linux.inc

[cbrake commit]

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

Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: 28e211a115028722a89459761a92693f3a3c6678
ViewMTN: http://monotone.openembedded.org/revision.psp?id=28e211a115028722a89459761a92693f3a3c6678
Files:
1
packages/linux/compulab-pxa270_2.6.22.bb
packages/linux/linux.inc
Diffs:

#
# mt diff -rffb87c675fc71a778b13c725bd34f31c14cf334f -r28e211a115028722a89459761a92693f3a3c6678
#
# 
# 
# patch "packages/linux/compulab-pxa270_2.6.22.bb"
#  from [1bdb034c9f1a50b53b64d34bec8b58051d785b39]
#    to [1a80d7460ebc2607dd83a23a548a4a7c623f7aa9]
# 
# patch "packages/linux/linux.inc"
#  from [0d2a0276e1a47797b28ef11fe32b25b254898aa2]
#    to [c10bdb5404160b2e9ec7235b03d80a9825c27f77]
# 
============================================================
--- packages/linux/compulab-pxa270_2.6.22.bb	1bdb034c9f1a50b53b64d34bec8b58051d785b39
+++ packages/linux/compulab-pxa270_2.6.22.bb	1a80d7460ebc2607dd83a23a548a4a7c623f7aa9
@@ -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))
+	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')
 
-	img_file = os.path.join(deploy_dir, 'zImage-compulab-pxa270.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
 
============================================================
--- packages/linux/linux.inc	0d2a0276e1a47797b28ef11fe32b25b254898aa2
+++ packages/linux/linux.inc	c10bdb5404160b2e9ec7235b03d80a9825c27f77
@@ -61,9 +61,11 @@ UBOOT_ENTRYPOINT ?= "20008000"
 
 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