diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/conf/machine/include/x86 | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include/x86')
-rw-r--r-- | meta/conf/machine/include/x86/README | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/x86/arch-x86.inc | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/meta/conf/machine/include/x86/README b/meta/conf/machine/include/x86/README index 2b6c46c7eb..05aee533a7 100644 --- a/meta/conf/machine/include/x86/README +++ b/meta/conf/machine/include/x86/README | |||
@@ -14,7 +14,7 @@ X86ARCH64 - This is the 64-bit architecture GNU canonical arch, TUNE_ARCH. | |||
14 | 14 | ||
15 | The TUNE_PKGARCH is defined as follows: | 15 | The TUNE_PKGARCH is defined as follows: |
16 | 16 | ||
17 | TUNE_PKGARCH = ${TUNE_PKGARCH_tune-${DEFAULTTUNE}} | 17 | TUNE_PKGARCH = ${TUNE_PKGARCH:tune-${DEFAULTTUNE}} |
18 | 18 | ||
19 | The package architecture for 32-bit targets is historical and generally | 19 | The package architecture for 32-bit targets is historical and generally |
20 | set to to match the core compatible processor type, i.e. i386. | 20 | set to to match the core compatible processor type, i.e. i386. |
diff --git a/meta/conf/machine/include/x86/arch-x86.inc b/meta/conf/machine/include/x86/arch-x86.inc index 2edb360b7d..28742e794d 100644 --- a/meta/conf/machine/include/x86/arch-x86.inc +++ b/meta/conf/machine/include/x86/arch-x86.inc | |||
@@ -7,7 +7,7 @@ TARGET_FPU ?= "" | |||
7 | X86ARCH32 ?= "i586" | 7 | X86ARCH32 ?= "i586" |
8 | X86ARCH64 ?= "x86_64" | 8 | X86ARCH64 ?= "x86_64" |
9 | 9 | ||
10 | TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" | 10 | TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}" |
11 | 11 | ||
12 | # ELF32 ABI | 12 | # ELF32 ABI |
13 | TUNEVALID[m32] = "IA32 ELF32 standard ABI" | 13 | TUNEVALID[m32] = "IA32 ELF32 standard ABI" |
@@ -25,7 +25,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', ' -mx32', '', d)}" | |||
25 | TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}" | 25 | TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}" |
26 | TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" | 26 | TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" |
27 | # user mode qemu doesn't support x32 | 27 | # user mode qemu doesn't support x32 |
28 | MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}" | 28 | MACHINE_FEATURES_BACKFILL_CONSIDERED:append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}" |
29 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x86-x32:', '', d)}" | 29 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x86-x32:', '', d)}" |
30 | 30 | ||
31 | # ELF64 ABI | 31 | # ELF64 ABI |
@@ -36,19 +36,19 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', ' -m64', '', d)}" | |||
36 | 36 | ||
37 | # Default Tune configurations | 37 | # Default Tune configurations |
38 | AVAILTUNES += "x86" | 38 | AVAILTUNES += "x86" |
39 | TUNE_FEATURES_tune-x86 = "m32" | 39 | TUNE_FEATURES:tune-x86 = "m32" |
40 | BASE_LIB_tune-x86 = "lib" | 40 | BASE_LIB:tune-x86 = "lib" |
41 | TUNE_PKGARCH_tune-x86 = "x86" | 41 | TUNE_PKGARCH:tune-x86 = "x86" |
42 | PACKAGE_EXTRA_ARCHS_tune-x86 = "${TUNE_PKGARCH_tune-x86}" | 42 | PACKAGE_EXTRA_ARCHS:tune-x86 = "${TUNE_PKGARCH:tune-x86}" |
43 | 43 | ||
44 | AVAILTUNES += "x86-64" | 44 | AVAILTUNES += "x86-64" |
45 | TUNE_FEATURES_tune-x86-64 = "m64" | 45 | TUNE_FEATURES:tune-x86-64 = "m64" |
46 | BASE_LIB_tune-x86-64 = "lib64" | 46 | BASE_LIB:tune-x86-64 = "lib64" |
47 | TUNE_PKGARCH_tune-x86-64 = "x86_64" | 47 | TUNE_PKGARCH:tune-x86-64 = "x86_64" |
48 | PACKAGE_EXTRA_ARCHS_tune-x86-64 = "${TUNE_PKGARCH_tune-x86-64}" | 48 | PACKAGE_EXTRA_ARCHS:tune-x86-64 = "${TUNE_PKGARCH:tune-x86-64}" |
49 | 49 | ||
50 | AVAILTUNES += "x86-64-x32" | 50 | AVAILTUNES += "x86-64-x32" |
51 | TUNE_FEATURES_tune-x86-64-x32 = "mx32" | 51 | TUNE_FEATURES:tune-x86-64-x32 = "mx32" |
52 | BASE_LIB_tune-x86-64-x32 = "libx32" | 52 | BASE_LIB:tune-x86-64-x32 = "libx32" |
53 | TUNE_PKGARCH_tune-x86-64-x32 = "x86_64_x32" | 53 | TUNE_PKGARCH:tune-x86-64-x32 = "x86_64_x32" |
54 | PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "${TUNE_PKGARCH_tune-x86-64-x32}" | 54 | PACKAGE_EXTRA_ARCHS:tune-x86-64-x32 = "${TUNE_PKGARCH:tune-x86-64-x32}" |