toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups
RFC 1/2 toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups
Instead of recognizing only environment-setup scripts in ${STAGING_DIR_TARGET} or ${STAGING_DIR_NATIVE}, respectively - lurk also into ${SDKPATH}/buildtools/sysroots/${SDK_SYS} where nativesdk-openssl installs setup files.
Signed-off-by Jens Rehsack <[email protected]>
--- meta/classes/toolchain-scripts.bbclass | 5 +++++ 1 file changed, 5 insertions(+)
meta/classes/toolchain-scripts.bbclass +5 -0
@@ -119,6 +119,11 @@ if [ -d "\$OECORE_NATIVE_SYSROOT/environment-setup.d" ]; then . \$envfile done fi +if [ -d "${SDKPATH}/buildtools/sysroots/${SDK_SYS}/environment-setup.d" ]; then + for envfile in ${SDKPATH}/buildtools/sysroots/${SDK_SYS}/environment-setup.d/*.sh; do + . \$envfile + done +fi EOF }
Signature · 1 line
2.17.1
RFC 2/2 buildtools-tarball: eliminate overwtiting OPENSSL_CONF
Remove overwriting of OPENSSL_CONF from buildtools-tarball.bb to clarify whether nativesdk-openssl installs wrong content or buildtools-tarball:
(nativesdk-openssl) tmp/sysroots/x86_64/usr/lib/ssl-1.1/openssl.cnf
(buildtools-tarball) buildtools/sysroots/x86_64-pokysdk-linux/etc/ssl/openssl.cnfSigned-off-by Jens Rehsack <[email protected]>
--- meta/recipes-core/meta/buildtools-tarball.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-core/meta/buildtools-tarball.bb +0 -1
@@ -75,7 +75,6 @@ create_sdk_files_append () { 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 - echo 'export OPENSSL_CONF="${SDKPATHNATIVE}${sysconfdir}/ssl/openssl.cnf"' >>$script if [ "${SDKMACHINE}" = "i686" ]; then echo 'export NO32LIBS="0"' >>$script
Signature · 1 line
2.17.1