summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-04 10:56:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-18 12:17:43 (GMT)
commit901d3880bf5d7c354b44eea0cc58a355fa69fc18 (patch)
tree96d55c1877ce4e680966943130aa80c99b48bb75
parent0fcbb4d0ec26ef24db78190dcdc5568af3beaa14 (diff)
downloadpoky-901d3880bf5d7c354b44eea0cc58a355fa69fc18.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. (From OE-Core rev: be901200d94beaa35e1d05eb502b117b3b523609) (From OE-Core rev: 2a12c159aae9877a05e0ba023de278cdca59ac45) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> 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 f31932e..2310ee6 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() {
128 rm -rf ${D}/var 128 rm -rf ${D}/var
129} 129}
130 130
131do_install_append () {
132 sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}/${libdir}/rpm/macros
133}
134
131FILES_${PN} += "${libdir}/rpm-plugins/*.so \ 135FILES_${PN} += "${libdir}/rpm-plugins/*.so \
132 " 136 "
133 137