[OE-core] [PATCH] rpm: fix rpm path in nativesdk
Zhaolong Zhang
zhangzl2013 at 126.com
Fri Sep 28 06:39:16 UTC 2018
Fix the incorrect path inside the nativesdk 'rpmdeps' wrapper.
Also fix the hard coded path in 'find-provides' and 'find-provides' for nativesdk.
Signed-off-by: Zhaolong Zhang <zhangzl2013 at 126.com>
---
meta/recipes-devtools/rpm/rpm_4.14.2.bb | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.bb b/meta/recipes-devtools/rpm/rpm_4.14.2.bb
index 46f8837..f22eee0 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.bb
@@ -103,12 +103,15 @@ do_install_append_class-native() {
do_install_append_class-nativesdk() {
for tool in ${WRAPPER_TOOLS}; do
create_wrapper ${D}$tool \
- RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
- RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/..} \
- MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/misc/magic.mgc \
+ RPM_CONFIGDIR=$OECORE_NATIVE_SYSROOT/${libdir}/rpm \
+ RPM_ETCCONFIGDIR=$OECORE_NATIVE_SYSROOT/${base_prefix} \
+ MAGIC=$OECORE_NATIVE_SYSROOT/${datadir}/misc/magic.mgc \
RPM_NO_CHROOT_FOR_SCRIPTS=1
done
+ sed -i -e 's:\/usr\/lib\/rpm\/:$OECORE_NATIVE_SYSROOT\/usr\/lib\/rpm\/:' ${D}${libdir}/rpm/find-provides
+ sed -i -e 's:\/usr\/lib\/rpm\/:$OECORE_NATIVE_SYSROOT\/usr\/lib\/rpm\/:' ${D}${libdir}/rpm/find-requires
+
rm -rf ${D}/var
}
--
1.9.1
More information about the Openembedded-core
mailing list