From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 4 May 2017 10:56:25 +0000 (+0100)
Subject: rpm: Ensure macros file doesn't reference HOSTTOOLS
X-Git-Tag: uninative-1.7~935
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=be901200d94beaa35e1d05eb502b117b3b523609;p=openembedded-core.git

rpm: Ensure macros file doesn't reference HOSTTOOLS

Currently the file encodes full paths to various host tools in the
HOSTTOOLS directory which is bad in native and target cases. We can
simply use the versions from PATH quite safely in OE.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb
index f31932ef55..2310ee6b09 100644
--- a/meta/recipes-devtools/rpm/rpm_git.bb
+++ b/meta/recipes-devtools/rpm/rpm_git.bb
@@ -128,6 +128,10 @@ do_install_append_class-target() {
     rm -rf ${D}/var
 }
 
+do_install_append () {
+	sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}/${libdir}/rpm/macros
+}
+
 FILES_${PN} += "${libdir}/rpm-plugins/*.so \
                "