[oe-commits] org.oe.dev packages/linux: Remove uneeded KERNEL_RELEASE assignments and replace references with KERNEL_VERSION

rpurdie commit openembedded-commits at lists.openembedded.org
Sun Jan 7 12:03:09 UTC 2007


packages/linux: Remove uneeded KERNEL_RELEASE assignments and replace references with KERNEL_VERSION

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: d9e3217734b0c392bc59e7207ebeed7731679d0e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d9e3217734b0c392bc59e7207ebeed7731679d0e
Files:
1
packages/linux/ixp4xx-kernel.inc
packages/linux/linux-ezx_2.6.16.13.bb
packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
packages/linux/linux-omap1.inc
packages/linux/linux-omap1_2.6.12-rc2.bb
packages/linux/linux-omap1_2.6.18+git.bb
packages/linux/linux-omap1_2.6.18-omap1.bb
packages/linux/linux-omap1_2.6.19-omap1.bb
packages/linux/linux-omap1_2.6.x+git.bb
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.16.bb
packages/linux/linux-rp_2.6.17.bb
packages/linux/linux-rp_2.6.18.bb
packages/linux/linux-rp_2.6.19+git.bb
packages/linux/linux-rp_2.6.19.bb
packages/linux/linux-smdk2440_2.6.19.bb
packages/linux/linux-titan-sh4_2.6.17.bb
packages/linux/linux_2.6.19-rc6.bb
packages/linux/mx21ads-kernel_2.6.19rc6.bb
packages/linux/mx31ads-kernel_2.6.19rc6.bb
packages/linux/nslu2-kernel.inc
packages/linux/xanadux-un-2.6_2.6.12.bb
Diffs:

