aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-04 11:56:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-11 17:02:17 +0100
commitbe901200d94beaa35e1d05eb502b117b3b523609 (patch)
tree911a4ce99832d8bd07960f22702dd2383c8e87e8
parentb07242cfe4544e99daf0a8d2f7062530e366bfae (diff)
downloadopenembedded-core-contrib-be901200d94beaa35e1d05eb502b117b3b523609.tar.gz
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>
-rw-r--r--meta/recipes-devtools/rpm/rpm_git.bb4
1 files changed, 4 insertions, 0 deletions
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 \
"