]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
file: return wrapper to fix builds when file is in buildtools-tarball
authorOleksandr Hnatiuk <ohnatiuk@cisco.com>
Fri, 21 Jul 2023 08:18:56 +0000 (01:18 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 25 Jul 2023 14:27:30 +0000 (15:27 +0100)
commite76b059cf4ba9a79150032d68d012b233dd79a65
tree7dd0bc7451500e2d4c7e3dac47855fe727bfc34d
parent8042f96a90e979374299404dbe34164f9aa65079
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>
meta/recipes-devtools/file/file_5.44.bb