[PATCH v2 1/1] iputils: update to 20221126

[PATCH v2 1/1] iputils: update to 20221126

[Petr Vorel]

From: Petr Vorel <petr.vorel@gmail.com>

This release removed: ninfod, rarpd, rdisc.
Remove also related, not yet upstreamed patch.

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Changes v1->v2:
* fixes missing " in SPLITPKGS (Alexandre Belloni)

Kind regards,
Petr

 .../0001-rarpd-rdisc-Drop-PrivateUsers.patch  | 27 -------------------
 ...putils_20211215.bb => iputils_20221126.bb} | 21 +++------------
 2 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
 rename meta/recipes-extended/iputils/{iputils_20211215.bb => iputils_20221126.bb} (66%)

diff --git a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
deleted file mode 100644
index c61e39dc80..0000000000
--- a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dfeeb3f1328d09f516edeb6349bd63e3c87f9397 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <alex.kiernan@gmail.com>
-Date: Thu, 13 Feb 2020 06:08:45 +0000
-Subject: [PATCH] rarpd:Drop PrivateUsers
-
-rarpd cannot gain the necessary capabilities with
-PrivateUsers enabled.
-
-Upstream-Status: Pending
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-
----
- systemd/rarpd.service.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in
-index e600c10..f5d7621 100644
---- a/systemd/rarpd.service.in
-+++ b/systemd/rarpd.service.in
-@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW
- DynamicUser=yes
- PrivateTmp=yes
- PrivateDevices=yes
--PrivateUsers=yes
- ProtectSystem=strict
- ProtectHome=yes
- ProtectControlGroups=yes
diff --git a/meta/recipes-extended/iputils/iputils_20211215.bb b/meta/recipes-extended/iputils/iputils_20221126.bb
similarity index 66%
rename from meta/recipes-extended/iputils/iputils_20211215.bb
rename to meta/recipes-extended/iputils/iputils_20221126.bb
index 3ddce0be54..baff1452b8 100644
--- a/meta/recipes-extended/iputils/iputils_20211215.bb
+++ b/meta/recipes-extended/iputils/iputils_20221126.bb
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bb64c89bb0e23b72930d2380894c47a1"
 DEPENDS = "gnutls"
 
 SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
-           file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
            "
-SRCREV = "1d1e7c43210d8af316a41cb2c53d612a4c16f34d"
+SRCREV = "5ffabc4190cab975c7332645259e286a032e183b"
 
 S = "${WORKDIR}/git"
 
@@ -23,14 +22,12 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)"
 # breaks the version order.
 CVE_CHECK_IGNORE += "CVE-2000-1213 CVE-2000-1214"
 
-PACKAGECONFIG ??= "libcap rarpd \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \
+PACKAGECONFIG ??= "libcap \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', d)} \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false -DNO_SETCAP_OR_SUID=true, libcap libcap-native"
 PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
 PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
-PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
-PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
 PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_system_unitdir},,systemd"
 PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
 
@@ -43,9 +40,7 @@ ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE:${PN}-ping = "ping"
 ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
 
-SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-rdisc \
-             ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \
-             ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)}"
+SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff"
 PACKAGES += "${SPLITPKGS}"
 
 ALLOW_EMPTY:${PN} = "1"
@@ -56,11 +51,3 @@ FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
 FILES:${PN}-arping = "${base_bindir}/arping"
 FILES:${PN}-tracepath = "${base_bindir}/tracepath"
 FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
-FILES:${PN}-rarpd = "${base_sbindir}/rarpd  ${systemd_system_unitdir}/rarpd@.service"
-FILES:${PN}-rdisc = "${base_sbindir}/rdisc"
-FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh"
-
-SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \
-                    ${PN}-rdisc"
-SYSTEMD_SERVICE:${PN}-ninfod = "ninfod.service"
-SYSTEMD_SERVICE:${PN}-rdisc = "rdisc.service"
-- 
2.38.1

Re: [OE-core] [PATCH v2 1/1] iputils: update to 20221126

[Alexandre Belloni]

Hello,

You should at least build test your patches

On 27/11/2022 16:17:08+0100, Petr Vorel wrote:
> -PACKAGECONFIG ??= "libcap rarpd \
> -                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \
> +PACKAGECONFIG ??= "libcap \
> +                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', d)} \

