]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
rpm: do not export MAGIC in SDK
authorChen Qi <Qi.Chen@windriver.com>
Tue, 17 Jan 2023 04:06:31 +0000 (12:06 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 18 Jan 2023 16:42:24 +0000 (16:42 +0000)
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 <Qi.Chen@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/rpm/rpm_4.18.0.bb

index 8eb0ab207e394dfda63ce47c9aeaf3275b60a0fa..61e395a9d09b7b399b5dcf16ac651bd01ab2e09b 100644 (file)
@@ -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
 }