[oe-commits] org.oe.dev linux-handhelds-2.6: Factor out kernel filename to a variable, for easy global change.

[pfalcon commit]

linux-handhelds-2.6: Factor out kernel filename to a variable, for easy global change.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 7e81d54ca851f17b5d660fdd24a636d6a707992e
ViewMTN: http://monotone.openembedded.org/revision/info/7e81d54ca851f17b5d660fdd24a636d6a707992e
Files:
1
packages/linux/linux-handhelds-2.6.inc
Diffs:

#
# mt diff -r922e975c23d313c6ce3ea70e526118c6b0f352d8 -r7e81d54ca851f17b5d660fdd24a636d6a707992e
#
# 
# 
# patch "packages/linux/linux-handhelds-2.6.inc"
#  from [6e824f9a1190965d8dc6c9466ac0f0debb9e7852]
#    to [8fd391c5dea2011084315e312146757e2c5bfea7]
# 
============================================================
--- packages/linux/linux-handhelds-2.6.inc	6e824f9a1190965d8dc6c9466ac0f0debb9e7852
+++ packages/linux/linux-handhelds-2.6.inc	8fd391c5dea2011084315e312146757e2c5bfea7
@@ -23,6 +23,8 @@ KERNEL_PRIORITY = "${@'%d' % (int(bb.dat
 
 KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
 
+KERNEL_FILENAME = "${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}"
+
 do_configure() {
 
 	if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then
@@ -54,12 +56,12 @@ do_deploy() {
 
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME}
 
 	#reflash.ctl is required to reflash using bootldr
 	# format:
 	# name file md5sumfile destination
-	echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl
+	echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_FILENAME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl
 	gen_haret_startup
 }   
    
@@ -73,7 +75,7 @@ gen_haret_startup() {
 # This is startup file for HaRET, Linux bootloader for WinCE
 # http://handhelds.org/wiki/HaRET
 
-set kernel "${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}"
+set kernel "${KERNEL_FILENAME}"
 
 # Boot choices. Uncomment 'set' statements in exactly one section