[PATCH] iputils: Set prefix correctly for usrmerge

[PATCH] iputils: Set prefix correctly for usrmerge

[Alex Kiernan]

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>
---

 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 34a6c682607a..ce9f27f348ad 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=${prefix}"
 
 ALTERNATIVE_PRIORITY = "100"
 
-- 
2.17.1

Re: [PATCH] iputils: Set prefix correctly for usrmerge

[Ross Burton]

On 02/09/2019 11:04, Alex Kiernan wrote:
> -EXTRA_OEMESON += "--prefix=/"
> +EXTRA_OEMESON += "--prefix=${prefix}"

Probably good to explicitly point out that this moves all of the 
binaries in the non-usrmerge case.  Did you test that the system still 
works with these moved when usrmerge isn't enabled?

Ross

Re: [PATCH] iputils: Set prefix correctly for usrmerge

[Alex Kiernan]

On Mon, Sep 2, 2019 at 7:45 PM Ross Burton <ross.burton@intel.com> wrote:
>
> On 02/09/2019 11:04, Alex Kiernan wrote:
> > -EXTRA_OEMESON += "--prefix=/"
> > +EXTRA_OEMESON += "--prefix=${prefix}"
>
> Probably good to explicitly point out that this moves all of the
> binaries in the non-usrmerge case.  Did you test that the system still
> works with these moved when usrmerge isn't enabled?
>

I didn't, nor was it my intention to move them :(

I'll redo it with root_prefix, which I think should get us what I intended...

-- 
Alex Kiernan