From: Ming Liu <[email protected]>

Fix a following build issue when usrmerge is 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/tracepath
|  /bin/ping
|  /bin/arping
|  /bin/traceroute6
|  /bin/tftpd
|  /bin/clockdiff
|  /sbin/rdisc
|  /sbin/rarpd
|  /sbin/ninfod

Signed-off-by: Ming Liu <[email protected]>
---
 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..ea7e6e3 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 += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '', 
'--prefix=/', d)}"
 
 ALTERNATIVE_PRIORITY = "100"
 
-- 
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to