Skip to contentSkip to conversation

iputils: fix a usrmerge build issue

PATCH In review [email protected] 2 participants 2 messages Sep 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iputils: fix a usrmerge build issue

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
---
 meta/recipes-extended/iputils/iputils_s20190709.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/iputils/iputils_s20190709.bb +1 -1
index 34a6c68..ea7e6e3 100644
@@ -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"
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 42 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of [email protected]
Sent: den 3 september 2019 11:02
To: [email protected]
Cc: [email protected]; Ming Liu <[email protected]>
Subject: [OE-core] [PATCH] iputils: fix a usrmerge build issue

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
---
 meta/recipes-extended/iputils/iputils_s20190709.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/iputils/iputils_s20190709.bb +0 -0
index 34a6c68..ea7e6e3 100644
@@ -28,7 +28,7 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -

DBUILD_MANS=true,-DBUILD_HTML_MAN

inherit meson update-alternatives

meta/recipes-extended/iputils/iputils_s20190709.bb PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN · line 31

Quoted 2 lines
meta/recipes-extended/iputils/iputils_s20190709.bb +1 -1
-EXTRA_OEMESON += "--prefix=/"
+EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '', '--prefix=/', d)}"

This should be better:

EXTRA_OEMESON += "--prefix=${root_prefix}/"

(and yes, the / after ${root_prefix} is needed in this case or meson will complain about --prefix having to be an absolute path in case ${root_prefix} is empty, which it is when usrmerge is not set.)

Quoted 4 lines

ALTERNATIVE_PRIORITY = "100"

--
2.7.4

//Peter