#
# mt diff -rba407b0dcad721b8fa5ba49b852b762a10b2515c -rd9e3217734b0c392bc59e7207ebeed7731679d0e
#
# 
# 
# patch "packages/linux/ixp4xx-kernel.inc"
#  from [645d4afee0b0aea7a56f2a9968ca2e139b129ae1]
#    to [aab482a396d80e6b2fad69188cacac35e1827930]
# 
# patch "packages/linux/linux-ezx_2.6.16.13.bb"
#  from [845f93288eed49a7d2658ef7290150e71a0d18b5]
#    to [df173125e95e0a9c972873207ca76ce74170b1c5]
# 
# patch "packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb"
#  from [af592404a4d713073fdaacb5c017705a6601cc24]
#    to [3959ca27f5a06b424f0bb1f9a59522912c2eb7c4]
# 
# patch "packages/linux/linux-omap1.inc"
#  from [cf5756ad939becb15d17bf98f0d233310cc00e93]
#    to [f0744f81cdefd19d09074314efcc9ac043d69ca5]
# 
# patch "packages/linux/linux-omap1_2.6.12-rc2.bb"
#  from [b77d0fd69d0371943f4df1f77b9aeca5b805243e]
#    to [cd9d635da72240bbc69053819b394b0c8bf4782d]
# 
# patch "packages/linux/linux-omap1_2.6.18+git.bb"
#  from [6acd48dcd96182162a7d75f6caa8cbb2568d7108]
#    to [dcf62d78b78691035502fc6e65e12e6dc70e651b]
# 
# patch "packages/linux/linux-omap1_2.6.18-omap1.bb"
#  from [e5a0991f87992ebb2b3dbdbdde95142a8c5d4389]
#    to [04c8fd35af30acdf90954b57642e710cf0e1bade]
# 
# patch "packages/linux/linux-omap1_2.6.19-omap1.bb"
#  from [14627f9133178980bca119b7ad1ed7c9c61a9f31]
#    to [243b871e9c49ae6d1b0ff9b186b5dc951e49da65]
# 
# patch "packages/linux/linux-omap1_2.6.x+git.bb"
#  from [1acfdc6661dd554254d367ffd808568df1f19007]
#    to [ef99e059b16307b6f44873a4e9e601e3aeafbaae]
# 
# patch "packages/linux/linux-rp.inc"
#  from [02dc082f4854a606c803550f8545eb1980f5d379]
#    to [bf11620c38f466d71f26b7366461a5adc750e1ee]
# 
# patch "packages/linux/linux-rp_2.6.16.bb"
#  from [ded273d16b9997fb8b8295a5df903f231d1dea44]
#    to [bf24a4a08cdcc8f1c0c0cae85a529716a68c5bcc]
# 
# patch "packages/linux/linux-rp_2.6.17.bb"
#  from [dee0c31d8885f1b6a602a613be4707fa54eacee9]
#    to [605ff67015c67059357925c4714371ab415c526c]
# 
# patch "packages/linux/linux-rp_2.6.18.bb"
#  from [1b632bcfdffb29aa6cc16a6bb2ee2868b4087d4c]
#    to [3479f86d298b3cca455973f0811b68e85b9443c2]
# 
# patch "packages/linux/linux-rp_2.6.19+git.bb"
#  from [8b57f8df531f410f9012de5ba12d0ac21a755d36]
#    to [0c99b587caa6b8df8dbe641141bd44ab5fa2370a]
# 
# patch "packages/linux/linux-rp_2.6.19.bb"
#  from [d5793a4946f168c5edcd991d9209dabd404c6149]
#    to [a7822c613528ea322809ddd9c15ab32aa9fad88e]
# 
# patch "packages/linux/linux-smdk2440_2.6.19.bb"
#  from [732b427fae341c7af4fc355ed41d56974a781561]
#    to [4e603b29487ad8d545c8dfbc4c06c21b82c2c706]
# 
# patch "packages/linux/linux-titan-sh4_2.6.17.bb"
#  from [cfa8fd2763c3db26808618c4b8c88bf225b57b17]
#    to [d5315d9dc6b4b96985679645597183975604389c]
# 
# patch "packages/linux/linux_2.6.19-rc6.bb"
#  from [3981510d3bca7d4164e37d33b7e5a2b683b7b695]
#    to [27656fa614bdff7e37a93577d4ae422fd6f759d6]
# 
# patch "packages/linux/mx21ads-kernel_2.6.19rc6.bb"
#  from [59028d64d06b985b626236c50b843da05646efd3]
#    to [24eb009ea0e49fa10db6e540534bac1bfc2dbf28]
# 
# patch "packages/linux/mx31ads-kernel_2.6.19rc6.bb"
#  from [0a2942d66fabb5333d9b3f8ae3c21d17ebb8c90e]
#    to [3d72af44b56a016d5a45b1713aaa56d8a9368038]
# 
# patch "packages/linux/nslu2-kernel.inc"
#  from [903f60ee2b57754f6c0ae1f5ec09ec0c9186cbc1]
#    to [18b7dcfd28d4c51c72da8119197e5ce90747d282]
# 
# patch "packages/linux/xanadux-un-2.6_2.6.12.bb"
#  from [a843b3003e2a00b1481a06b062363a9071e0c2e2]
#    to [b1126eb22ffa0d72291a165524d5f67b76fe1b32]
# 
============================================================
--- packages/linux/ixp4xx-kernel.inc	645d4afee0b0aea7a56f2a9968ca2e139b129ae1
+++ packages/linux/ixp4xx-kernel.inc	aab482a396d80e6b2fad69188cacac35e1827930
@@ -177,9 +177,6 @@ EXTRA_OEMAKE += "MAKEFLAGS='--no-print-d
 EXTRA_OEMAKE += "LOCALVERSION="
 EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'"
 
-# Override KERNEL_RELEASE from kernel.bbclass to match:
-KERNEL_RELEASE = "${KERNEL_VERSION}"
-
 # Set the correct CONFIG_CPU_xxx_ENDIAN and CONFIG_CMDLINE at the head
 # of the .config file and remove any settings in defconfig then append
 # defconfig to .config