This probably doesn't work either


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH v2 1/1] iputils: update to 20221126

[Petr Vorel]

On Sun, 27 Nov 2022 at 19:42, Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> Hello,
>
> You should at least build test your patches

OK, I'll do. What always discourages me is that unlike Buildroot
build, openembedded takes so long.

What I usually do:
cd ..; git clone git://git.openembedded.org/bitbake.git; cd -
. oe-init-build-env
bitbake iputils

If there is anything I can speedup a build (e.g. using some of host
utils to build really just the target) please let me know.

>
> On 27/11/2022 16:17:08+0100, Petr Vorel wrote:
> > -PACKAGECONFIG ??= "libcap rarpd \
> > -                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \
> > +PACKAGECONFIG ??= "libcap \
> > +                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', d)} \
>
> This probably doesn't work either
Not sure what's wrong on this, but maybe build shows that out.

Kind regards,
Petr

>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

Re: [OE-core] [PATCH v2 1/1] iputils: update to 20221126

[Alexandre Belloni]

On 27/11/2022 22:55:31+0100, Petr Vorel wrote:
> On Sun, 27 Nov 2022 at 19:42, Alexandre Belloni
> <alexandre.belloni@bootlin.com> wrote:
> >
> > Hello,
> >
> > You should at least build test your patches
> 
> OK, I'll do. What always discourages me is that unlike Buildroot
> build, openembedded takes so long.
> 
> What I usually do:
> cd ..; git clone git://git.openembedded.org/bitbake.git; cd -
> . oe-init-build-env
> bitbake iputils
> 
> If there is anything I can speedup a build (e.g. using some of host
> utils to build really just the target) please let me know.

Not really, you'd have to keep your sstate-cache but my guess is that
your builds are infrequent enough that everything will rebuild anyway.

This made me try to understand why you didn't test your patches and I
didn't realize you are maintaining iputils. Thanks for the help!

> 
> >
> > On 27/11/2022 16:17:08+0100, Petr Vorel wrote:
> > > -PACKAGECONFIG ??= "libcap rarpd \
> > > -                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \
> > > +PACKAGECONFIG ??= "libcap \
> > > +                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', d)} \
> >
> > This probably doesn't work either
> Not sure what's wrong on this, but maybe build shows that out.

The whole bb.utils.contains call can be removed because it doesn't do
anything once you remove the 'ninfod' argument.

I'll send the patch to our CI with the line removed


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH v2 1/1] iputils: update to 20221126

[Petr Vorel]

On Sun, 27 Nov 2022 at 23:13, Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> On 27/11/2022 22:55:31+0100, Petr Vorel wrote:
> > On Sun, 27 Nov 2022 at 19:42, Alexandre Belloni
> > <alexandre.belloni@bootlin.com> wrote:
> > >
> > > Hello,
> > >
> > > You should at least build test your patches
> >
> > OK, I'll do. What always discourages me is that unlike Buildroot
> > build, openembedded takes so long.
> >
> > What I usually do:
> > cd ..; git clone git://git.openembedded.org/bitbake.git; cd -
> > . oe-init-build-env
> > bitbake iputils
> >
> > If there is anything I can speedup a build (e.g. using some of host
> > utils to build really just the target) please let me know.
>
> Not really, you'd have to keep your sstate-cache but my guess is that
> your builds are infrequent enough that everything will rebuild anyway.

Yes.

>
> This made me try to understand why you didn't test your patches and I
> didn't realize you are maintaining iputils. Thanks for the help!

Yes, I'm just iputils and ltp maintainer, thus understand the upstream code,
but not much of openembedded (I don't even use it).

>
> >
> > >
> > > On 27/11/2022 16:17:08+0100, Petr Vorel wrote:
> > > > -PACKAGECONFIG ??= "libcap rarpd \
> > > > -                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \
> > > > +PACKAGECONFIG ??= "libcap \
> > > > +                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', d)} \
> > >
> > > This probably doesn't work either
> > Not sure what's wrong on this, but maybe build shows that out.
>
> The whole bb.utils.contains call can be removed because it doesn't do
> anything once you remove the 'ninfod' argument.
>
> I'll send the patch to our CI with the line removed
Thank you! I'll send v3 without this line (so that it can be applied
if your testing is ok):
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \

Kind regards,
Petr

>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com