[oe-commits] [openembedded-core] 09/12: iputils: Set prefix correctly for usrmerge

[git at git.openembedded.org]

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

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

commit 35b6bc3e67cd4714dbd2e8d8fc782e06e381a9dd
Author: Alex Kiernan <alex.kiernan at gmail.com>
AuthorDate: Wed Sep 4 08:43:44 2019 +0100

    iputils: Set prefix correctly for usrmerge
    
    Fix build with usrmerge enabled:
    
      WARNING: iputils-s20190709-r0 do_package: iputils: alternative target (/usr/bin/ping or /usr/bin/ping.iputils) does not exist, skipping...
      WARNING: iputils-s20190709-r0 do_package: iputils: NOT adding alternative provide /usr/bin/ping: /usr/bin/ping.iputils does not exist
      ERROR: iputils-s20190709-r0 do_package: QA Issue: iputils: Files/directories were installed but not shipped in any package:
        /bin/tftpd
        /bin/tracepath
        /bin/arping
        /bin/clockdiff
        /bin/ping
        /bin/traceroute6
        /sbin/rarpd
        /sbin/ninfod
        /sbin/rdisc
      Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
      iputils: 9 installed and not shipped files. [installed-vs-shipped]
      WARNING: iputils-s20190709-r0 do_package: iputils: alt_link == alt_target: /usr/bin/ping == /usr/bin/ping
    
    Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-extended/iputils/iputils_s20190709.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb
index 34a6c68..d8f2470 100644
--- a/meta/recipes-extended/iputils/iputils_s20190709.bb
+++ b/meta/recipes-extended/iputils/iputils_s20190709.bb
@@ -28,7 +28,7 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN
 
 inherit meson update-alternatives
 
-EXTRA_OEMESON += "--prefix=/"
+EXTRA_OEMESON += "--prefix=${root_prefix}/"
 
 ALTERNATIVE_PRIORITY = "100"
 

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