diff options
author | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-08-23 23:31:23 +0200 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-03-18 17:10:54 +0100 |
commit | de577de9ed8cf40a45eaf0c35f01be633d447a63 (patch) | |
tree | 87710d28cde39656b11c59a7444311acb0254366 /meta-agl-distro/conf | |
parent | 2fe60ed6b40ae96e43d1edd9c3da978dc6e8db0c (diff) |
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>
Diffstat (limited to 'meta-agl-distro/conf')
-rw-r--r-- | meta-agl-distro/conf/distro/poky-agl.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index 1a1ffe981..bad7297d3 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -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) |