[oe-commits] org.oe.dev classes/kernen.bbclass: Fix INITRAMFS logic to stop breaking builds for people not using it

[rpurdie commit]

classes/kernen.bbclass: Fix INITRAMFS logic to stop breaking builds for people not using it

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 0380aa9196126ea1e9241c847b88948b972b0c3e
ViewMTN: http://monotone.openembedded.org/revision/info/0380aa9196126ea1e9241c847b88948b972b0c3e
Files:
1
classes/kernel.bbclass
Diffs:

#
# mt diff -r870d6ff572b3672311229555638ff02998a6a411 -r0380aa9196126ea1e9241c847b88948b972b0c3e
#
#
#
# patch "classes/kernel.bbclass"
#  from [13aa84ac4406f0f45d138d35e9fbdc894a567058]
#    to [7cbc09d4f4fd3e7051928da4ba4f8a6034393be9]
#
============================================================
--- classes/kernel.bbclass	13aa84ac4406f0f45d138d35e9fbdc894a567058
+++ classes/kernel.bbclass	7cbc09d4f4fd3e7051928da4ba4f8a6034393be9
@@ -17,10 +17,14 @@ python __anonymous () {
     	depends = "%s u-boot-mkimage-openmoko-native" % depends
     	bb.data.setVar("DEPENDS", depends, d)
 
-    if bb.data.getVar('INITRAMFS_IMAGE', d, True) != '':
-	bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d);
+    image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
+    if image != '' and image is not None:
+        bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
 }
 
+INITRAMFS_IMAGE ?= ""
+INITRAMFS_TASK ?= ""
+
 inherit kernel-arch
 
 PACKAGES_DYNAMIC += "kernel-module-*"