瀏覽代碼

buildtools-tarball: handle missing host pkg-config gracefully

The host might not have pkg-config installed, which is OK when using the
buildtools-extended-tarball, since that contains pkg-config. So the command in
the generated environment-setup-* script for setting HOST_PKG_PATH is expected
to fail in some cases without this being an error.

The generated environment-setup-* script might be sourced in a shell with
activated `errexit` option. Prevent the expected failure of this command from
being treated as an error.

The only usage of the HOST_PKG_PATH variable is in this script and already
handles the case of the variable being empty. The variable is not exposed to
anywhere outside this script so the effects of this change are limited to this
script.

(From OE-Core rev: 049a802cef23f9ecb5d373c0d27753a891a4b5a6)

Signed-off-by: Daniel Wagenknecht <dwagenknecht@emlix.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Daniel Wagenknecht 1 月之前
父節點
當前提交
a1bd1174ce
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      meta/recipes-core/meta/buildtools-tarball.bb

+ 1 - 1
meta/recipes-core/meta/buildtools-tarball.bb

@@ -73,7 +73,7 @@ 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
-	echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null)' >>$script
+	echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null || true)' >>$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'