[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5208/8267] net-tools: Place package content as per bitbake environment.



commit 89c41301f089650aab8a5f9c6a13e55fb0e5f48e
Author: Amarnath Valluri <amarnath valluri intel com>
Date:   Wed Feb 8 11:21:52 2017 +0200

    net-tools: Place package content as per bitbake environment.
    
    net-tools Makefile was hardcoded sbin, bin installation paths to /bin and /sbin
    respectively.  This change moves the installed files to appropriate location as
    per configured bitbake environment.
    
    This might be solved much better way by patching Makefile, but that causing
    build issues, as net-tools recipe is using pre-generated config.{h/status}.
    
    (From OE-Core rev: 8be0740f8cc8d909a8983b499f200b99261124c4)
    
    Signed-off-by: Amarnath Valluri <amarnath valluri intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../net-tools/net-tools_1.60-26.bb                 |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb 
b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index 99a4235..be26735 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -93,6 +93,17 @@ do_install() {
        unset CFLAGS
        unset LDFLAGS
        oe_runmake 'BASEDIR=${D}' install
+
+       if [ "${base_bindir}" != "/bin" ]; then
+               mkdir -p ${D}/${base_bindir}
+               mv ${D}/bin/* ${D}/${base_bindir}/
+               rmdir ${D}/bin
+       fi
+       if [ "${base_sbindir}" != "/sbin" ]; then
+               mkdir ${D}/${base_sbindir}
+               mv ${D}/sbin/* ${D}/${base_sbindir}/
+               rmdir ${D}/sbin
+       fi
 }
 
 inherit update-alternatives


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