From e76b059cf4ba9a79150032d68d012b233dd79a65 Mon Sep 17 00:00:00 2001 From: Oleksandr Hnatiuk Date: Fri, 21 Jul 2023 01:18:56 -0700 Subject: [PATCH] file: return wrapper to fix builds when file is in buildtools-tarball Wrapper that adds proper path to magic file was removed in 47db876d09d9a4394048579c21d0b394450ce681 in favor of environment-setup.d/file.sh which now contains `MAGIC` environment variable. This breaks builds that rely on external buildtools with `file` included in buildtools-tarball (e.g. via TOOLCHAIN_HOST_TASK) because do_populate_sysroot task invokes `file` via `subprocess.check_output` (in is_elf function) and doesn't use variables from files in environment-setup.d. To address this use case, we need to preserve the wrapper, but also have environment-setup.d/file.sh for the purposes described in 47db876d09d9a4394048579c21d0b394450ce681. Signed-off-by: Oleksandr Hnatiuk Signed-off-by: Alexandre Belloni --- meta/recipes-devtools/file/file_5.44.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/file/file_5.44.bb b/meta/recipes-devtools/file/file_5.44.bb index 3090d346ed4..08343842307 100644 --- a/meta/recipes-devtools/file/file_5.44.bb +++ b/meta/recipes-devtools/file/file_5.44.bb @@ -45,6 +45,7 @@ do_install:append:class-native() { } do_install:append:class-nativesdk() { + create_wrapper ${D}/${bindir}/file MAGIC=${datadir}/misc/magic.mgc mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/file.sh export MAGIC="$OECORE_NATIVE_SYSROOT${datadir}/misc/magic.mgc" -- 2.47.3