diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-23 18:44:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-23 22:35:01 +0000 |
commit | 116743ecc292ea1e23c0ba6cb3fb149cf61646d6 (patch) | |
tree | 4df0f619b5395c8bb6ec89616f62a55398341419 /meta/recipes-support/diffoscope | |
parent | 8b299a62c55aa8d1583aff4b8428f16def7231b7 (diff) | |
download | poky-116743ecc292ea1e23c0ba6cb3fb149cf61646d6.tar.gz |
diffoscope: Ensure the correct magic file is used
diffoscope uses libmagic and it was searching in file-native's sysroot
for the magic file. Wrap it and set MAGIC in the environment to
ensure the file is found correctly and avoid build failures.
(From OE-Core rev: 3488a8316891829892bd41a1caacaeeef73da7ef)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/diffoscope')
-rw-r--r-- | meta/recipes-support/diffoscope/diffoscope_167.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-support/diffoscope/diffoscope_167.bb b/meta/recipes-support/diffoscope/diffoscope_167.bb index 9ce59a0ba0..1882d549a4 100644 --- a/meta/recipes-support/diffoscope/diffoscope_167.bb +++ b/meta/recipes-support/diffoscope/diffoscope_167.bb | |||
@@ -14,4 +14,8 @@ RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magi | |||
14 | # Dependencies don't build for musl | 14 | # Dependencies don't build for musl |
15 | COMPATIBLE_HOST_libc-musl = 'null' | 15 | COMPATIBLE_HOST_libc-musl = 'null' |
16 | 16 | ||
17 | do_install_append_class-native() { | ||
18 | create_wrapper ${D}${bindir}/diffoscope MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc | ||
19 | } | ||
20 | |||
17 | BBCLASSEXTEND = "native" | 21 | BBCLASSEXTEND = "native" |