3 files changed, 16 insertions, 6 deletions
diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf
index 8e1c3fd..d029373 100644
--- a/meta-rcar-gen3/conf/machine/h3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf
@@ -17,7 +17,9 @@ USE_32BIT_MMP ?= "0"
 MACHINE_FEATURES = ""
 
 KERNEL_IMAGETYPE = "Image"
-IMAGE_FSTYPES_append = " tar.bz2 ext4"
+
+#cpio do not support extended attribut, so cpio image when smack is used
+IMAGE_FSTYPES ?= "tar.bz2 ext4 ${@bb.utils.contains('DISTRO_FEATURES', 'smack', '', 'cpio.gz', d)}"
 
 SERIAL_CONSOLE = "115200 ttySC0"
 
@@ -36,8 +38,9 @@ PREFERRED_VERSION_u-boot = "v2015.04%"
 EXTRA_IMAGEDEPENDS += " u-boot"
 UBOOT_MACHINE = "h3ulcb_defconfig"
 
-# libdrm
+# libdrm + mesa
 PREFERRED_VERSION_libdrm = "2.4.85"
+PREFERRED_VERSION_mesa = "17.%"
 
 # Add variable to Build Configuration in build log
 BUILDCFG_VARS_append = " SOC_FAMILY"
diff --git a/meta-rcar-gen3/conf/machine/m3ulcb.conf b/meta-rcar-gen3/conf/machine/m3ulcb.conf
index a864c29..b12d22e 100644
--- a/meta-rcar-gen3/conf/machine/m3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/m3ulcb.conf
@@ -17,7 +17,9 @@ USE_32BIT_MMP ?= "0"
 MACHINE_FEATURES = ""
 
 KERNEL_IMAGETYPE = "Image"
-IMAGE_FSTYPES_append = " tar.bz2 ext4"
+
+#cpio do not support extended attribut, so cpio image when smack is used
+IMAGE_FSTYPES ?= "tar.bz2 ext4 ${@bb.utils.contains('DISTRO_FEATURES', 'smack', '', 'cpio.gz', d)}"
 
 SERIAL_CONSOLE = "115200 ttySC0"
 
@@ -33,8 +35,9 @@ PREFERRED_VERSION_u-boot = "v2015.04%"
 EXTRA_IMAGEDEPENDS += " u-boot"
 UBOOT_MACHINE = "m3ulcb_defconfig"
 
-# libdrm
+# libdrm + mesa
 PREFERRED_VERSION_libdrm = "2.4.85"
+PREFERRED_VERSION_mesa = "17.%"
 
 # Add variable to Build Configuration in build log
 BUILDCFG_VARS_append = " SOC_FAMILY"
diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf
index 74bd180..132e66c 100644
--- a/meta-rcar-gen3/conf/machine/salvator-x.conf
+++ b/meta-rcar-gen3/conf/machine/salvator-x.conf
@@ -23,7 +23,9 @@ USE_32BIT_MMP ?= "0"
 MACHINE_FEATURES = ""
 
 KERNEL_IMAGETYPE = "Image"
-IMAGE_FSTYPES_append = " tar.bz2 ext4"
+
+#cpio do not support extended attribut, so cpio image when smack is used
+IMAGE_FSTYPES ?= "tar.bz2 ext4 ${@bb.utils.contains('DISTRO_FEATURES', 'smack', '', 'cpio.gz', d)}"
 
 SERIAL_CONSOLE = "115200 ttySC0"
 
@@ -42,6 +44,7 @@ KERNEL_DEVICETREE_r8a7796 = " \
     renesas/r8a7796-salvator-x.dtb \
     renesas/r8a7796-salvator-xs.dtb \
 "
+
 # Device tree for M3N
 KERNEL_DEVICETREE_r8a77965 = " \
     renesas/r8a77965-salvator-x.dtb \
@@ -61,8 +64,9 @@ UBOOT_MACHINE_r8a7796 = "r8a7796_salvator-x_defconfig"
 # M3N u-boot configure
 UBOOT_MACHINE_r8a77965 = "r8a77965_salvator-x_defconfig"
 
-# libdrm
+# libdrm + mesa
 PREFERRED_VERSION_libdrm = "2.4.85"
+PREFERRED_VERSION_mesa = "17.%"
 
 # Add variable to Build Configuration in build log
 BUILDCFG_VARS_append = " SOC_FAMILY"