summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Middelschulte <leif.middelschulte@gmail.com>2021-11-08 15:04:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-08 22:03:51 +0000
commit6bc5e9a03ce626aece5dfa084f71fb94e674b478 (patch)
treec3b4e589256bd24b8442dd3f3439c0e155ddf8f6
parentc22ebd2f54b29b22e50a4f04d948efdd04924c19 (diff)
downloadpoky-6bc5e9a03ce626aece5dfa084f71fb94e674b478.tar.gz
meson: improve SDK's wrapper to make Wraps work
Meson, as provided by the SDK, would fail to fetch Wraps' sources on bare systems (i.e. systems, that only provide little more than the SDK). This change modifies the wrapper script so that it sets an environment variable (unless it is already set) that is used to determine valid certificates for secured connections. It does not affect bitbake's interaction with meson. The SDK's SSL directory was not searched, so meson would fail when it tried to fetch sources via https, that were specified in wrap files. Specifically `urllib` would fail: ``` <urlopen error [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (_ssl.c:1129)> ``` Caution: this patch depends on the underlying C library (i.e. openssl) to consider this environment variable. (From OE-Core rev: afad2f09ebbfe395f8fafce8218e26056479fe39) Signed-off-by: Leif Middelschulte <Leif.Middelschulte@klsmartin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-devtools/meson/meson/meson-wrapper4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper
index d4b5187f8d..8fafaad975 100755
--- a/meta/recipes-devtools/meson/meson/meson-wrapper
+++ b/meta/recipes-devtools/meson/meson/meson-wrapper
@@ -4,6 +4,10 @@ if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
4 echo "OECORE_NATIVE_SYSROOT not set; are you in a Yocto SDK environment?" >&2 4 echo "OECORE_NATIVE_SYSROOT not set; are you in a Yocto SDK environment?" >&2
5fi 5fi
6 6
7if [ -z "$SSL_CERT_DIR" ]; then
8 export SSL_CERT_DIR="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/"
9fi
10
7# If these are set to a cross-compile path, meson will get confused and try to 11# If these are set to a cross-compile path, meson will get confused and try to
8# use them as native tools. Unset them to prevent this, as all the cross-compile 12# use them as native tools. Unset them to prevent this, as all the cross-compile
9# config is already in meson.cross. 13# config is already in meson.cross.