[oe-commits] org.oe.dev linux.inc: merge in poky stuff

[koen commit]

linux.inc: merge in poky stuff

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 9e9f969634ee667e11e531b1eed2020d0c2369a1
ViewMTN: http://monotone.openembedded.org/revision/info/9e9f969634ee667e11e531b1eed2020d0c2369a1
Files:
1
packages/linux/linux.inc
Diffs:

#
# mt diff -r72261bebf3bcc785735847f4dbbfa8950cc86e05 -r9e9f969634ee667e11e531b1eed2020d0c2369a1
#
# 
# 
# patch "packages/linux/linux.inc"
#  from [74d6d33befb5063d39401bc7a2c8b089ced7e97c]
#    to [c2377d7cc726218e3c29b1d34e48ddc5e3e5c482]
# 
============================================================
--- packages/linux/linux.inc	74d6d33befb5063d39401bc7a2c8b089ced7e97c
+++ packages/linux/linux.inc	c2377d7cc726218e3c29b1d34e48ddc5e3e5c482
@@ -1,14 +1,23 @@ inherit kernel
 DESCRIPTION = "Linux Kernel"
 SECTION = "kernel"
 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"
 
 # Specify the commandline for your device