diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2023-01-17 12:06:31 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-18 16:42:28 +0000 |
commit | 8321a268afc849794cb7e8bdad4bbaf0ac0af734 (patch) | |
tree | 9d9e6a7e650cd687005995d155ebf3e5e26fa8aa /meta | |
parent | b5ef95f6b1ee83791ce798fbb11c819eaaa694be (diff) | |
download | poky-8321a268afc849794cb7e8bdad4bbaf0ac0af734.tar.gz |
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.
(From OE-Core rev: 6e2147ab1d0f3aad2dfe8180a3896c9c9bcfdac8)
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.18.0.bb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_4.18.0.bb b/meta/recipes-devtools/rpm/rpm_4.18.0.bb index 8eb0ab207e..61e395a9d0 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() { | |||
123 | cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/rpm.sh | 123 | cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/rpm.sh |
124 | export RPM_CONFIGDIR="$OECORE_NATIVE_SYSROOT${libdir}/rpm" | 124 | export RPM_CONFIGDIR="$OECORE_NATIVE_SYSROOT${libdir}/rpm" |
125 | export RPM_ETCCONFIGDIR="$OECORE_NATIVE_SYSROOT${sysconfdir}" | 125 | export RPM_ETCCONFIGDIR="$OECORE_NATIVE_SYSROOT${sysconfdir}" |
126 | export MAGIC="$OECORE_NATIVE_SYSROOT${datadir}/misc/magic.mgc" | ||
127 | export RPM_NO_CHROOT_FOR_SCRIPTS=1 | 126 | export RPM_NO_CHROOT_FOR_SCRIPTS=1 |
128 | EOF | 127 | EOF |
129 | } | 128 | } |