* [OE-core][PATCH v2 1/2] toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups
@ 2020-07-24 5:26 Jens Rehsack
2020-07-24 5:26 ` [OE-core][PATCH v2 2/2] buildtools-tarball: eliminate overwtiting OPENSSL_CONF Jens Rehsack
2020-07-27 16:06 ` [OE-core][PATCH v2 1/2] toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups Richard Purdie
0 siblings, 2 replies; 6+ messages in thread
From: Jens Rehsack @ 2020-07-24 5:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Jens Rehsack
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 <sno@netbsd.org>
---
meta/classes/toolchain-scripts.bbclass | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index db1d3215ef..e3959e21e8 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -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
}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [OE-core][PATCH v2 2/2] buildtools-tarball: eliminate overwtiting OPENSSL_CONF
2020-07-24 5:26 [OE-core][PATCH v2 1/2] toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups Jens Rehsack
@ 2020-07-24 5:26 ` Jens Rehsack
2020-07-27 22:26 ` Richard Purdie
2020-07-27 16:06 ` [OE-core][PATCH v2 1/2] toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups Richard Purdie
1 sibling, 1 reply; 6+ messages in thread
From: Jens Rehsack @ 2020-07-24 5:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Jens Rehsack
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
Signed-off-by: Jens Rehsack <sno@netbsd.org>
---
meta/recipes-core/meta/buildtools-tarball.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index d0f8dd7d7c..02e662b5cc 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [OE-core][PATCH v2 1/2] toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups
2020-07-24 5:26 [OE-core][PATCH v2 1/2] toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups Jens Rehsack
2020-07-24 5:26 ` [OE-core][PATCH v2 2/2] buildtools-tarball: eliminate overwtiting OPENSSL_CONF Jens Rehsack
@ 2020-07-27 16:06 ` Richard Purdie
2020-08-04 10:22 ` Jens Rehsack
1 sibling, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2020-07-27 16:06 UTC (permalink / raw)
To: Jens Rehsack, openembedded-core; +Cc: Jens Rehsack
On Fri, 2020-07-24 at 07:26 +0200, Jens Rehsack wrote:
> 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 <sno@netbsd.org>
> ---
> meta/classes/toolchain-scripts.bbclass | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
> index db1d3215ef..e3959e21e8 100644
> --- a/meta/classes/toolchain-scripts.bbclass
> +++ b/meta/classes/toolchain-scripts.bbclass
> @@ -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
> }
I finally got around to looking at this, sorry about the delay. Whilst
this fixes the issue and doesn't harm anything, I think its incorrect.
I suspect that $OECORE_NATIVE_SYSROOT should be pointing at
${SDKPATH}/buildtools/sysroots/${SDK_SYS}.
Could you see where $OECORE_NATIVE_SYSROOT is pointing and see if we
perhaps can't fix that instead?
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core][PATCH v2 2/2] buildtools-tarball: eliminate overwtiting OPENSSL_CONF
2020-07-24 5:26 ` [OE-core][PATCH v2 2/2] buildtools-tarball: eliminate overwtiting OPENSSL_CONF Jens Rehsack
@ 2020-07-27 22:26 ` Richard Purdie
2020-08-04 9:51 ` Jens Rehsack
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2020-07-27 22:26 UTC (permalink / raw)
To: Jens Rehsack, openembedded-core; +Cc: Jens Rehsack
On Fri, 2020-07-24 at 07:26 +0200, Jens Rehsack wrote:
> 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
>
> Signed-off-by: Jens Rehsack <sno@netbsd.org>
> ---
> meta/recipes-core/meta/buildtools-tarball.bb | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
> index d0f8dd7d7c..02e662b5cc 100644
> --- a/meta/recipes-core/meta/buildtools-tarball.bb
> +++ b/meta/recipes-core/meta/buildtools-tarball.bb
> @@ -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
I did look at this further. I don't see anywhere in buildtools-tarball
that the code you add in toolchain-scripts.bbclass is actually run, it
doesn't make it into the buildtools tarball.
Note the code does:
rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*
[...]
# Generate new (mini) sdk-environment-setup file
script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}}
touch $script
so your patch definitely breaks buildtools. I therefore don't plan to
merge it.
You are right that we could add something here to source the
environment.d files within OECORE_NATIVE_SYSROOT but you'd need to add
that to the buildtools environment script itself.
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core][PATCH v2 2/2] buildtools-tarball: eliminate overwtiting OPENSSL_CONF
2020-07-27 22:26 ` Richard Purdie
@ 2020-08-04 9:51 ` Jens Rehsack
0 siblings, 0 replies; 6+ messages in thread
From: Jens Rehsack @ 2020-08-04 9:51 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3401 bytes --]
Am 28.07.2020 um 00:26 schrieb Richard Purdie <richard.purdie@linuxfoundation.org>:
>
> On Fri, 2020-07-24 at 07:26 +0200, Jens Rehsack wrote:
>> 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
>>
>> Signed-off-by: Jens Rehsack <sno@netbsd.org>
>> ---
>> meta/recipes-core/meta/buildtools-tarball.bb | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
>> index d0f8dd7d7c..02e662b5cc 100644
>> --- a/meta/recipes-core/meta/buildtools-tarball.bb
>> +++ b/meta/recipes-core/meta/buildtools-tarball.bb
>> @@ -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
>
> I did look at this further. I don't see anywhere in buildtools-tarball
> that the code you add in toolchain-scripts.bbclass is actually run, it
> doesn't make it into the buildtools tarball.
>
> Note the code does:
>
> rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*
> [...]
>
> # Generate new (mini) sdk-environment-setup file
> script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}}
> touch $script
>
> so your patch definitely breaks buildtools. I therefore don't plan to
> merge it.
While I wouldn't argue against not merging it, I disagree the reasoning:
There is an buildtools/environment-setup-x86_64-pokysdk-linux in my created SDK which contains:
$ cat buildtools/environment-setup-x86_64-pokysdk-linux
export PATH=/home/sno/sds-lp791a-sdk/buildtools/sysroots/x86_64-pokysdk-linux/usr/bin:$PATH
#OECORE_NATIVE_SYSROOT="/home/sno/sds-lp791a-sdk/buildtools/sysroots/x86_64-pokysdk-linux"
export GIT_SSL_CAINFO="/home/sno/sds-lp791a-sdk/buildtools/sysroots/x86_64-pokysdk-linux/etc/ssl/certs/ca-certificates.crt"
export SSL_CERT_FILE="/home/sno/sds-lp791a-sdk/buildtools/sysroots/x86_64-pokysdk-linux/etc/ssl/certs/ca-certificates.crt"
export OPENSSL_CONF="/home/sno/sds-lp791a-sdk/buildtools/sysroots/x86_64-pokysdk-linux/etc/ssl/openssl.cnf"
So it's a bit weird - and deserves more investigation.
> You are right that we could add something here to source the
> environment.d files within OECORE_NATIVE_SYSROOT but you'd need to add
> that to the buildtools environment script itself.
Maybe we can find a way so collect snippets - but I wanted to show the conflict between
buildtools/environment-setup-x86_64-pokysdk-linux and buildtools/sysroots/x86_64-pokysdk-linux/environment-setup.d/openssl.sh.
$ cat buildtools/sysroots/x86_64-pokysdk-linux/environment-setup.d/openssl.sh
export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-1.1/openssl.cnf"
This conflict should get resolved somehow.
> Cheers,
>
> Richard
Cheers
--
Jens Rehsack - rehsack@gmail.com
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 849 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core][PATCH v2 1/2] toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups
2020-07-27 16:06 ` [OE-core][PATCH v2 1/2] toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups Richard Purdie
@ 2020-08-04 10:22 ` Jens Rehsack
0 siblings, 0 replies; 6+ messages in thread
From: Jens Rehsack @ 2020-08-04 10:22 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2164 bytes --]
> Am 27.07.2020 um 18:06 schrieb Richard Purdie <richard.purdie@linuxfoundation.org>:
>
> On Fri, 2020-07-24 at 07:26 +0200, Jens Rehsack wrote:
>> 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 <sno@netbsd.org>
>> ---
>> meta/classes/toolchain-scripts.bbclass | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
>> index db1d3215ef..e3959e21e8 100644
>> --- a/meta/classes/toolchain-scripts.bbclass
>> +++ b/meta/classes/toolchain-scripts.bbclass
>> @@ -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
>> }
>
> I finally got around to looking at this, sorry about the delay. Whilst
> this fixes the issue and doesn't harm anything, I think its incorrect.
> I suspect that $OECORE_NATIVE_SYSROOT should be pointing at
> ${SDKPATH}/buildtools/sysroots/${SDK_SYS}.
This would definitively a much better solution. Actually it's created as follows:
```
sdkpathnative=${7:-${SDKPATHNATIVE}}
echo "export OECORE_NATIVE_SYSROOT=\"$sdkpathnative\"" >> $script
```
Which is expanded (taken from `bitbake -e`):
# $SDKPATHNATIVE
# set /home/sno/gpw-community-bsp/sources/poky/meta/conf/bitbake.conf:424
# "${SDKPATH}/sysroots/${SDK_SYS}"
SDKPATHNATIVE="/opt/gpw/1.0.0/sysroots/x86_64-pokysdk-linux"
And it's updates after installing the SDK to:
export OECORE_NATIVE_SYSROOT="/home/sno/sds-lp791a-sdk/tmp/sysroots/x86_64"
> Could you see where $OECORE_NATIVE_SYSROOT is pointing and see if we
> perhaps can't fix that instead?
Any suggestions?
Cheers
--
Jens Rehsack - rehsack@gmail.com
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 849 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-08-04 10:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-24 5:26 [OE-core][PATCH v2 1/2] toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups Jens Rehsack
2020-07-24 5:26 ` [OE-core][PATCH v2 2/2] buildtools-tarball: eliminate overwtiting OPENSSL_CONF Jens Rehsack
2020-07-27 22:26 ` Richard Purdie
2020-08-04 9:51 ` Jens Rehsack
2020-07-27 16:06 ` [OE-core][PATCH v2 1/2] toolchain-scripts.bbclass: also recognize ${SDK_SYS} env setups Richard Purdie
2020-08-04 10:22 ` Jens Rehsack
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.