From b5ef95f6b1ee83791ce798fbb11c819eaaa694be Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 17 Jan 2023 12:06:30 +0800 Subject: file: export MAGIC in SDK Previously, a wrapper is used for file, which adds '--magic-file' option to it. But other components might use libmagic and in such case, if there's no MAGIC environent variable set correctly, things do not work. For example, rpmbuild makes use of libmagic and it requries MAGIC to be set correctly. (From OE-Core rev: 47db876d09d9a4394048579c21d0b394450ce681) Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/recipes-devtools/file/file_5.44.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/file') diff --git a/meta/recipes-devtools/file/file_5.44.bb b/meta/recipes-devtools/file/file_5.44.bb index b3d821518a..d4b49341b7 100644 --- a/meta/recipes-devtools/file/file_5.44.bb +++ b/meta/recipes-devtools/file/file_5.44.bb @@ -32,6 +32,7 @@ EXTRA_OEMAKE:append:class-target = " -e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/fi EXTRA_OEMAKE:append:class-nativesdk = " -e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" FILES:${PN} += "${datadir}/misc/*.mgc" +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/file.sh" do_compile:append:class-native() { oe_runmake check @@ -43,8 +44,10 @@ do_install:append:class-native() { } do_install:append:class-nativesdk() { - create_cmdline_wrapper ${D}/${bindir}/file \ - --magic-file ${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" + EOF } BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf