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.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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