Skip to contentSkip to conversation

toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups

PATCH In review Jens Rehsack 2 participants 5 messages Jul 8, 2020 – Jul 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

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.cnf
---
 meta/classes/toolchain-scripts.bbclass       | 5 +++++
 meta/recipes-core/meta/buildtools-tarball.bb | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)
meta/classes/toolchain-scripts.bbclass +5 -0
index db1d3215ef..e3959e21e8 100644
@@ -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
 }
 
meta/recipes-core/meta/buildtools-tarball.bb +0 -1
index d0f8dd7d7c..02e662b5cc 100644
@@ -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
#1 lore raw

Em qua., 8 de jul. de 2020 às 16:58, Jens Rehsack <[email protected]> escreveu:

Quoted 6 lines

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.

Quoted 6 lines

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.cnf

I did not understand the openssl related change. Is it possible to rework the commit log so it is more detailed?

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750
#2 lore raw
Quoted 16 lines

Am 08.07.2020 um 23:20 schrieb Otavio Salvador <[email protected]>:

Em qua., 8 de jul. de 2020 às 16:58, Jens Rehsack <[email protected]> escreveu:

Quoted 11 lines

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.

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.cnf
Quoted 4 lines
Quoted 1 line

I did not understand the openssl related change. Is it possible to rework the commit log so it is more detailed?

For sure, but maybe I'm completely wrong. Let me try explaining it first...

If - and only if - one creates an SDK which included openssl (and not libressl, mbedssl, ...), nativesdk-openssl packages an ${SDKPATHNATIVE}/environment-setup.d/openssl.sh

OTOH - meta/recipes-core/meta/buildtools-tarball.bb creates a script which is sourced at the very end of SDK environment setup and writes what's included in {SDKPATHNATIVE}/environment-setup.d/openssl.sh on it's own - with maybe slightly different location - what guides me to add:
... 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.cnf

Maybe they way how nativesdk-cmake is doing it is the right way. Then, maybe nativesdk-openssl should be reworked. This is for clarification.

Does it explain something better?

Cheers
--
Jens Rehsack - [email protected]

#3 lore raw

Hello Jens,

I've added Richard on Cc.

Em qui., 9 de jul. de 2020 às 01:13, Jens Rehsack <[email protected]> escreveu:

Quoted 29 lines
Quoted 14 lines

Am 08.07.2020 um 23:20 schrieb Otavio Salvador <[email protected]>:

Em qua., 8 de jul. de 2020 às 16:58, Jens Rehsack <[email protected]> escreveu:

Quoted 11 lines

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.

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.cnf
Quoted 4 lines
Quoted 1 line

I did not understand the openssl related change. Is it possible to rework the commit log so it is more detailed?

For sure, but maybe I'm completely wrong. Let me try explaining it first...

If - and only if - one creates an SDK which included openssl (and not libressl, mbedssl, ...), nativesdk-openssl packages an ${SDKPATHNATIVE}/environment-setup.d/openssl.sh

OTOH - meta/recipes-core/meta/buildtools-tarball.bb creates a script which is sourced at the very end of SDK environment setup and writes what's included in {SDKPATHNATIVE}/environment-setup.d/openssl.sh on it's own - with maybe slightly different location - what guides me to add:
... to clarify whether nativesdk-openssl installs wrong content or buildtools-tarball:

Quoted 7 lines
   (nativesdk-openssl) tmp/sysroots/x86_64/usr/lib/ssl-1.1/openssl.cnf
   (buildtools-tarball) buildtools/sysroots/x86_64-pokysdk-linux/etc/ssl/openssl.cnf

Maybe they way how nativesdk-cmake is doing it is the right way. Then, maybe nativesdk-openssl should be reworked. This is for clarification.

Does it explain something better?

Yes and generating it directly might indeed be not the best option. Ideally, it'd generate a new source script which would run later and do any need adjustment. Do you agree?

Either way, this commit seems to be mixing two changes and I'd prefer if you split it. This allow for nicer review as well as better commit messages of individual changes.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750
#4 lore raw
Quoted 7 lines

Am 09.07.2020 um 13:52 schrieb Otavio Salvador <[email protected]>:

Hello Jens,

I've added Richard on Cc.

/o\

Quoted 33 lines

Em qui., 9 de jul. de 2020 às 01:13, Jens Rehsack <[email protected]> escreveu:

Quoted 32 lines
Quoted 14 lines

Am 08.07.2020 um 23:20 schrieb Otavio Salvador <[email protected]>:

Em qua., 8 de jul. de 2020 às 16:58, Jens Rehsack <[email protected]> escreveu:

Quoted 11 lines

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.

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.cnf

Quoted 4 lines
Quoted 1 line

I did not understand the openssl related change. Is it possible to rework the commit log so it is more detailed?

For sure, but maybe I'm completely wrong. Let me try explaining it first...

If - and only if - one creates an SDK which included openssl (and not libressl, mbedssl, ...), nativesdk-openssl packages an ${SDKPATHNATIVE}/environment-setup.d/openssl.sh

OTOH - meta/recipes-core/meta/buildtools-tarball.bb creates a script which is sourced at the very end of SDK environment setup and writes what's included in {SDKPATHNATIVE}/environment-setup.d/openssl.sh on it's own - with maybe slightly different location - what guides me to add:
... 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.cnf

Quoted 8 lines
Quoted 4 lines

Maybe they way how nativesdk-cmake is doing it is the right way. Then, maybe nativesdk-openssl should be reworked. This is for clarification.

Does it explain something better?

Yes and generating it directly might indeed be not the best option. Ideally, it'd generate a new source script which would run later and do any need adjustment. Do you agree?

I have at least no idea. I just wondered and thought asking this way is an option.

Quoted 3 lines

Either way, this commit seems to be mixing two changes and I'd prefer if you split it. This allow for nicer review as well as better commit messages of individual changes.

Of course I can (and will) split both changes and discuss them separately. But I rated it highly possible that I get the feedback: both are wrong. It's intended and should be X and Y and please send an update for nativesdk-openssl :)

Cheers
--
Jens Rehsack - [email protected]