@@ -238,7 +235,7 @@ do_configure_prepend() {
 # The generic package only includes the generic image, the other
 # packages are made below (they are kernel-image packages but
 # with a different ARCH).
-FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${IXP4XX_SUFFIX}-${KERNEL_RELEASE}"
+FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${IXP4XX_SUFFIX}-${KERNEL_VERSION}"
 
 # MACHINE DEFINITIONS: one block for each machine
 
@@ -248,12 +245,12 @@ DESCRIPTION_kernel-image-nslu2 = "Linux 
 PKG_kernel-image-nslu2 = "kernel-image-${KERNEL_VERSION}"
 PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${ARCH_BYTE_SEX}"
 DESCRIPTION_kernel-image-nslu2 = "Linux kernel for the LinkSys NSLU2"
-FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-nslu2 () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-nslu2 () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for Loft:
@@ -262,12 +259,12 @@ DESCRIPTION_kernel-image-loft = "Linux k
 PKG_kernel-image-loft = "kernel-image-${KERNEL_VERSION}"
 PACKAGE_ARCH_kernel-image-loft = "loft${ARCH_BYTE_SEX}"
 DESCRIPTION_kernel-image-loft = "Linux kernel for the Giant Shoulder Inc. Loft board"
-FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-loft () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-loft () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for the NAS100D board:
@@ -276,12 +273,12 @@ DESCRIPTION_kernel-image-nas100d = "Linu
 PKG_kernel-image-nas100d = "kernel-image-${KERNEL_VERSION}"
 PACKAGE_ARCH_kernel-image-nas100d = "nas100d${ARCH_BYTE_SEX}"
 DESCRIPTION_kernel-image-nas100d = "Linux kernel for the IOMega NAS100D"
-FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-nas100d () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-nas100d () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for the DSMG600 board:
@@ -290,12 +287,12 @@ DESCRIPTION_kernel-image-dsmg600 = "Linu
 PKG_kernel-image-dsmg600 = "kernel-image-${KERNEL_VERSION}"
 PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${ARCH_BYTE_SEX}"
 DESCRIPTION_kernel-image-dsmg600 = "Linux kernel for the D-Link DSM-G600"
-FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-dsmg600 () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-dsmg600 () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${ARCH_BYTE_SEX}-${KERNEL_VERSION} || true
 }
 
 # The correct settings for the FSG-3 board:
@@ -304,12 +301,12 @@ DESCRIPTION_kernel-image-fsg3 = "Linux k
 PKG_kernel-image-fsg3 = "kernel-image-${KERNEL_VERSION}"
 PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${ARCH_BYTE_SEX}"
 DESCRIPTION_kernel-image-fsg3 = "Linux kernel for the Freecom FSG-3"
-FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_RELEASE}"
+FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_VERSION}"
 pkg_postinst_kernel-image-fsg3 () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
 pkg_postrm_kernel-image-fsg3 () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true
+	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${ARCH_BYTE_SEX}-${KERNEL_VERSION} || true
 }
 
 #FIXUP: the correct instructions to copy the kernel prepended with the le fixup
@@ -346,13 +343,13 @@ install_image() {
 }
 
 install_image() {
-	copy_image '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-'"$1"'-${KERNEL_RELEASE}' "$2"
+	copy_image '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-'"$1"'-${KERNEL_VERSION}' "$2"
 }
 
 do_install_append() {
 	# Overwrite the unshimmed generic image with a shimmed one (but without
 	# any command line or machine id override).
-	rm -f '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_RELEASE}'
+	rm -f '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERISON}'
 	install_image '${IXP4XX_SUFFIX}'
 
 	# Add the machine specific images, with appropriate suffixes
============================================================
--- packages/linux/linux-ezx_2.6.16.13.bb	845f93288eed49a7d2658ef7290150e71a0d18b5
+++ packages/linux/linux-ezx_2.6.16.13.bb	df173125e95e0a9c972873207ca76ce74170b1c5
@@ -103,7 +103,7 @@ 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}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib
 }
 
 do_deploy[dirs] = "${S}"
============================================================
--- packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb	af592404a4d713073fdaacb5c017705a6601cc24
+++ packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb	3959ca27f5a06b424f0bb1f9a59522912c2eb7c4
@@ -20,7 +20,6 @@ KERNEL_IMAGETYPE = "zImage"
 
 ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
