[oe-commits] org.oe.dev linux: changed way of adding uboot-mkimage dependency so #2926 should be fixed
hrw commit
openembedded-commits at lists.openembedded.org
Sun Sep 9 21:46:22 UTC 2007
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.
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 6cbf0719a581ec7faecefbc05b3c17d8b1b72d52
ViewMTN: http://monotone.openembedded.org/revision/info/6cbf0719a581ec7faecefbc05b3c17d8b1b72d52
Files:
1
packages/linux/linux.inc
packages/linux/linux_2.6.14.bb
packages/linux/linux_2.6.20.bb
packages/linux/linux_2.6.21+2.6.22-rc1.bb
packages/linux/linux_2.6.21.bb
packages/linux/linux_2.6.22+2.6.23-rc3.bb
packages/linux/linux_2.6.22+2.6.23-rc5.bb
packages/linux/linux_2.6.22.6.bb
packages/linux/linux_2.6.22.bb
Diffs:
#
# mt diff -r83398e1336b5456cc5a8661377b3819a02cc3ba2 -r6cbf0719a581ec7faecefbc05b3c17d8b1b72d52
#
#
#
# patch "packages/linux/linux.inc"
# from [4f5f493a73db7cb33ae34f7b5501c9bb911df71f]
# to [765d3116197b0c46da5dcf3c34176135b5a91ce8]
#
# patch "packages/linux/linux_2.6.14.bb"
# from [b82a29e8d88496dc90966389ceb094a394c9afcf]
# to [3a3f0815f16b7bd08c9bff9d7278936026353fc1]
#
# patch "packages/linux/linux_2.6.20.bb"
# from [a44fd7ebbe1c782aa31e032459cfc089faa8824a]
# to [c9c0fb4a79f677d6a06337462c943eddd2f07fae]
#
# patch "packages/linux/linux_2.6.21+2.6.22-rc1.bb"
# from [c49ff00b12fe1453b7e2ebaba5d987c524572d61]
# to [e497912c37fad59b88aa9b2428490ac7d5196042]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [51078603e68d6aece27414a9061c93e670e9a7f2]
# to [476d26ea7c5cbc48a8347d9c8d5297561b2ce2df]
#
# patch "packages/linux/linux_2.6.22+2.6.23-rc3.bb"
# from [f63ff8e509848ae02d7ff9d16a56f9b200db0082]
# to [739d31f6db7320580075eb3efdba2b6930435618]
#
# patch "packages/linux/linux_2.6.22+2.6.23-rc5.bb"
# from [6d4248bc7410ed21d853179d369590bb0d7ba20c]
# to [e60855cda933b78f1e64538dcd19ee73d05a728e]
#
# patch "packages/linux/linux_2.6.22.6.bb"
# from [497415bf6bade3adab18d538deb575786cca6f5f]
# to [33440b039d1b3f79c8cee378f99b407bc4ea9b53]
#
# patch "packages/linux/linux_2.6.22.bb"
# from [75d1a2f2d12313c50fdfb2b412412a7b675c00d0]
# to [15c369e83250f745d423185a59b28e705bdcaeee]
#
============================================================
--- packages/linux/linux.inc 4f5f493a73db7cb33ae34f7b5501c9bb911df71f
+++ packages/linux/linux.inc 765d3116197b0c46da5dcf3c34176135b5a91ce8
@@ -1,19 +1,20 @@ LICENSE = "GPL"
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 @@ UBOOT_ENTRYPOINT ?= "20008000"
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}
============================================================
--- packages/linux/linux_2.6.14.bb b82a29e8d88496dc90966389ceb094a394c9afcf
+++ packages/linux/linux_2.6.14.bb 3a3f0815f16b7bd08c9bff9d7278936026353fc1
@@ -1,14 +1,10 @@ LICENSE = "GPL"
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 \
============================================================
--- packages/linux/linux_2.6.20.bb a44fd7ebbe1c782aa31e032459cfc089faa8824a
+++ packages/linux/linux_2.6.20.bb c9c0fb4a79f677d6a06337462c943eddd2f07fae
@@ -1,10 +1,10 @@ DEFAULT_PREFERENCE_at91sam9260ek = "20"
require linux.inc
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"
============================================================
--- packages/linux/linux_2.6.21+2.6.22-rc1.bb c49ff00b12fe1453b7e2ebaba5d987c524572d61
+++ packages/linux/linux_2.6.21+2.6.22-rc1.bb e497912c37fad59b88aa9b2428490ac7d5196042
@@ -6,7 +6,7 @@ KERNEL_RELEASE = "2.6.22-rc1"
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 \
============================================================
--- packages/linux/linux_2.6.21.bb 51078603e68d6aece27414a9061c93e670e9a7f2
+++ packages/linux/linux_2.6.21.bb 476d26ea7c5cbc48a8347d9c8d5297561b2ce2df
@@ -1,10 +1,10 @@ DEFAULT_PREFERENCE_gumstix-verdex = "1"
require linux.inc
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 \
============================================================
--- packages/linux/linux_2.6.22+2.6.23-rc3.bb f63ff8e509848ae02d7ff9d16a56f9b200db0082
+++ packages/linux/linux_2.6.22+2.6.23-rc3.bb 739d31f6db7320580075eb3efdba2b6930435618
@@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.23-rc3"
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 \
============================================================
--- packages/linux/linux_2.6.22+2.6.23-rc5.bb 6d4248bc7410ed21d853179d369590bb0d7ba20c
+++ packages/linux/linux_2.6.22+2.6.23-rc5.bb e60855cda933b78f1e64538dcd19ee73d05a728e
@@ -1,16 +1,14 @@ DEFAULT_PREFERENCE_ts72xx = "-1"
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 \
============================================================
--- packages/linux/linux_2.6.22.6.bb 497415bf6bade3adab18d538deb575786cca6f5f
+++ packages/linux/linux_2.6.22.6.bb 33440b039d1b3f79c8cee378f99b407bc4ea9b53
@@ -1,9 +1,9 @@ DEFAULT_PREFERENCE_ts72xx = "1"
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 \
============================================================
--- packages/linux/linux_2.6.22.bb 75d1a2f2d12313c50fdfb2b412412a7b675c00d0
+++ packages/linux/linux_2.6.22.bb 15c369e83250f745d423185a59b28e705bdcaeee
@@ -1,10 +1,10 @@ DEFAULT_PREFERENCE_avr32 = "1"
require linux.inc
# Mark archs/machines that this kernel supports
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 \
More information about the Openembedded-commits
mailing list