[OE-core] [PATCH] rpm: make rpm work in toolchain.
Zheng Ruoqin
zhengrq.fnst at cn.fujitsu.com
Mon Sep 9 10:56:59 UTC 2019
We need to configure rpm to use package architecture from yocto build
system.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst at cn.fujitsu.com>
---
meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
index 063f4269a5..af8e144f96 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
@@ -102,6 +102,9 @@ do_install_append_class-native() {
done
}
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
+SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
+
do_install_append_class-nativesdk() {
for tool in ${WRAPPER_TOOLS}; do
create_wrapper ${D}$tool \
@@ -112,6 +115,16 @@ do_install_append_class-nativesdk() {
done
rm -rf ${D}/var
+ install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
+
+ cat >${D}/${SDKTARGETSYSROOT}/etc/rpmrc <<EOF
+arch_compat: ${MACHINE_ARCH}: ${PACKAGE_ARCHS}
+EOF
+ sed -i 's/-nativesdk//g' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
+ sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
+ cat >${D}/${SDKTARGETSYSROOT}/etc/rpm/platform <<EOF
+${MACHINE_ARCH}-pc-linux
+EOF
}
# Rpm's make install creates var/tmp which clashes with base-files packaging
@@ -133,6 +146,8 @@ FILES_${PN} += "${libdir}/rpm-plugins/*.so \
FILES_${PN}-dev += "${libdir}/rpm-plugins/*.la \
"
+FILES_${PN}_append_class-nativesdk += "${SDKTARGETSYSROOT}"
+
PACKAGES += "python3-rpm"
PROVIDES += "python3-rpm"
--
2.17.1
More information about the Openembedded-core
mailing list