[meta-intel] [PATCH v2] core-image-tiny-initramfs: Fixes WKS_FILE for Intel MACHINES
Alejandro Hernandez
alejandro.hernandez at linux.intel.com
Fri Jun 30 15:31:54 PDT 2017
Since there could be a case on which meta-intel is parsed but no
Intel MACHINE is selected which would turn out in an error where
no value is assigned to WKS_FILE.
We set WKS_FILE directly and specifically for any of the available
Intel MACHINES, and otherwise we leave it as it is.
Signed-off-by: Alejandro Hernandez <alejandro.hernandez at linux.intel.com>
---
common/recipes-core/images/core-image-tiny-initramfs.bbappend | 9 +++++----
1 file changed, 5 insertions(+), 4 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..6fe2d7c 100644
--- a/common/recipes-core/images/core-image-tiny-initramfs.bbappend
+++ b/common/recipes-core/images/core-image-tiny-initramfs.bbappend
@@ -1,10 +1,11 @@
-# Set WKS file depending on the MACHINE picked by the user
-def wks_intel(d):
+# Set WKS file depending on the MACHINE picked by the user applies
+# only when using an Intel MACHINE, otherwise leaves it as it is.
+
+python (){
if d.getVar('MACHINE', True) == "intel-core2-32":
d.setVar('WKS_FILE', "systemd-bootdisk-tiny32.wks")
elif d.getVar('MACHINE', True) == "intel-corei7-64":
d.setVar('WKS_FILE', "systemd-bootdisk-tiny64.wks")
elif d.getVar('MACHINE', True) == "intel-quark":
d.setVar('WKS_FILE', "mktinygalileodisk.wks")
-
-WKS_FILE_poky-tiny ?= "${@wks_intel(d)}"
+}
--
2.12.0
More information about the meta-intel
mailing list