summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-12-17 21:36:34 +0000
committerKoen Kooi <koen@openembedded.org>2007-12-17 21:36:34 +0000
commitd9850a24db5860ce7a56705271143e1d0de342bc (patch)
tree6bb44103f8331bf896cbc31895a7a76195181664
parentd5ba44aec1dd538a669c1efff72e8dc619e6d0db (diff)
linux.inc: merge in poky stuff
-rw-r--r--packages/linux/linux.inc15
1 files changed, 12 insertions, 3 deletions
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index a08c3a240b..345a2bd021 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -4,9 +4,18 @@ LICENSE = "GPL"
inherit kernel
-# Not every device needs mkimage to generate a kernel image, but lets make OE a bit more
-# friendly and increase the "Just Works(TM) factor. Building uboot takes only a minute.
-DEPENDS += " u-boot-mkimage-openmoko-native "
+# Add dependency on mkimage for kernels that build a uImage
+
+python __anonymous () {
+
+ import bb
+
+ kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or ''
+ if kerneltype == 'uImage':
+ depends = bb.data.getVar("DEPENDS", d, 1)
+ depends = "%s u-boot-mkimage-openmoko-native" % depends
+ bb.data.setVar("DEPENDS", depends, d)
+}
RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"