From afad2f09ebbfe395f8fafce8218e26056479fe39 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Mon, 8 Nov 2021 15:04:29 +0100 Subject: [PATCH] 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: ``` ``` Caution: this patch depends on the underlying C library (i.e. openssl) to consider this environment variable. Signed-off-by: Leif Middelschulte Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson/meson-wrapper | 4 ++++ 1 file changed, 4 insertions(+) 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 echo "OECORE_NATIVE_SYSROOT not set; are you in a Yocto SDK environment?" >&2 fi +if [ -z "$SSL_CERT_DIR" ]; then + export SSL_CERT_DIR="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/" +fi + # If these are set to a cross-compile path, meson will get confused and try to # use them as native tools. Unset them to prevent this, as all the cross-compile # config is already in meson.cross. -- 2.40.1