From: Chen Qi Date: Tue, 17 Jan 2023 04:06:31 +0000 (+0800) Subject: rpm: do not export MAGIC in SDK X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1920 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e2147ab1d0f3aad2dfe8180a3896c9c9bcfdac8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git rpm: do not export MAGIC in SDK This MAGIC variable is used by libmagic (file), and should be exported by the file recipe. As the rpm recipe has 'file' in its DEPENDS, its sub-packages which links to libmagic will be automatically added the 'file' runtime dependency. More specifically, it's the rpm-build package. So in case components in nativesdk-rpm-build package uses libmagic, the nativesdk-file package will be installed and the MAGIC var will be exported. Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/rpm/rpm_4.18.0.bb b/meta/recipes-devtools/rpm/rpm_4.18.0.bb index 8eb0ab207e3..61e395a9d09 100644 --- a/meta/recipes-devtools/rpm/rpm_4.18.0.bb +++ b/meta/recipes-devtools/rpm/rpm_4.18.0.bb @@ -123,7 +123,6 @@ do_install:append:class-nativesdk() { cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/rpm.sh export RPM_CONFIGDIR="$OECORE_NATIVE_SYSROOT${libdir}/rpm" export RPM_ETCCONFIGDIR="$OECORE_NATIVE_SYSROOT${sysconfdir}" - export MAGIC="$OECORE_NATIVE_SYSROOT${datadir}/misc/magic.mgc" export RPM_NO_CHROOT_FOR_SCRIPTS=1 EOF }