-KERNEL_RELEASE = "2.6.19-rc6"
 
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 
============================================================
--- packages/linux/linux-omap1.inc	cf5756ad939becb15d17bf98f0d233310cc00e93
+++ packages/linux/linux-omap1.inc	f0744f81cdefd19d09074314efcc9ac043d69ca5
@@ -26,7 +26,7 @@ do_deploy() {
                 install -d ${DEPLOY_DIR_IMAGE}
                 ${OBJCOPY} -O binary -R .note -R .comment -S ${KERNEL_OUTPUT} ${S}/linux.bin
                 gzip -f -9 ${S}/linux.bin
-                mkimage -A arm -O linux -T kernel -C gzip -a 0x10008000 -e 0x10008000 -n "OE" -d ${S}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_RELEASE}-${MACHINE}-${DATETIME}.bin
+                mkimage -A arm -O linux -T kernel -C gzip -a 0x10008000 -e 0x10008000 -n "OE" -d ${S}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}-${MACHINE}-${DATETIME}.bin
                 rm ${S}/linux.bin.gz
         fi
 }
============================================================
--- packages/linux/linux-omap1_2.6.12-rc2.bb	b77d0fd69d0371943f4df1f77b9aeca5b805243e
+++ packages/linux/linux-omap1_2.6.12-rc2.bb	cd9d635da72240bbc69053819b394b0c8bf4782d
@@ -7,5 +7,3 @@ S = "${WORKDIR}/linux-2.6.12-rc2"
 	   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.12-rc2"
-
-KERNEL_RELEASE = "2.6.12-rc2-omap1"
============================================================
--- packages/linux/linux-omap1_2.6.18+git.bb	6acd48dcd96182162a7d75f6caa8cbb2568d7108
+++ packages/linux/linux-omap1_2.6.18+git.bb	dcf62d78b78691035502fc6e65e12e6dc70e651b
@@ -7,5 +7,3 @@ S = "${WORKDIR}/git"
            file://defconfig"
 
 S = "${WORKDIR}/git"
-
-KERNEL_RELEASE = "2.6.18-omap1"
============================================================
--- packages/linux/linux-omap1_2.6.18-omap1.bb	e5a0991f87992ebb2b3dbdbdde95142a8c5d4389
+++ packages/linux/linux-omap1_2.6.18-omap1.bb	04c8fd35af30acdf90954b57642e710cf0e1bade
@@ -7,5 +7,3 @@ S = "${WORKDIR}/linux-2.6.18"
 	   file://defconfig.eabi"
 
 S = "${WORKDIR}/linux-2.6.18"
-
-KERNEL_RELEASE = "${PV}"
============================================================
--- packages/linux/linux-omap1_2.6.19-omap1.bb	14627f9133178980bca119b7ad1ed7c9c61a9f31
+++ packages/linux/linux-omap1_2.6.19-omap1.bb	243b871e9c49ae6d1b0ff9b186b5dc951e49da65
@@ -8,5 +8,3 @@ S = "${WORKDIR}/linux-2.6.19"
 	   file://defconfig.eabi"
 
 S = "${WORKDIR}/linux-2.6.19"
-
-KERNEL_RELEASE = "${PV}"
============================================================
--- packages/linux/linux-omap1_2.6.x+git.bb	1acfdc6661dd554254d367ffd808568df1f19007
+++ packages/linux/linux-omap1_2.6.x+git.bb	ef99e059b16307b6f44873a4e9e601e3aeafbaae
@@ -8,5 +8,3 @@ S = "${WORKDIR}/git"
            file://defconfig"
 
 S = "${WORKDIR}/git"
-
-KERNEL_RELEASE = "2.6.18-omap1"
============================================================
--- packages/linux/linux-rp.inc	02dc082f4854a606c803550f8545eb1980f5d379
+++ packages/linux/linux-rp.inc	bf11620c38f466d71f26b7366461a5adc750e1ee
@@ -194,7 +194,7 @@ do_deploy() {
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
 	rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
 	ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib	
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib	
 }
 
 do_deploy[dirs] = "${S}"
============================================================
--- packages/linux/linux-rp_2.6.16.bb	ded273d16b9997fb8b8295a5df903f231d1dea44
+++ packages/linux/linux-rp_2.6.16.bb	bf24a4a08cdcc8f1c0c0cae85a5297%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list