diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-09-22 15:06:03 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-09-30 14:46:25 +0300 |
| commit | 5af6a694fbdb3331ef7c5d4b9d41ea6d31b5d7b1 (patch) | |
| tree | 71ce9420cf2dc495b9cb12e5d726bc2d48c46c6b | |
| parent | 5ddb9ab465a009a7a8f2bfbb23083bd03c72bcbf (diff) | |
Don't override IMAGE_FSTYPES
Add what we expect to be built, but don't remove what BSP layers
add to their configs. Makes integration to new BSPs easier.
Change-Id: I53a6848d6df04ac97a66a34abee211667b4d23ef
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 94c1587e20864afd0481300e0bcb2bc485534661)
4 files changed, 2 insertions, 6 deletions
diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf index d8db2c0a..2affde0c 100644 --- a/meta-boot2qt-distro/conf/distro/b2qt.conf +++ b/meta-boot2qt-distro/conf/distro/b2qt.conf @@ -66,7 +66,7 @@ QT_EDITION = "commercial" # Disable SHA validation for branch QT_MODULE_BRANCH_PARAM = "nobranch=1" -IMAGE_FSTYPES = "conf" +IMAGE_FSTYPES += "conf" IMAGE_CLASSES += "image_types_sdcard deploy-conf" LICENSE_CREATE_PACKAGE = "1" diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc index b9fedad9..ed747895 100644 --- a/meta-boot2qt-distro/conf/distro/include/fsl.inc +++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc @@ -31,7 +31,7 @@ BBMASK += "\ meta-freescale/dynamic-layers/qt5-layer/recipes-qt/qt5 \ " -IMAGE_FSTYPES += "ext3 wic" +IMAGE_FSTYPES += "wic" QBSP_IMAGE_CONTENT ?= "\ ${IMAGE_LINK_NAME}.img \ diff --git a/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf index 8d106cee..d21cc4f8 100644 --- a/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf +++ b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf @@ -31,8 +31,6 @@ DEPLOY_CONF_NAME = "Intel NUC" DISTRO_FEATURES_remove = "usbgadget" -IMAGE_FSTYPES += "wic" - QBSP_IMAGE_CONTENT ?= "\ ${IMAGE_LINK_NAME}.img \ ${IMAGE_LINK_NAME}.conf \ diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc index 2ff8064b..032e0040 100644 --- a/meta-boot2qt-distro/conf/distro/include/toradex.inc +++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc @@ -52,8 +52,6 @@ SCRIPTS = "\ IMAGE_BOOT_FILES_append_mx6 += "${SCRIPTS}" IMAGE_BOOT_FILES_append_mx7 += "${SCRIPTS}" -IMAGE_FSTYPES += "teziimg" - # Placeholder for TEZI_DATE introduced in meta-toradex-bsp-common layer. # We don't use it as we override the tezi rootfs creation with our own version # but it causes a build failure if not defined |