From: Jan-Simon Möller Date: Mon, 28 Aug 2017 20:50:19 +0000 (+0200) Subject: Do not use cpio.gz for initramfs as smack does not work X-Git-Tag: 4.0.1~4 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F10717%2F3;p=AGL%2Fmeta-agl.git Do not use cpio.gz for initramfs as smack does not work This changeset removes the wrong hardcoded INITRAMFS_FSTYPES on 3 boards. It was moved over from the previous defaults prior to the change to the AGL-wide default FSTYPES. The correct image to use is ext4.gz (which is a default in poky-agl.conf) - thus we can just remove these in the board includes. Therefore the intel targets need to define INITRD_LIVE. Bug-AGL: SPEC-836 Change-Id: If45f67d2bbd02331f1aea848e3230ce1e190c50d Signed-off-by: Jan-Simon Möller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10711 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Dominig ar Foll (cherry picked from commit 8f0aed0582269bf38b0ed47be4b6c287c1d098aa) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10717 ci-image-boot-test: Jenkins Job builder account --- diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc index 069dbea50..299568fcb 100644 --- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc +++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc @@ -25,5 +25,5 @@ IMAGE_INSTALL_append = " \ gstreamer-vaapi-1.0 " AGL_DEFAULT_IMAGE_FSTYPES := "wic hddimg" -AGL_DEFAULT_INITRAMFS_FSTYPES := "cpio.gz" +INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz" NOISO = "1" diff --git a/meta-agl-bsp/conf/include/agl_joule.inc b/meta-agl-bsp/conf/include/agl_joule.inc index 9f4e79ba6..246e47f9d 100644 --- a/meta-agl-bsp/conf/include/agl_joule.inc +++ b/meta-agl-bsp/conf/include/agl_joule.inc @@ -11,5 +11,5 @@ IMAGE_INSTALL_append = " \ OSTREE_BOOTLOADER ?= "u-boot" AGL_DEFAULT_IMAGE_FSTYPES := "wic hddimg" -AGL_DEFAULT_INITRAMFS_FSTYPES := "cpio.gz" +INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz" NOISO = "1" diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc index 68ff82374..a85354a35 100644 --- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc +++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc @@ -3,4 +3,3 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx6" PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-imx6" AGL_DEFAULT_IMAGE_FSTYPES := "sdcard.gz" -AGL_DEFAULT_INITRAMFS_FSTYPES := "cpio.gz" \ No newline at end of file