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 <ohnatiuk@cisco.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/meta/recipes-devtools/file/file_5.44.bb b/meta/recipes-devtools/file/file_5.44.bb
index 3090d346ed4fd56a71ce055d6dee07e0fd2c3767..08343842307c0c811457e26771d7b1ec7ee9cafc 100644 (file)
--- 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"