From: Robert Yang Date: Tue, 8 Dec 2020 09:43:13 +0000 (-0800) Subject: buildtools-tarball.bb: Fix PATH for environment setup script X-Git-Tag: 2020-04.5-dunfell~40 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f3c6fd8bbdc8883f86c1472c951aa0725cdd3eac;p=openembedded-core.git buildtools-tarball.bb: Fix PATH for environment setup script It only added ${SDKPATHNATIVE}/usr/bin to PATH which didn't work when files were installed to other bin dirs such as /bin or /sbin, for example, nativesdk-pigz installs the files to /bin, now fix it to keep align with sdk's PATH. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie (cherry picked from commit 67cac575a5696af5bad1aab888b65ea2686adff7) Signed-off-by: Steve Sakoman --- diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 434ffdc334..faf7108a86 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -66,7 +66,7 @@ create_sdk_files_append () { # Generate new (mini) sdk-environment-setup file script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}} touch $script - echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> $script + echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script