Consolidation of AGL_DEFAULT_IMAGE_FSTYPES after review of machine use 07/22207/6
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Fri, 23 Aug 2019 21:31:23 +0000 (23:31 +0200)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Wed, 18 Mar 2020 16:10:54 +0000 (17:10 +0100)
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>
13 files changed:
meta-agl-bsp/conf/include/agl_bbe.inc
meta-agl-bsp/conf/include/agl_beaglebone.inc
meta-agl-bsp/conf/include/agl_cubox-i.inc
meta-agl-bsp/conf/include/agl_cyclone5.inc
meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
meta-agl-bsp/conf/include/agl_hsdk.inc
meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc
meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
meta-agl-bsp/conf/include/agl_nitrogen6x.inc
meta-agl-bsp/conf/include/agl_qemux86-64.inc
meta-agl-bsp/conf/include/agl_raspberrypi3.inc
meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
meta-agl-distro/conf/distro/poky-agl.conf

index 5dc8170..5c28bea 100644 (file)
@@ -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"
 
index 1917ff4..cfd189d 100644 (file)
@@ -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"
index b43ef47..4646432 100644 (file)
@@ -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"
index 1eaf0ae..7ebd409 100644 (file)
@@ -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"
index 2e7741a..ccc8feb 100644 (file)
@@ -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"
index 5967f23..075cea5 100644 (file)
@@ -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"
index b569177..0d8c6f2 100644 (file)
@@ -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 := ""
index 6839837..1dd7d0f 100644 (file)
@@ -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
index 5864354..77eb973 100644 (file)
@@ -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 := ""
index 11295c7..dcfa89a 100644 (file)
@@ -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
index 94dc5ac..c03702e 100644 (file)
@@ -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', \
index 3800118..a7fabfa 100644 (file)
@@ -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"
index 1a1ffe9..bad7297 100644 (file)
@@ -144,8 +144,10 @@ QB_AUDIO_OPT = "-soundhw hda"
 AGL_EXTRA_IMAGE_FSTYPES ??= ""
 AGL_EXTRA_INITRAMFS_FSTYPES ??= ""
 #
-# Default IMAGE FSTYPES compressed tarball + ext4.xz
-AGL_DEFAULT_IMAGE_FSTYPES ?= "tar.xz ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
+# Default IMAGE FSTYPES wic.xz
+AGL_DEFAULT_IMAGE_FSTYPES ?= "wic.xz wic.bmap wic.xz.sha256sum"
+AGL_DEFAULT_IMAGE_FSTYPES_qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
+AGL_DEFAULT_IMAGE_FSTYPES_append_netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
 AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz"
 
 # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this)