From dc95bfb279f7e898254f2161bb3a8213ca8c05d4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 16 Jan 2017 16:22:11 -0200 Subject: [PATCH] qoriq-base, imx-base: Allow DISTRO and local.conf override of IMAGE_FSTYPES To allow the DISTRO and local.conf to override the IMAGE_FSTYPES value we must provide a weak default (using the ??= operator) otherwise machines need to play with the import order to override it. Change-Id: I93407b8b6a93e5953bc4bae08f4ae4dafc5c6158 Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 2 +- conf/machine/include/qoriq-base.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 29677f24..6e6233d2 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -189,7 +189,7 @@ SOC_DEFAULT_IMAGE_FSTYPES = "sdcard.gz" SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot.mxsboot-sdcard sdcard.gz" SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" -IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" +IMAGE_FSTYPES ??= "${SOC_DEFAULT_IMAGE_FSTYPES}" SERIAL_CONSOLE = "115200 ttymxc0" SERIAL_CONSOLE_mxs = "115200 ttyAMA0" diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index 6c25d50e..426d5118 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc @@ -12,7 +12,7 @@ PREFERRED_VERSION_testfloat = "2a" IMAGE_CLASSES += "image_types_uboot" SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz" -IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" +IMAGE_FSTYPES ??= "${SOC_DEFAULT_IMAGE_FSTYPES}" MACHINE_FEATURES ?= "pci ext2 ext3 serial" MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules" -- 2.40.1