[meta-intel] [PATCH] core-image-tiny-initramfs: Fix returning values for WKS_FILE

Alejandro Hernandez alejandro.hernandez at linux.intel.com
Fri Jun 30 10:55:38 PDT 2017


Instead of setting the variable directly, we return the
correct value from the function which is then assigned
to WKS_FILE correctly for each Intel MACHINE

Signed-off-by: Alejandro Hernandez <alejandro.hernandez at linux.intel.com>
---
 common/recipes-core/images/core-image-tiny-initramfs.bbappend | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/recipes-core/images/core-image-tiny-initramfs.bbappend b/common/recipes-core/images/core-image-tiny-initramfs.bbappend
index bb1a477..ac5450c 100644
--- a/common/recipes-core/images/core-image-tiny-initramfs.bbappend
+++ b/common/recipes-core/images/core-image-tiny-initramfs.bbappend
@@ -1,10 +1,10 @@
 # Set WKS file depending on the MACHINE picked by the user
 def wks_intel(d):
     if d.getVar('MACHINE', True) == "intel-core2-32":
-        d.setVar('WKS_FILE', "systemd-bootdisk-tiny32.wks")
+        return "systemd-bootdisk-tiny32.wks"
     elif d.getVar('MACHINE', True) == "intel-corei7-64":
-        d.setVar('WKS_FILE', "systemd-bootdisk-tiny64.wks")
+        return "systemd-bootdisk-tiny64.wks"
     elif d.getVar('MACHINE', True) == "intel-quark":
-        d.setVar('WKS_FILE', "mktinygalileodisk.wks")
+        return "mktinygalileodisk.wks"
 
 WKS_FILE_poky-tiny ?= "${@wks_intel(d)}"
-- 
2.12.0



More information about the meta-intel mailing list