[oe-commits] [openembedded-core] 01/05: rpm: Ensure macros file doesn't reference HOSTTOOLS

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch pyro
in repository openembedded-core.

commit 2a12c159aae9877a05e0ba023de278cdca59ac45
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu May 4 11:56:25 2017 +0100

    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)
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 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 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() {
     rm -rf ${D}/var
 }
 
+do_install_append () {
+	sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}/${libdir}/rpm/macros
+}
+
 FILES_${PN} += "${libdir}/rpm-plugins/*.so \
                "
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.