[oe-commits] [openembedded-core] 10/15: bitbake.conf: Simplify TARGET_SYS/SDK_SYS

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 8038a435c703b087068e71a04739b8b60b83283b
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sat Dec 28 23:37:37 2019 +0000

    bitbake.conf: Simplify TARGET_SYS/SDK_SYS
    
    As pointed out by Masahiro Yamada <masahiroy at 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 at linuxfoundation.org>
---
 meta/conf/bitbake.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 394484b..62b5466 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.