aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2018-02-16 13:36:34 +0100
committerRonan Le Martret <ronan.lemartret@iot.bzh>2018-02-16 13:52:24 +0100
commit48efd9e418834569f3d41a31e03dccfa9a6e0f27 (patch)
tree317ec83b8e2e042448c0cc419b6d25744b28fcca
parentce46674ac22406ef3c22112d4d86d0c3c37dc32a (diff)
[COMMUNITY] Fix build image conf
Change-Id: Ie83e15b8cec30927144df38444b1fb30ed7f0d6c Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
-rw-r--r--meta-rcar-gen3/conf/machine/h3ulcb.conf5
-rw-r--r--meta-rcar-gen3/conf/machine/m3ulcb.conf5
-rw-r--r--meta-rcar-gen3/conf/machine/salvator-x.conf5
3 files changed, 9 insertions, 6 deletions
diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf
index c6bdfb9..ef45a62 100644
--- a/meta-rcar-gen3/conf/machine/h3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf
@@ -18,8 +18,9 @@ MACHINE_FEATURES = "biglittle"
KERNEL_IMAGETYPE = "Image"
-# only if not already defined by distro or user!
-IMAGE_FSTYPES_append ?= " tar.bz2 ext4 cpio.gz"
+IMAGE_FSTYPES_append = " tar.bz2 ext4"
+#cpio do not support extended attribut, so cpio image when smack is used
+IMAGE_FSTYPES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'smack', '', 'cpio.gz', d)}"
SERIAL_CONSOLE = "115200 ttySC0"
diff --git a/meta-rcar-gen3/conf/machine/m3ulcb.conf b/meta-rcar-gen3/conf/machine/m3ulcb.conf
index 9301e2a..688b3d9 100644
--- a/meta-rcar-gen3/conf/machine/m3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/m3ulcb.conf
@@ -18,8 +18,9 @@ MACHINE_FEATURES = "biglittle"
KERNEL_IMAGETYPE = "Image"
-# only if not already defined by distro or user!
-IMAGE_FSTYPES_append = " tar.bz2 ext4 cpio.gz"
+IMAGE_FSTYPES_append = " tar.bz2 ext4"
+#cpio do not support extended attribut, so cpio image when smack is used
+IMAGE_FSTYPES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'smack', '', 'cpio.gz', d)}"
SERIAL_CONSOLE = "115200 ttySC0"
diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf
index f1b9c76..506a1be 100644
--- a/meta-rcar-gen3/conf/machine/salvator-x.conf
+++ b/meta-rcar-gen3/conf/machine/salvator-x.conf
@@ -16,8 +16,9 @@ MACHINE_FEATURES = "biglittle"
KERNEL_IMAGETYPE = "Image"
-# only if not already defined by distro or user!
-IMAGE_FSTYPES_append = " tar.bz2 ext4 cpio.gz"
+IMAGE_FSTYPES_append = " tar.bz2 ext4"
+#cpio do not support extended attribut, so cpio image when smack is used
+IMAGE_FSTYPES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'smack', '', 'cpio.gz', d)}"
SERIAL_CONSOLE = "115200 ttySC0"