conf/machine: Clean up MACHINEOVERRIDES handling
PATCH 1/1 conf/machine: Clean up MACHINEOVERRIDES handling
OVERRIDES reads from left to right, least to most specific. We were appending to MACHINEOVERRIDES when we should have been prepending so the ordering of qemuall verses qemuxxx was incorrect, as was the x86 override and several of the arm overrides. This patch is a batch cleanup of the various issues to correct the order from least to most specific. The include order does matter and we needed to tweak some of that in this patch too.
[YOCTO #4090]
Signed-off-by Richard Purdie <[email protected]>
---
meta/conf/machine/include/arm/arch-armv4.inc +1 -1
@@ -9,7 +9,7 @@ FIX_V4BX_ARMV4 = "${@bb.utils.contains("TUNE_FEATURES", "armv4", "--fix-v4bx", " FIX_V4BX_ARMV5 = "${@bb.utils.contains("TUNE_FEATURES", "armv5", "", "${FIX_V4BX_ARMV4}", d)}" FIX_V4BX = "${@bb.utils.contains("TUNE_FEATURES", "thumb", "", "${FIX_V4BX_ARMV5}", d)}" TARGET_LD_KERNEL_ARCH += "${FIX_V4BX}" -MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv4", "armv4:", "" ,d)}" require conf/machine/include/arm/arch-arm.inc require conf/machine/include/arm/feature-arm-thumb.inc
meta/conf/machine/include/arm/arch-armv5.inc +1 -1
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv5" TUNEVALID[armv5] = "Enable instructions for ARMv5" TUNECONFLICTS[armv5] = "armv4" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}" -MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv5", "armv5:", "" ,d)}" ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}"
meta/conf/machine/include/arm/arch-armv6.inc +1 -1
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv6" TUNEVALID[armv6] = "Enable instructions for ARMv6" TUNECONFLICTS[armv6] = "armv4 armv5" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}" -MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv6", "armv6:", "" ,d)}" require conf/machine/include/arm/arch-armv5-dsp.inc
meta/conf/machine/include/arm/arch-armv7a.inc +1 -1
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv7a" TUNEVALID[armv7a] = "Enable instructions for ARMv7-a" TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a", "", d)}" -MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "armv7a:", "" ,d)}" require conf/machine/include/arm/arch-armv6.inc require conf/machine/include/arm/feature-arm-neon.inc
meta/conf/machine/include/ia32/arch-ia32.inc +1 -1
@@ -14,7 +14,7 @@ TUNEVALID[m32] = "IA32 ELF32 standard ABI" TUNECONFLICTS[m32] = "m64 mx32" TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" -MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "m32", ":x86", "" ,d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86:", "" ,d)}" # x32 ABI TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI"
meta/conf/machine/include/qemu.inc +1 -1
@@ -12,7 +12,7 @@ XSERVER ?= "xserver-xorg \ MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen" -MACHINEOVERRIDES .= ":qemuall" +MACHINEOVERRIDES =. "qemuall:" IMAGE_FSTYPES += "tar.bz2 ext3"
meta/conf/machine/qemux86-64.conf +1 -2
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa" PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" +require conf/machine/include/qemu.inc require conf/machine/include/tune-x86_64.inc KERNEL_IMAGETYPE = "bzImage"
@@ -20,8 +21,6 @@ XSERVER ?= "xserver-xorg \ xf86-input-evdev \ xf86-video-vmware" -require conf/machine/include/qemu.inc - MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
meta/conf/machine/qemux86.conf +1 -2
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa" PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" +require conf/machine/include/qemu.inc require conf/machine/include/tune-i586.inc KERNEL_IMAGETYPE = "bzImage"
@@ -20,8 +21,6 @@ XSERVER ?= "xserver-xorg \ xf86-input-evdev \ xf86-video-vmware" -require conf/machine/include/qemu.inc - MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"