Consolidation of AGL_DEFAULT_IMAGE_FSTYPES after review of machine use

After reviewing what all machines actually specify as 'extra', the conclusion was
that the actual 'default' is 'wic.xz' .
Consequently make this the new default and remove it from the board configs.

v2: add ext4/ext4.xz for netboot feature

Bug-AGL: SPEC-2771

Change-Id: I082f87a07dcacb962d10efd90ba2476f87896302
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

12 files changed, 2 insertions, 21 deletions

diff --git a/meta-agl-bsp/conf/include/agl_bbe.inc b/meta-agl-bsp/conf/include/agl_bbe.inc
index 5dc817099..5c28bea20 100644
--- a/meta-agl-bsp/conf/include/agl_bbe.inc
+++ b/meta-agl-bsp/conf/include/agl_bbe.inc
@@ -1,7 +1,7 @@
 # This config is for the Sancloud BBE, adapted from the config provider for the
 # standard Beaglebone
 
-AGL_DEFAULT_IMAGE_FSTYPES = "tar.xz wic.xz wic.bmap"
+#AGL_DEFAULT_IMAGE_FSTYPES += "tar.xz"
 
 CORE_IMAGE_EXTRA_INSTALL += "packagegroup-machine-base"
 
diff --git a/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl-bsp/conf/include/agl_beaglebone.inc
index 1917ff45d..cfd189df3 100644
--- a/meta-agl-bsp/conf/include/agl_beaglebone.inc
+++ b/meta-agl-bsp/conf/include/agl_beaglebone.inc
@@ -38,5 +38,3 @@ SECURITY_CFLAGS_pn-libatasmart = ""
 SECURITY_LDFLAGS_pn-libatasmart = ""
 
 WKS_FILE = "sdimage-bootpart-uuid.wks"
-
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
diff --git a/meta-agl-bsp/conf/include/agl_cubox-i.inc b/meta-agl-bsp/conf/include/agl_cubox-i.inc
index b43ef47c8..46464325b 100644
--- a/meta-agl-bsp/conf/include/agl_cubox-i.inc
+++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc
@@ -22,6 +22,3 @@ BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
 
 # Set CMA size large enough to work with AGL
 UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M"
-
-# Generate WIC image also
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
diff --git a/meta-agl-bsp/conf/include/agl_cyclone5.inc b/meta-agl-bsp/conf/include/agl_cyclone5.inc
index 1eaf0ae62..7ebd4090c 100644
--- a/meta-agl-bsp/conf/include/agl_cyclone5.inc
+++ b/meta-agl-bsp/conf/include/agl_cyclone5.inc
@@ -3,9 +3,5 @@ OSTREE_BOOTLOADER ?= "u-boot"
 # DEFAULTTUNE for cortex-a9
 DISTRO_FEATURES_append = " agl-medium-arm-compiler"
 
-
-# Add the custom rpi-sdimg output format
-AGL_EXTRA_IMAGE_FSTYPES  = "wic.xz"
-
 # Use the AGL default ext4.xz to generate the rpi-sdimg
 SDIMG_ROOTFS_TYPE = "ext4.xz"
diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
index 2e7741a52..ccc8feb9a 100644
--- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
+++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
@@ -40,5 +40,3 @@ IMAGE_INSTALL_append = " \
 do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 WKS_FILE = "sdimage-bootpart-uuid.wks"
 IMAGE_BOOT_FILES = "MLO u-boot.img uEnv.txt"
-
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
diff --git a/meta-agl-bsp/conf/include/agl_hsdk.inc b/meta-agl-bsp/conf/include/agl_hsdk.inc
index 5967f2375..075cea53e 100644
--- a/meta-agl-bsp/conf/include/agl_hsdk.inc
+++ b/meta-agl-bsp/conf/include/agl_hsdk.inc
@@ -1,5 +1,4 @@
 KERNEL_IMAGETYPE = "uImage"
 WKS_FILE = "sdimage-hsdk.wks"
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz"
 IMAGE_BOOT_FILES = "uImage uboot.env"
 IMAGE_INSTALL_append = " kernel-modules"
diff --git a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc
index b56917781..0d8c6f239 100644
--- a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc
+++ b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc
@@ -16,6 +16,4 @@ BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
 # Set CMA size large enough to work with AGL
 UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M"
 
-# Generate WIC image also
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
 AGL_DEFAULT_INITRAMFS_FSTYPES := ""
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 68398371b..1dd7d0f00 100644
--- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
+++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
@@ -5,7 +5,6 @@ IMAGE_INSTALL_append = " \
         intel-vaapi-driver \
         gstreamer1.0-vaapi"
 
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum ext4 wic.vmdk"
 INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz"
 
 # Modify this file under meta-agl-bsp/meta-intel/wic to change the
diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
index 5864354b5..77eb97342 100644
--- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
+++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
@@ -16,7 +16,5 @@ BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init"
 # Set CMA size large enough to work with AGL
 UBOOT_EXTLINUX_KERNEL_ARGS_append = " cma=512M"
 
-# Generate WIC image also
 #WKS_FILE = "imx-uboot.wks"
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
 AGL_DEFAULT_INITRAMFS_FSTYPES := ""
diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
index 11295c7e3..dcfa89a66 100644
--- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
@@ -21,7 +21,7 @@ QB_KERNEL_CMDLINE_APPEND_append = " quiet"
 DISTRO_FEATURES_append = " sota"
 
 # Image support
-AGL_EXTRA_IMAGE_FSTYPES = "ext4 wic.vmdk wic.xz wic.bmap"
+AGL_EXTRA_IMAGE_FSTYPES = "wic.vmdk.xz"
 IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom"
 
 # Root device
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index 94dc5acee..c03702efd 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@ -40,7 +40,6 @@ DISTRO_FEATURES_append = " sota"
 
 # Create WIC images to write to SD cards.
 WKS_FILE = "sdimage-raspberrypi.wks"
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
 IMAGE_BOOT_FILES = "bcm2835-bootfiles/* \
                  ${@make_dtb_boot_files(d)} \
                  ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', \
diff --git a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
index 380011896..a7fabfac8 100644
--- a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
@@ -5,6 +5,5 @@ IMAGE_BOOT_FILES_sota = "renesas-ota-bootfiles/* ${DTB_SUFFIX}.dtb"
 OSTREE_BOOTLOADER ?= "u-boot"
 
 WKS_FILE = "singlepart-noloader.wks"
-AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
 
 RENESAS_DATADIR = "/usr"