From 901d3880bf5d7c354b44eea0cc58a355fa69fc18 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 4 May 2017 11:56:25 +0100 Subject: 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. (From OE-Core rev: be901200d94beaa35e1d05eb502b117b3b523609) (From OE-Core rev: 2a12c159aae9877a05e0ba023de278cdca59ac45) Signed-off-by: Richard Purdie Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_git.bb | 4 ++++ 1 file changed, 4 insertions(+) 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 \ " -- cgit v1.2.3-54-g00ecf