linux: changed way of adding uboot-mkimage dependency so #2926 should be fixed

Something is wrong wen it comes to overrides and adding into variable - bug
#2966 opened.

9 files changed, 19 insertions, 24 deletions

diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 05bfc2f472..97adebf678 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -2,18 +2,19 @@ DESCRIPTION = "Linux Kernel"
 SECTION = "kernel"
 LICENSE = "GPL"
 
+inherit kernel
+
 # These devices need mkimage to generate a kernel image 
-DEPENDS_kb9202 = "u-boot-mkimage-openmoko-native"
-DEPENDS_at32stk1000 = "u-boot-mkimage-openmoko-native" 
-DEPENDS_atngw100 = "u-boot-mkimage-openmoko-native"
-DEPENDS_at91sam9263ek = "u-boot-mkimage-openmoko-native"
-DEPENDS_at91sam9261ek = "u-boot-mkimage-openmoko-native"
-DEPENDS_at91sam9260ek = "u-boot-mkimage-openmoko-native"
-DEPENDS_sarge-at91 = "u-boot-mkimage-openmoko-native"
-DEPENDS_gumstix-connex = "u-boot-mkimage-openmoko-native"
-DEPENDS_gumstix-verdex = "u-boot-mkimage-openmoko-native"
+DEPENDS_append_kb9202         = " u-boot-mkimage-openmoko-native "
+DEPENDS_append_at32stk1000    = " u-boot-mkimage-openmoko-native "
+DEPENDS_append_atngw100       = " u-boot-mkimage-openmoko-native "
+DEPENDS_append_at91sam9263ek  = " u-boot-mkimage-openmoko-native "
+DEPENDS_append_at91sam9261ek  = " u-boot-mkimage-openmoko-native "
+DEPENDS_append_at91sam9260ek  = " u-boot-mkimage-openmoko-native "
+DEPENDS_append_sarge-at91     = " u-boot-mkimage-openmoko-native "
+DEPENDS_append_gumstix-connex = " u-boot-mkimage-openmoko-native "
+DEPENDS_append_gumstix-verdex = " u-boot-mkimage-openmoko-native "
 
-inherit kernel
 
 # Specify the commandline for you device here:
 
@@ -63,7 +64,7 @@ do_install_prepend() {
 
 UBOOT_ENTRYPOINT ?= "20008000"
 
-KERNEL_IMAGE_BASE_NAME = ${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}
+KERNEL_IMAGE_BASE_NAME = ${KERNEL_IMAGETYPE}-${KERNEL_RELEASE}-${PR}-${MACHINE}-${DATETIME}
 
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
diff --git a/packages/linux/linux_2.6.14.bb b/packages/linux/linux_2.6.14.bb
index 85febb45d9..d625d15ebe 100644
--- a/packages/linux/linux_2.6.14.bb
+++ b/packages/linux/linux_2.6.14.bb
@@ -1,14 +1,10 @@
 DESCRIPTION = "Linux Kernel"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig"
 
-SRC_URI_append_progear = " \
-           file://progear_bl-r6.patch;patch=1 \
-	   "
 SRC_URI_append_acern30 = "\
            http://lechat.rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \
            http://lechat.rtp-net.org/ipaq/patches/2.6.14-3/full.patch;patch=1 \
diff --git a/packages/linux/linux_2.6.20.bb b/packages/linux/linux_2.6.20.bb
index 50defd306b..81033e09ee 100644
--- a/packages/linux/linux_2.6.20.bb
+++ b/packages/linux/linux_2.6.20.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "20"
 DEFAULT_PREFERENCE_at91sam9261ek = "20"
 DEFAULT_PREFERENCE_at91sam9260ek = "20"
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig"
diff --git a/packages/linux/linux_2.6.21+2.6.22-rc1.bb b/packages/linux/linux_2.6.21+2.6.22-rc1.bb
index faca5a88ec..35b2efe74a 100644
--- a/packages/linux/linux_2.6.21+2.6.22-rc1.bb
+++ b/packages/linux/linux_2.6.21+2.6.22-rc1.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1"
 KERNEL_VERSION = "2.6.22-rc1"
 KERNEL_RELEASE = "2.6.22-rc1"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc1.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb
index 15d2241563..2144dd28a1 100644
--- a/packages/linux/linux_2.6.21.bb
+++ b/packages/linux/linux_2.6.21.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1"
 DEFAULT_PREFERENCE_gumstix-connex = "1"
 DEFAULT_PREFERENCE_gumstix-verdex = "1"
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig \
diff --git a/packages/linux/linux_2.6.22+2.6.23-rc3.bb b/packages/linux/linux_2.6.22+2.6.23-rc3.bb
index 5671173672..618b6bf44a 100644
--- a/packages/linux/linux_2.6.22+2.6.23-rc3.bb
+++ b/packages/linux/linux_2.6.22+2.6.23-rc3.bb
@@ -8,7 +8,7 @@ BASE_KERNEL_VERSION = "2.6.22"
 KERNEL_VERSION = "2.6.23-rc3"
 KERNEL_RELEASE = "2.6.23-rc3"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${BASE_KERNEL_VERSION}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.22+2.6.23-rc5.bb b/packages/linux/linux_2.6.22+2.6.23-rc5.bb
index 5807335964..3165c39a11 100644
--- a/packages/linux/linux_2.6.22+2.6.23-rc5.bb
+++ b/packages/linux/linux_2.6.22+2.6.23-rc5.bb
@@ -3,14 +3,12 @@ require linux.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_ts72xx = "-1"
 
-PR = "r0"
+PR = "r1"
 
 BASE_KERNEL_VERSION = "2.6.22"
 KERNEL_VERSION = "2.6.23-rc5"
 KERNEL_RELEASE = "2.6.23-rc5"
 
-PR = "r0"
-
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${BASE_KERNEL_VERSION}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2;patch=1 \
            file://defconfig \
diff --git a/packages/linux/linux_2.6.22.6.bb b/packages/linux/linux_2.6.22.6.bb
index 2d0bb71c14..dfe1e2e8b1 100644
--- a/packages/linux/linux_2.6.22.6.bb
+++ b/packages/linux/linux_2.6.22.6.bb
@@ -3,7 +3,7 @@ require linux.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_ts72xx = "1"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.bz2;patch=1 \
diff --git a/packages/linux/linux_2.6.22.bb b/packages/linux/linux_2.6.22.bb
index 8674d63af2..64b57d3076 100644
--- a/packages/linux/linux_2.6.22.bb
+++ b/packages/linux/linux_2.6.22.bb
@@ -4,7 +4,7 @@ require linux.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_avr32 = "1"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            file://defconfig \