diff options
-rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index d0f8dd7d7c..3785941c2c 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb | |||
@@ -66,16 +66,19 @@ create_sdk_files_append () { | |||
66 | script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}} | 66 | script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}} |
67 | touch $script | 67 | touch $script |
68 | echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> $script | 68 | echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> $script |
69 | # In order for the self-extraction script to correctly extract and set up things, | 69 | echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script |
70 | # we need a 'OECORE_NATIVE_SYSROOT=xxx' line in environment setup script. | ||
71 | # However, buildtools-tarball is inherently a tool set instead of a fully functional SDK, | ||
72 | # so instead of exporting the variable, we use a comment here. | ||
73 | echo '#OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script | ||
74 | toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} | ||
75 | |||
76 | echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script | 70 | echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script |
77 | echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script | 71 | echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script |
78 | echo 'export OPENSSL_CONF="${SDKPATHNATIVE}${sysconfdir}/ssl/openssl.cnf"' >>$script | 72 | |
73 | toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} | ||
74 | |||
75 | cat >> $script <<EOF | ||
76 | if [ -d "\$OECORE_NATIVE_SYSROOT/environment-setup.d" ]; then | ||
77 | for envfile in \$OECORE_NATIVE_SYSROOT/environment-setup.d/*.sh; do | ||
78 | . \$envfile | ||
79 | done | ||
80 | fi | ||
81 | EOF | ||
79 | 82 | ||
80 | if [ "${SDKMACHINE}" = "i686" ]; then | 83 | if [ "${SDKMACHINE}" = "i686" ]; then |
81 | echo 'export NO32LIBS="0"' >>$script | 84 | echo 'export NO32LIBS="0"' >>$script |