From 4b2322e90f6a3a4d2c44145aa85b688f28edddaa Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Wed, 4 Sep 2019 08:43:44 +0100 Subject: 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 Signed-off-by: Richard Purdie --- 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 34a6c68260..d8f2470d0c 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" -- cgit 1.2.3-korg