diff options
| author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2018-04-10 22:28:21 +0200 |
|---|---|---|
| committer | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2018-04-10 22:32:16 +0200 |
| commit | 53ab0eccff8863424297a24dbdf71320236d0382 (patch) | |
| tree | fe5e6bbc89987e3b6101871f4e9307c58a6f59bf /conf | |
| parent | a58d5544369eefd3325b08e89885a4d723500d00 (diff) | |
| download | meta-qcom-53ab0eccff8863424297a24dbdf71320236d0382.tar.gz meta-qcom-53ab0eccff8863424297a24dbdf71320236d0382.tar.bz2 meta-qcom-53ab0eccff8863424297a24dbdf71320236d0382.zip | |
machine: do not use _append for IMAGE_FSTYPESimage-fstypes
As discussed on https://github.com/ndechesne/meta-qcom/issues/61, using _append
will modify IMAGE_FSTYPES unconditionnally and won't give DISTRO a chance to
override.
Let's set sane, default settings using ?= (or +=). If a DISTRO wants to change
them, we suppose they know what they do, and overwrite correctly.
Reported-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/dragonboard-410c.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/qcom-apq8016.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/qcom-apq8064.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/qcom-apq8096.inc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/dragonboard-410c.conf b/conf/machine/dragonboard-410c.conf index 59ec458..617ac87 100644 --- a/conf/machine/dragonboard-410c.conf +++ b/conf/machine/dragonboard-410c.conf @@ -28,6 +28,6 @@ SD_QCOM_BOOTIMG_ROOTFS ?= "mmcblk1p7" UBOOT_MACHINE ?= "dragonboard410c_defconfig" # Assemble SD card -IMAGE_FSTYPES_append = " wic.gz wic.bmap" +IMAGE_FSTYPES += "wic.gz wic.bmap" WKS_FILE = "dragonboard410c-sd.wks" WKS_FILE_DEPENDS = "firmware-qcom-dragonboard410c-bootloader-sdcard" diff --git a/conf/machine/include/qcom-apq8016.inc b/conf/machine/include/qcom-apq8016.inc index ffb1517..5861a7e 100644 --- a/conf/machine/include/qcom-apq8016.inc +++ b/conf/machine/include/qcom-apq8016.inc @@ -23,7 +23,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt" # Fastboot expects an ext4 image, which needs to be 4096 aligned -IMAGE_FSTYPES_append = " ext4.gz" +IMAGE_FSTYPES ?= "ext4.gz" IMAGE_ROOTFS_ALIGNMENT = "4096" QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000" diff --git a/conf/machine/include/qcom-apq8064.inc b/conf/machine/include/qcom-apq8064.inc index edb06d6..b0da78e 100644 --- a/conf/machine/include/qcom-apq8064.inc +++ b/conf/machine/include/qcom-apq8064.inc @@ -22,7 +22,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-qcomlt" # Fastboot expects an ext4 image, which needs to be 4096 aligned -IMAGE_FSTYPES_append = " ext4.gz" +IMAGE_FSTYPES ?= "ext4.gz" IMAGE_ROOTFS_ALIGNMENT = "4096" QCOM_BOOTIMG_KERNEL_BASE ?= "0x80200000" diff --git a/conf/machine/include/qcom-apq8096.inc b/conf/machine/include/qcom-apq8096.inc index 1023f95..715d7fe 100644 --- a/conf/machine/include/qcom-apq8096.inc +++ b/conf/machine/include/qcom-apq8096.inc @@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt" # Fastboot expects an ext4 image, which needs to be 4096 aligned -IMAGE_FSTYPES_append = " ext4.gz" +IMAGE_FSTYPES ?= "ext4.gz" IMAGE_ROOTFS_ALIGNMENT = "4096" QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000" |