diff options
author | Oleksandr Hnatiuk <ohnatiuk@cisco.com> | 2023-07-21 01:18:56 -0700 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-08-15 06:18:49 -1000 |
commit | 5a717511f281c10f061505eb6768caf0466afa2c (patch) | |
tree | 74d6756a44407a1a1f98563bfb79da6e4bd26859 | |
parent | c687d4326dd9074ade59ee8d98dfc0cdc7e7b3d8 (diff) | |
download | poky-5a717511f281c10f061505eb6768caf0466afa2c.tar.gz |
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.
(From OE-Core rev: 4a9832c55044b894e933179e5c1b6a96634809c0)
Signed-off-by: Oleksandr Hnatiuk <ohnatiuk@cisco.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit e76b059cf4ba9a79150032d68d012b233dd79a65)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-devtools/file/file_5.44.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/file/file_5.44.bb b/meta/recipes-devtools/file/file_5.44.bb index 3090d346ed..0834384230 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() { | |||
45 | } | 45 | } |
46 | 46 | ||
47 | do_install:append:class-nativesdk() { | 47 | do_install:append:class-nativesdk() { |
48 | create_wrapper ${D}/${bindir}/file MAGIC=${datadir}/misc/magic.mgc | ||
48 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | 49 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d |
49 | cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/file.sh | 50 | cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/file.sh |
50 | export MAGIC="$OECORE_NATIVE_SYSROOT${datadir}/misc/magic.mgc" | 51 | export MAGIC="$OECORE_NATIVE_SYSROOT${datadir}/misc/magic.mgc" |