[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5812/8267] rpm: Ensure macros file doesn't reference HOSTTOOLS



commit 099224f81bafb8a2ec0ec7ee4ad77756d2372c24
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   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 linuxfoundation org>

 meta/recipes-devtools/rpm/rpm_git.bb |    4 ++++
 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() {
     rm -rf ${D}/var
 }
 
+do_install_append () {
+       sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}/${libdir}/rpm/macros
+}
+
 FILES_${PN} += "${libdir}/rpm-plugins/*.so \
                "
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]