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"