diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-28 23:37:37 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-01 10:46:10 +0000 |
| commit | 66e4c638b942c9832da9e1d578aa03eeafae28db (patch) | |
| tree | a21610e90cb5a3fb7ef2761d20e01b661a9622d4 /meta/conf/bitbake.conf | |
| parent | df107f3a149b1e88d9f869e7ff87950ccf5aaee0 (diff) | |
| download | openembedded-core-contrib-66e4c638b942c9832da9e1d578aa03eeafae28db.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/bitbake.conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 4 |
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" TARGET_ARCH = "${TUNE_ARCH}" TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" TARGET_VENDOR = "-oe" -TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS'), ''][d.getVar('TARGET_OS') == ('' or 'custom')]}" +TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "${TUNE_CCARGS}" TARGET_LD_ARCH = "${TUNE_LDARGS}" @@ -138,7 +138,7 @@ TARGET_AS_ARCH = "${TUNE_ASARGS}" SDKMACHINE ??= "x86_64" SDK_OS = "${BUILD_OS}" SDK_VENDOR = "-oesdk" -SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS'), ''][d.getVar('SDK_OS') == ('' or 'custom')]}" +SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}" SDK_PREFIX = "${SDK_SYS}-" SDK_CC_ARCH = "${BUILD_CC_ARCH}" SDKPKGSUFFIX = "nativesdk" |