| Message ID | 20250417022147.2776717-1-changqing.li@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [scarthgap,1/3] buildtools-tarball: move setting of envvars to respective envfile | expand |
The third patch in this series seems to be missing. Is this intentional? Steve On Wed, Apr 16, 2025 at 7:21 PM Changqing Li via lists.openembedded.org <changqing.li=windriver.com@lists.openembedded.org> wrote: > > From: Changqing Li <changqing.li@windriver.com> > > * make git,curl,python3-requests align with openssl, move the setting of > envvars into respective envfile > * for environment.d-openssl.sh, also check if ca-certificates.crt exist > before export envvars > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > --- > .../openssl/files/environment.d-openssl.sh | 7 +++++-- > meta/recipes-core/meta/buildtools-tarball.bb | 6 ------ > meta/recipes-devtools/git/git/environment.d-git.sh | 3 +++ > meta/recipes-devtools/git/git_2.44.1.bb | 8 ++++++++ > .../environment.d-python3-requests.sh | 3 +++ > .../python/python3-requests_2.32.3.bb | 11 +++++++++++ > meta/recipes-support/curl/curl/environment.d-curl.sh | 3 +++ > meta/recipes-support/curl/curl_8.7.1.bb | 9 +++++++++ > 8 files changed, 42 insertions(+), 8 deletions(-) > create mode 100644 meta/recipes-devtools/git/git/environment.d-git.sh > create mode 100644 meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh > create mode 100644 meta/recipes-support/curl/curl/environment.d-curl.sh > > diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh > index 6f23490c87..6cb82d7386 100644 > --- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh > +++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh > @@ -1,5 +1,8 @@ > export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf" > -export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" > -export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" > +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then > + export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" > + export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" > + export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} SSL_CERT_DIR SSL_CERT_FILE" > +fi > export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" > export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" > diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb > index e2ce5b3ecf..414c266663 100644 > --- a/meta/recipes-core/meta/buildtools-tarball.bb > +++ b/meta/recipes-core/meta/buildtools-tarball.bb > @@ -73,12 +73,6 @@ create_sdk_files:append () { > touch $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 > - if [ -e "${SDK_OUTPUT}${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt" ]; then > - 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 REQUESTS_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script > - echo 'export CURL_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script > - fi > echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null)' >>$script > echo 'export PKG_CONFIG_LIBDIR=${SDKPATHNATIVE}/${libdir}/pkgconfig:${SDKPATHNATIVE}/${datadir}/pkgconfig:${HOST_PKG_PATH:-/usr/lib/pkgconfig:/usr/share/pkgconfig}' >>$script > echo 'unset HOST_PKG_PATH' > diff --git a/meta/recipes-devtools/git/git/environment.d-git.sh b/meta/recipes-devtools/git/git/environment.d-git.sh > new file mode 100644 > index 0000000000..18104f0528 > --- /dev/null > +++ b/meta/recipes-devtools/git/git/environment.d-git.sh > @@ -0,0 +1,3 @@ > +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then > + export GIT_SSL_CAINFO="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" > +fi > diff --git a/meta/recipes-devtools/git/git_2.44.1.bb b/meta/recipes-devtools/git/git_2.44.1.bb > index 53d67eb40a..7229b9ae0c 100644 > --- a/meta/recipes-devtools/git/git_2.44.1.bb > +++ b/meta/recipes-devtools/git/git_2.44.1.bb > @@ -13,6 +13,10 @@ SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ > file://0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch \ > " > > +SRC_URI:append:class-nativesdk = " \ > + file://environment.d-git.sh \ > + " > + > S = "${WORKDIR}/git-${PV}" > > LIC_FILES_CHKSUM = "\ > @@ -115,6 +119,9 @@ do_install:append:class-nativesdk() { > GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ > GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} > perl_native_fixup > + > + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d > + install -m 644 ${WORKDIR}/environment.d-git.sh ${D}${SDKPATHNATIVE}/environment-setup.d/git.sh > } > > FILES:${PN} += "${datadir}/git-core ${libexecdir}/git-core/" > @@ -155,6 +162,7 @@ FILES:${PN}-tk = " \ > > PACKAGES =+ "gitweb" > FILES:gitweb = "${datadir}/gitweb/" > +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/git.sh" > RDEPENDS:gitweb = "perl" > > BBCLASSEXTEND = "native nativesdk" > diff --git a/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh > new file mode 100644 > index 0000000000..f2eee203ca > --- /dev/null > +++ b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh > @@ -0,0 +1,3 @@ > +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then > + export REQUESTS_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" > +fi > diff --git a/meta/recipes-devtools/python/python3-requests_2.32.3.bb b/meta/recipes-devtools/python/python3-requests_2.32.3.bb > index 4f0638b50c..36ff75f87d 100644 > --- a/meta/recipes-devtools/python/python3-requests_2.32.3.bb > +++ b/meta/recipes-devtools/python/python3-requests_2.32.3.bb > @@ -3,10 +3,19 @@ HOMEPAGE = "https://requests.readthedocs.io" > LICENSE = "Apache-2.0" > LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" > > +SRC_URI:append:class-nativesdk = " \ > + file://environment.d-python3-requests.sh \ > +" > + > SRC_URI[sha256sum] = "55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760" > > inherit pypi python_setuptools_build_meta > > +do_install:append:class-nativesdk() { > + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d > + install -m 644 ${WORKDIR}/environment.d-python3-requests.sh ${D}${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh > +} > + > RDEPENDS:${PN} += " \ > python3-certifi \ > python3-email \ > @@ -19,6 +28,8 @@ RDEPENDS:${PN} += " \ > python3-compression \ > " > > +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh" > + > CVE_PRODUCT = "requests" > > BBCLASSEXTEND = "native nativesdk" > diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh > new file mode 100644 > index 0000000000..0d53aabb8e > --- /dev/null > +++ b/meta/recipes-support/curl/curl/environment.d-curl.sh > @@ -0,0 +1,3 @@ > +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then > + export CURL_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" > +fi > diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb > index ddd591dd96..8f074f4ff7 100644 > --- a/meta/recipes-support/curl/curl_8.7.1.bb > +++ b/meta/recipes-support/curl/curl_8.7.1.bb > @@ -21,6 +21,11 @@ SRC_URI = " \ > file://CVE-2024-8096.patch \ > file://CVE-2024-9681.patch \ > " > + > +SRC_URI:append:class-nativesdk = " \ > + file://environment.d-curl.sh \ > +" > + > SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd" > > # Curl has used many names over the years... > @@ -104,6 +109,8 @@ do_install:append:class-target() { > > do_install:append:class-nativesdk() { > fix_absolute_paths > + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d > + install -m 644 ${WORKDIR}/environment.d-curl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/curl.sh > } > > do_compile_ptest() { > @@ -152,6 +159,8 @@ RRECOMMENDS:lib${BPN} += "ca-certificates" > > FILES:${PN} += "${datadir}/zsh" > > +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/curl.sh" > + > inherit multilib_script > MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" > > -- > 2.44.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#215022): https://lists.openembedded.org/g/openembedded-core/message/215022 > Mute This Topic: https://lists.openembedded.org/mt/112307271/3620601 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Thu, Apr 17, 2025 at 8:39 AM Steve Sakoman <steve@sakoman.com> wrote: > > The third patch in this series seems to be missing. Is this intentional? Also, can you add a cover letter explaining why this series is necessary. Is this fixing a bug? Thanks, Steve > On Wed, Apr 16, 2025 at 7:21 PM Changqing Li via > lists.openembedded.org > <changqing.li=windriver.com@lists.openembedded.org> wrote: > > > > From: Changqing Li <changqing.li@windriver.com> > > > > * make git,curl,python3-requests align with openssl, move the setting of > > envvars into respective envfile > > * for environment.d-openssl.sh, also check if ca-certificates.crt exist > > before export envvars > > > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > > --- > > .../openssl/files/environment.d-openssl.sh | 7 +++++-- > > meta/recipes-core/meta/buildtools-tarball.bb | 6 ------ > > meta/recipes-devtools/git/git/environment.d-git.sh | 3 +++ > > meta/recipes-devtools/git/git_2.44.1.bb | 8 ++++++++ > > .../environment.d-python3-requests.sh | 3 +++ > > .../python/python3-requests_2.32.3.bb | 11 +++++++++++ > > meta/recipes-support/curl/curl/environment.d-curl.sh | 3 +++ > > meta/recipes-support/curl/curl_8.7.1.bb | 9 +++++++++ > > 8 files changed, 42 insertions(+), 8 deletions(-) > > create mode 100644 meta/recipes-devtools/git/git/environment.d-git.sh > > create mode 100644 meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh > > create mode 100644 meta/recipes-support/curl/curl/environment.d-curl.sh > > > > diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh > > index 6f23490c87..6cb82d7386 100644 > > --- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh > > +++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh > > @@ -1,5 +1,8 @@ > > export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf" > > -export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" > > -export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" > > +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then > > + export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" > > + export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" > > + export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} SSL_CERT_DIR SSL_CERT_FILE" > > +fi > > export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" > > export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" > > diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb > > index e2ce5b3ecf..414c266663 100644 > > --- a/meta/recipes-core/meta/buildtools-tarball.bb > > +++ b/meta/recipes-core/meta/buildtools-tarball.bb > > @@ -73,12 +73,6 @@ create_sdk_files:append () { > > touch $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 > > - if [ -e "${SDK_OUTPUT}${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt" ]; then > > - 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 REQUESTS_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script > > - echo 'export CURL_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script > > - fi > > echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null)' >>$script > > echo 'export PKG_CONFIG_LIBDIR=${SDKPATHNATIVE}/${libdir}/pkgconfig:${SDKPATHNATIVE}/${datadir}/pkgconfig:${HOST_PKG_PATH:-/usr/lib/pkgconfig:/usr/share/pkgconfig}' >>$script > > echo 'unset HOST_PKG_PATH' > > diff --git a/meta/recipes-devtools/git/git/environment.d-git.sh b/meta/recipes-devtools/git/git/environment.d-git.sh > > new file mode 100644 > > index 0000000000..18104f0528 > > --- /dev/null > > +++ b/meta/recipes-devtools/git/git/environment.d-git.sh > > @@ -0,0 +1,3 @@ > > +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then > > + export GIT_SSL_CAINFO="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" > > +fi > > diff --git a/meta/recipes-devtools/git/git_2.44.1.bb b/meta/recipes-devtools/git/git_2.44.1.bb > > index 53d67eb40a..7229b9ae0c 100644 > > --- a/meta/recipes-devtools/git/git_2.44.1.bb > > +++ b/meta/recipes-devtools/git/git_2.44.1.bb > > @@ -13,6 +13,10 @@ SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ > > file://0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch \ > > " > > > > +SRC_URI:append:class-nativesdk = " \ > > + file://environment.d-git.sh \ > > + " > > + > > S = "${WORKDIR}/git-${PV}" > > > > LIC_FILES_CHKSUM = "\ > > @@ -115,6 +119,9 @@ do_install:append:class-nativesdk() { > > GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ > > GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} > > perl_native_fixup > > + > > + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d > > + install -m 644 ${WORKDIR}/environment.d-git.sh ${D}${SDKPATHNATIVE}/environment-setup.d/git.sh > > } > > > > FILES:${PN} += "${datadir}/git-core ${libexecdir}/git-core/" > > @@ -155,6 +162,7 @@ FILES:${PN}-tk = " \ > > > > PACKAGES =+ "gitweb" > > FILES:gitweb = "${datadir}/gitweb/" > > +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/git.sh" > > RDEPENDS:gitweb = "perl" > > > > BBCLASSEXTEND = "native nativesdk" > > diff --git a/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh > > new file mode 100644 > > index 0000000000..f2eee203ca > > --- /dev/null > > +++ b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh > > @@ -0,0 +1,3 @@ > > +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then > > + export REQUESTS_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" > > +fi > > diff --git a/meta/recipes-devtools/python/python3-requests_2.32.3.bb b/meta/recipes-devtools/python/python3-requests_2.32.3.bb > > index 4f0638b50c..36ff75f87d 100644 > > --- a/meta/recipes-devtools/python/python3-requests_2.32.3.bb > > +++ b/meta/recipes-devtools/python/python3-requests_2.32.3.bb > > @@ -3,10 +3,19 @@ HOMEPAGE = "https://requests.readthedocs.io" > > LICENSE = "Apache-2.0" > > LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" > > > > +SRC_URI:append:class-nativesdk = " \ > > + file://environment.d-python3-requests.sh \ > > +" > > + > > SRC_URI[sha256sum] = "55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760" > > > > inherit pypi python_setuptools_build_meta > > > > +do_install:append:class-nativesdk() { > > + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d > > + install -m 644 ${WORKDIR}/environment.d-python3-requests.sh ${D}${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh > > +} > > + > > RDEPENDS:${PN} += " \ > > python3-certifi \ > > python3-email \ > > @@ -19,6 +28,8 @@ RDEPENDS:${PN} += " \ > > python3-compression \ > > " > > > > +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh" > > + > > CVE_PRODUCT = "requests" > > > > BBCLASSEXTEND = "native nativesdk" > > diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh > > new file mode 100644 > > index 0000000000..0d53aabb8e > > --- /dev/null > > +++ b/meta/recipes-support/curl/curl/environment.d-curl.sh > > @@ -0,0 +1,3 @@ > > +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then > > + export CURL_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" > > +fi > > diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb > > index ddd591dd96..8f074f4ff7 100644 > > --- a/meta/recipes-support/curl/curl_8.7.1.bb > > +++ b/meta/recipes-support/curl/curl_8.7.1.bb > > @@ -21,6 +21,11 @@ SRC_URI = " \ > > file://CVE-2024-8096.patch \ > > file://CVE-2024-9681.patch \ > > " > > + > > +SRC_URI:append:class-nativesdk = " \ > > + file://environment.d-curl.sh \ > > +" > > + > > SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd" > > > > # Curl has used many names over the years... > > @@ -104,6 +109,8 @@ do_install:append:class-target() { > > > > do_install:append:class-nativesdk() { > > fix_absolute_paths > > + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d > > + install -m 644 ${WORKDIR}/environment.d-curl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/curl.sh > > } > > > > do_compile_ptest() { > > @@ -152,6 +159,8 @@ RRECOMMENDS:lib${BPN} += "ca-certificates" > > > > FILES:${PN} += "${datadir}/zsh" > > > > +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/curl.sh" > > + > > inherit multilib_script > > MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" > > > > -- > > 2.44.1 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#215022): https://lists.openembedded.org/g/openembedded-core/message/215022 > > Mute This Topic: https://lists.openembedded.org/mt/112307271/3620601 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com] > > -=-=-=-=-=-=-=-=-=-=-=- > >
On 4/17/25 23:43, Steve Sakoman wrote: > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and know the content is safe. > > On Thu, Apr 17, 2025 at 8:39 AM Steve Sakoman<steve@sakoman.com> wrote: >> The third patch in this series seems to be missing. Is this intentional? 1/2 is merged in master, and 3 is pending(currently on master-next), so I only send 1/2 for scarthgap. Sorry I forgot change the patch number. > Also, can you add a cover letter explaining why this series is > necessary. Is this fixing a bug? OK. I will resend this series. Regards Changqing > > Thanks, > > Steve > >> On Wed, Apr 16, 2025 at 7:21 PM Changqing Li via >> lists.openembedded.org >> <changqing.li=windriver.com@lists.openembedded.org> wrote: >>> From: Changqing Li<changqing.li@windriver.com> >>> >>> * make git,curl,python3-requests align with openssl, move the setting of >>> envvars into respective envfile >>> * for environment.d-openssl.sh, also check if ca-certificates.crt exist >>> before export envvars >>> >>> Signed-off-by: Changqing Li<changqing.li@windriver.com> >>> --- >>> .../openssl/files/environment.d-openssl.sh | 7 +++++-- >>> meta/recipes-core/meta/buildtools-tarball.bb | 6 ------ >>> meta/recipes-devtools/git/git/environment.d-git.sh | 3 +++ >>> meta/recipes-devtools/git/git_2.44.1.bb | 8 ++++++++ >>> .../environment.d-python3-requests.sh | 3 +++ >>> .../python/python3-requests_2.32.3.bb | 11 +++++++++++ >>> meta/recipes-support/curl/curl/environment.d-curl.sh | 3 +++ >>> meta/recipes-support/curl/curl_8.7.1.bb | 9 +++++++++ >>> 8 files changed, 42 insertions(+), 8 deletions(-) >>> create mode 100644 meta/recipes-devtools/git/git/environment.d-git.sh >>> create mode 100644 meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh >>> create mode 100644 meta/recipes-support/curl/curl/environment.d-curl.sh >>> >>> diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh >>> index 6f23490c87..6cb82d7386 100644 >>> --- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh >>> +++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh >>> @@ -1,5 +1,8 @@ >>> export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf" >>> -export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" >>> -export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" >>> +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then >>> + export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" >>> + export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" >>> + export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} SSL_CERT_DIR SSL_CERT_FILE" >>> +fi >>> export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" >>> export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" >>> diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb >>> index e2ce5b3ecf..414c266663 100644 >>> --- a/meta/recipes-core/meta/buildtools-tarball.bb >>> +++ b/meta/recipes-core/meta/buildtools-tarball.bb >>> @@ -73,12 +73,6 @@ create_sdk_files:append () { >>> touch $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 >>> - if [ -e "${SDK_OUTPUT}${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt" ]; then >>> - 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 REQUESTS_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script >>> - echo 'export CURL_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script >>> - fi >>> echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null)' >>$script >>> echo 'export PKG_CONFIG_LIBDIR=${SDKPATHNATIVE}/${libdir}/pkgconfig:${SDKPATHNATIVE}/${datadir}/pkgconfig:${HOST_PKG_PATH:-/usr/lib/pkgconfig:/usr/share/pkgconfig}' >>$script >>> echo 'unset HOST_PKG_PATH' >>> diff --git a/meta/recipes-devtools/git/git/environment.d-git.sh b/meta/recipes-devtools/git/git/environment.d-git.sh >>> new file mode 100644 >>> index 0000000000..18104f0528 >>> --- /dev/null >>> +++ b/meta/recipes-devtools/git/git/environment.d-git.sh >>> @@ -0,0 +1,3 @@ >>> +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then >>> + export GIT_SSL_CAINFO="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" >>> +fi >>> diff --git a/meta/recipes-devtools/git/git_2.44.1.bb b/meta/recipes-devtools/git/git_2.44.1.bb >>> index 53d67eb40a..7229b9ae0c 100644 >>> --- a/meta/recipes-devtools/git/git_2.44.1.bb >>> +++ b/meta/recipes-devtools/git/git_2.44.1.bb >>> @@ -13,6 +13,10 @@ SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ >>> file://0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch \ >>> " >>> >>> +SRC_URI:append:class-nativesdk = " \ >>> +file://environment.d-git.sh \ >>> + " >>> + >>> S = "${WORKDIR}/git-${PV}" >>> >>> LIC_FILES_CHKSUM ="\ @@ -115,6 +119,9 @@ do_install:append:class-nativesdk() { >>> GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ >>> GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} >>> perl_native_fixup + + mkdir -p >>> ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 >>> ${WORKDIR}/environment.d-git.sh >>> ${D}${SDKPATHNATIVE}/environment-setup.d/git.sh } FILES:${PN} += "${datadir}/git-core ${libexecdir}/git-core/" >>> @@ -155,6 +162,7 @@ FILES:${PN}-tk = " \ >>> >>> PACKAGES =+ "gitweb" >>> FILES:gitweb = "${datadir}/gitweb/" >>> +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/git.sh" >>> RDEPENDS:gitweb = "perl" >>> >>> BBCLASSEXTEND = "native nativesdk" >>> diff --git a/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh >>> new file mode 100644 >>> index 0000000000..f2eee203ca >>> --- /dev/null >>> +++ b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh >>> @@ -0,0 +1,3 @@ >>> +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then >>> + export REQUESTS_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" >>> +fi >>> diff --git a/meta/recipes-devtools/python/python3-requests_2.32.3.bb b/meta/recipes-devtools/python/python3-requests_2.32.3.bb >>> index 4f0638b50c..36ff75f87d 100644 >>> --- a/meta/recipes-devtools/python/python3-requests_2.32.3.bb >>> +++ b/meta/recipes-devtools/python/python3-requests_2.32.3.bb >>> @@ -3,10 +3,19 @@ HOMEPAGE ="https://requests.readthedocs.io" >>> LICENSE = "Apache-2.0" >>> LIC_FILES_CHKSUM ="file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" >>> >>> +SRC_URI:append:class-nativesdk = " \ >>> +file://environment.d-python3-requests.sh \ >>> +" >>> + >>> SRC_URI[sha256sum] = "55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760" >>> >>> inherit pypi python_setuptools_build_meta >>> >>> +do_install:append:class-nativesdk() { >>> + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d >>> + install -m 644 ${WORKDIR}/environment.d-python3-requests.sh ${D}${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh >>> +} >>> + >>> RDEPENDS:${PN} += " \ >>> python3-certifi \ >>> python3-email \ >>> @@ -19,6 +28,8 @@ RDEPENDS:${PN} += " \ >>> python3-compression \ >>> " >>> >>> +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh" >>> + >>> CVE_PRODUCT = "requests" >>> >>> BBCLASSEXTEND = "native nativesdk" >>> diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh >>> new file mode 100644 >>> index 0000000000..0d53aabb8e >>> --- /dev/null >>> +++ b/meta/recipes-support/curl/curl/environment.d-curl.sh >>> @@ -0,0 +1,3 @@ >>> +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then >>> + export CURL_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" >>> +fi >>> diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb >>> index ddd591dd96..8f074f4ff7 100644 >>> --- a/meta/recipes-support/curl/curl_8.7.1.bb >>> +++ b/meta/recipes-support/curl/curl_8.7.1.bb >>> @@ -21,6 +21,11 @@ SRC_URI = " \ >>> file://CVE-2024-8096.patch \ >>> file://CVE-2024-9681.patch \ >>> " >>> + >>> +SRC_URI:append:class-nativesdk = " \ >>> +file://environment.d-curl.sh \ >>> +" >>> + >>> SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd" >>> >>> # Curl has used many names over the years... >>> @@ -104,6 +109,8 @@ do_install:append:class-target() { >>> >>> do_install:append:class-nativesdk() { >>> fix_absolute_paths >>> + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d >>> + install -m 644 ${WORKDIR}/environment.d-curl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/curl.sh >>> } >>> >>> do_compile_ptest() { >>> @@ -152,6 +159,8 @@ RRECOMMENDS:lib${BPN} += "ca-certificates" >>> >>> FILES:${PN} += "${datadir}/zsh" >>> >>> +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/curl.sh" >>> + >>> inherit multilib_script >>> MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" >>> >>> -- >>> 2.44.1 >>> >>> >>> -=-=-=-=-=-=-=-=-=-=-=- >>> Links: You receive all messages sent to this group. >>> View/Reply Online (#215022):https://lists.openembedded.org/g/openembedded-core/message/215022 >>> Mute This Topic:https://lists.openembedded.org/mt/112307271/3620601 >>> Group Owner:openembedded-core+owner@lists.openembedded.org >>> Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com] >>> -=-=-=-=-=-=-=-=-=-=-=- >>>
diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh index 6f23490c87..6cb82d7386 100644 --- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh +++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh @@ -1,5 +1,8 @@ export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf" -export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" -export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" + export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" + export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} SSL_CERT_DIR SSL_CERT_FILE" +fi export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index e2ce5b3ecf..414c266663 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -73,12 +73,6 @@ create_sdk_files:append () { touch $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 - if [ -e "${SDK_OUTPUT}${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt" ]; then - 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 REQUESTS_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script - echo 'export CURL_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script - fi echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null)' >>$script echo 'export PKG_CONFIG_LIBDIR=${SDKPATHNATIVE}/${libdir}/pkgconfig:${SDKPATHNATIVE}/${datadir}/pkgconfig:${HOST_PKG_PATH:-/usr/lib/pkgconfig:/usr/share/pkgconfig}' >>$script echo 'unset HOST_PKG_PATH' diff --git a/meta/recipes-devtools/git/git/environment.d-git.sh b/meta/recipes-devtools/git/git/environment.d-git.sh new file mode 100644 index 0000000000..18104f0528 --- /dev/null +++ b/meta/recipes-devtools/git/git/environment.d-git.sh @@ -0,0 +1,3 @@ +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export GIT_SSL_CAINFO="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" +fi diff --git a/meta/recipes-devtools/git/git_2.44.1.bb b/meta/recipes-devtools/git/git_2.44.1.bb index 53d67eb40a..7229b9ae0c 100644 --- a/meta/recipes-devtools/git/git_2.44.1.bb +++ b/meta/recipes-devtools/git/git_2.44.1.bb @@ -13,6 +13,10 @@ SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ file://0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch \ " +SRC_URI:append:class-nativesdk = " \ + file://environment.d-git.sh \ + " + S = "${WORKDIR}/git-${PV}" LIC_FILES_CHKSUM = "\ @@ -115,6 +119,9 @@ do_install:append:class-nativesdk() { GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} perl_native_fixup + + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 ${WORKDIR}/environment.d-git.sh ${D}${SDKPATHNATIVE}/environment-setup.d/git.sh } FILES:${PN} += "${datadir}/git-core ${libexecdir}/git-core/" @@ -155,6 +162,7 @@ FILES:${PN}-tk = " \ PACKAGES =+ "gitweb" FILES:gitweb = "${datadir}/gitweb/" +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/git.sh" RDEPENDS:gitweb = "perl" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh new file mode 100644 index 0000000000..f2eee203ca --- /dev/null +++ b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh @@ -0,0 +1,3 @@ +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export REQUESTS_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" +fi diff --git a/meta/recipes-devtools/python/python3-requests_2.32.3.bb b/meta/recipes-devtools/python/python3-requests_2.32.3.bb index 4f0638b50c..36ff75f87d 100644 --- a/meta/recipes-devtools/python/python3-requests_2.32.3.bb +++ b/meta/recipes-devtools/python/python3-requests_2.32.3.bb @@ -3,10 +3,19 @@ HOMEPAGE = "https://requests.readthedocs.io" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" +SRC_URI:append:class-nativesdk = " \ + file://environment.d-python3-requests.sh \ +" + SRC_URI[sha256sum] = "55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760" inherit pypi python_setuptools_build_meta +do_install:append:class-nativesdk() { + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 ${WORKDIR}/environment.d-python3-requests.sh ${D}${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh +} + RDEPENDS:${PN} += " \ python3-certifi \ python3-email \ @@ -19,6 +28,8 @@ RDEPENDS:${PN} += " \ python3-compression \ " +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh" + CVE_PRODUCT = "requests" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh new file mode 100644 index 0000000000..0d53aabb8e --- /dev/null +++ b/meta/recipes-support/curl/curl/environment.d-curl.sh @@ -0,0 +1,3 @@ +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export CURL_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" +fi diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb index ddd591dd96..8f074f4ff7 100644 --- a/meta/recipes-support/curl/curl_8.7.1.bb +++ b/meta/recipes-support/curl/curl_8.7.1.bb @@ -21,6 +21,11 @@ SRC_URI = " \ file://CVE-2024-8096.patch \ file://CVE-2024-9681.patch \ " + +SRC_URI:append:class-nativesdk = " \ + file://environment.d-curl.sh \ +" + SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd" # Curl has used many names over the years... @@ -104,6 +109,8 @@ do_install:append:class-target() { do_install:append:class-nativesdk() { fix_absolute_paths + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 ${WORKDIR}/environment.d-curl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/curl.sh } do_compile_ptest() { @@ -152,6 +159,8 @@ RRECOMMENDS:lib${BPN} += "ca-certificates" FILES:${PN} += "${datadir}/zsh" +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/curl.sh" + inherit multilib_script MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config"