summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-28 23:37:37 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-01 10:46:16 +0000
commit46b629426bece144a1bc8fd38cc13833b618a47a (patch)
tree5a4218838be9e6884efdfd879f8a12fb93bd929c
parent9ba369d463e99426602aea674ac45f7628e0203c (diff)
downloadpoky-46b629426bece144a1bc8fd38cc13833b618a47a.tar.gz
bitbake.conf: Simplify TARGET_SYS/SDK_SYS
As pointed out by Masahiro Yamada <masahiroy@kernel.org>, ('' or 'custom') equates to "custom" and this code seems unecesaarily complicated and unused. It was likely intended to supress the value if XXX_OS was set to '' but the code doesn't actually do that. Simplify it as we shouldn't have this indirection if we don't need it, its horrible. (From OE-Core rev: 66e4c638b942c9832da9e1d578aa03eeafae28db) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 394484b2b7..62b5466b71 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -129,7 +129,7 @@ SDKUSE_NLS ??= "yes"
129TARGET_ARCH = "${TUNE_ARCH}" 129TARGET_ARCH = "${TUNE_ARCH}"
130TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" 130TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}"
131TARGET_VENDOR = "-oe" 131TARGET_VENDOR = "-oe"
132TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS'), ''][d.getVar('TARGET_OS') == ('' or 'custom')]}" 132TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
133TARGET_PREFIX = "${TARGET_SYS}-" 133TARGET_PREFIX = "${TARGET_SYS}-"
134TARGET_CC_ARCH = "${TUNE_CCARGS}" 134TARGET_CC_ARCH = "${TUNE_CCARGS}"
135TARGET_LD_ARCH = "${TUNE_LDARGS}" 135TARGET_LD_ARCH = "${TUNE_LDARGS}"
@@ -138,7 +138,7 @@ TARGET_AS_ARCH = "${TUNE_ASARGS}"
138SDKMACHINE ??= "x86_64" 138SDKMACHINE ??= "x86_64"
139SDK_OS = "${BUILD_OS}" 139SDK_OS = "${BUILD_OS}"
140SDK_VENDOR = "-oesdk" 140SDK_VENDOR = "-oesdk"
141SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS'), ''][d.getVar('SDK_OS') == ('' or 'custom')]}" 141SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}"
142SDK_PREFIX = "${SDK_SYS}-" 142SDK_PREFIX = "${SDK_SYS}-"
143SDK_CC_ARCH = "${BUILD_CC_ARCH}" 143SDK_CC_ARCH = "${BUILD_CC_ARCH}"
144SDKPKGSUFFIX = "nativesdk" 144SDKPKGSUFFIX = "nativesdk"