summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-25 16:31:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-25 17:42:58 +0000
commit88fa952b7c36c1d3375d0b1cbd9879f61def5b25 (patch)
treeb652a35a16418a397234fafda30c5947e6ad2ad9
parent7a8f3f7a012fd323df8d812d969d4190d956a82e (diff)
downloadpoky-88fa952b7c36c1d3375d0b1cbd9879f61def5b25.tar.gz
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] (From OE-Core rev: bdc1b214431c9c93a929b547b9a61e7b87fbd366) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/conf/machine/include/arm/arch-armv4.inc2
-rw-r--r--meta/conf/machine/include/arm/arch-armv5.inc2
-rw-r--r--meta/conf/machine/include/arm/arch-armv6.inc2
-rw-r--r--meta/conf/machine/include/arm/arch-armv7a.inc2
-rw-r--r--meta/conf/machine/include/ia32/arch-ia32.inc2
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/conf/machine/qemux86-64.conf3
-rw-r--r--meta/conf/machine/qemux86.conf3
8 files changed, 8 insertions, 10 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc
index fcd56d72d9..5940467ae5 100644
--- a/meta/conf/machine/include/arm/arch-armv4.inc
+++ b/meta/conf/machine/include/arm/arch-armv4.inc
@@ -9,7 +9,7 @@ FIX_V4BX_ARMV4 = "${@bb.utils.contains("TUNE_FEATURES", "armv4", "--fix-v4bx", "
9FIX_V4BX_ARMV5 = "${@bb.utils.contains("TUNE_FEATURES", "armv5", "", "${FIX_V4BX_ARMV4}", d)}" 9FIX_V4BX_ARMV5 = "${@bb.utils.contains("TUNE_FEATURES", "armv5", "", "${FIX_V4BX_ARMV4}", d)}"
10FIX_V4BX = "${@bb.utils.contains("TUNE_FEATURES", "thumb", "", "${FIX_V4BX_ARMV5}", d)}" 10FIX_V4BX = "${@bb.utils.contains("TUNE_FEATURES", "thumb", "", "${FIX_V4BX_ARMV5}", d)}"
11TARGET_LD_KERNEL_ARCH += "${FIX_V4BX}" 11TARGET_LD_KERNEL_ARCH += "${FIX_V4BX}"
12MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}" 12MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv4", "armv4:", "" ,d)}"
13 13
14require conf/machine/include/arm/arch-arm.inc 14require conf/machine/include/arm/arch-arm.inc
15require conf/machine/include/arm/feature-arm-thumb.inc 15require conf/machine/include/arm/feature-arm-thumb.inc
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc
index 5fdfa237ce..33fe401ee1 100644
--- a/meta/conf/machine/include/arm/arch-armv5.inc
+++ b/meta/conf/machine/include/arm/arch-armv5.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv5"
3TUNEVALID[armv5] = "Enable instructions for ARMv5" 3TUNEVALID[armv5] = "Enable instructions for ARMv5"
4TUNECONFLICTS[armv5] = "armv4" 4TUNECONFLICTS[armv5] = "armv4"
5TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}" 5TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"
6MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}" 6MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv5", "armv5:", "" ,d)}"
7 7
8ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}" 8ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}"
9 9
diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc
index ea6d73d0f7..882400ed0d 100644
--- a/meta/conf/machine/include/arm/arch-armv6.inc
+++ b/meta/conf/machine/include/arm/arch-armv6.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv6"
3TUNEVALID[armv6] = "Enable instructions for ARMv6" 3TUNEVALID[armv6] = "Enable instructions for ARMv6"
4TUNECONFLICTS[armv6] = "armv4 armv5" 4TUNECONFLICTS[armv6] = "armv4 armv5"
5TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}" 5TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}"
6MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}" 6MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv6", "armv6:", "" ,d)}"
7 7
8require conf/machine/include/arm/arch-armv5-dsp.inc 8require conf/machine/include/arm/arch-armv5-dsp.inc
9 9
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index a8ebd8219b..e876f33ddc 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv7a"
3TUNEVALID[armv7a] = "Enable instructions for ARMv7-a" 3TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"
4TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" 4TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
5TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a", "", d)}" 5TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a", "", d)}"
6MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}" 6MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "armv7a:", "" ,d)}"
7 7
8require conf/machine/include/arm/arch-armv6.inc 8require conf/machine/include/arm/arch-armv6.inc
9require conf/machine/include/arm/feature-arm-neon.inc 9require conf/machine/include/arm/feature-arm-neon.inc
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index 15f67d7c62..a817bfd967 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -14,7 +14,7 @@ TUNEVALID[m32] = "IA32 ELF32 standard ABI"
14TUNECONFLICTS[m32] = "m64 mx32" 14TUNECONFLICTS[m32] = "m64 mx32"
15TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}" 15TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}"
16TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" 16TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
17MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "m32", ":x86", "" ,d)}" 17MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86:", "" ,d)}"
18 18
19# x32 ABI 19# x32 ABI
20TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI" 20TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 29caec9559..637f4efe51 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -12,7 +12,7 @@ XSERVER ?= "xserver-xorg \
12 12
13MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen" 13MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
14 14
15MACHINEOVERRIDES .= ":qemuall" 15MACHINEOVERRIDES =. "qemuall:"
16 16
17IMAGE_FSTYPES += "tar.bz2 ext3" 17IMAGE_FSTYPES += "tar.bz2 ext3"
18 18
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 23a710848e..90007fb26e 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" 7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
9 9
10require conf/machine/include/qemu.inc
10require conf/machine/include/tune-x86_64.inc 11require conf/machine/include/tune-x86_64.inc
11 12
12KERNEL_IMAGETYPE = "bzImage" 13KERNEL_IMAGETYPE = "bzImage"
@@ -20,8 +21,6 @@ XSERVER ?= "xserver-xorg \
20 xf86-input-evdev \ 21 xf86-input-evdev \
21 xf86-video-vmware" 22 xf86-video-vmware"
22 23
23require conf/machine/include/qemu.inc
24
25MACHINE_FEATURES += "x86" 24MACHINE_FEATURES += "x86"
26 25
27MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" 26MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index d13dc847f0..7a7cbfde8b 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" 7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
9 9
10require conf/machine/include/qemu.inc
10require conf/machine/include/tune-i586.inc 11require conf/machine/include/tune-i586.inc
11 12
12KERNEL_IMAGETYPE = "bzImage" 13KERNEL_IMAGETYPE = "bzImage"
@@ -20,8 +21,6 @@ XSERVER ?= "xserver-xorg \
20 xf86-input-evdev \ 21 xf86-input-evdev \
21 xf86-video-vmware" 22 xf86-video-vmware"
22 23
23require conf/machine/include/qemu.inc
24
25MACHINE_FEATURES += "x86" 24MACHINE_FEATURES += "x86"
26 25
27MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" 26MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-20 15:02:53 +0000