aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2019-09-04 08:43:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-07 07:47:14 +0100
commit4b2322e90f6a3a4d2c44145aa85b688f28edddaa (patch)
tree4eeda363f28111c77a3154e91f3a70a4d3b9f137
parent69ab2da830a758d6289a6e33209e74222bfedea0 (diff)
downloadopenembedded-core-contrib-4b2322e90f6a3a4d2c44145aa85b688f28edddaa.tar.gz
openembedded-core-contrib-4b2322e90f6a3a4d2c44145aa85b688f28edddaa.tar.bz2
openembedded-core-contrib-4b2322e90f6a3a4d2c44145aa85b688f28edddaa.zip
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@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/iputils/iputils_s20190709.bb2
1 files changed, 1 insertions, 1 deletions
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"