[PATCH] rpcbind: Modify socket file only, if systemd is used

[PATCH] rpcbind: Modify socket file only, if systemd is used

[Jörg Sommer]

From: Jörg Sommer <joerg.sommer@navimatix.de>

Fixes: bee29dc822c611 ("rpcbind: Remove IPv6 listener, if ipv6 not in DISTRO_FEATURES")
Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
index bd8ba1e88a..6604774c1f 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
@@ -55,7 +55,8 @@ do_install:append () {
 	install -d ${D}${systemd_system_unitdir}/rpcbind.service.d
 	install -m 0644 ${UNPACKDIR}/rpcbind.systemd ${D}${systemd_system_unitdir}/rpcbind.service.d/rpcbind.conf
 
-	if ! ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}
+	if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \
+		&& ! ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}
 	then
 		sed -i '/^Listen.*=\[.*\]/s/^/# /' ${D}${systemd_system_unitdir}/*.socket
 	fi
-- 
2.53.0

Re: [OE-core] [PATCH] rpcbind: Modify socket file only, if systemd is used

[Richard Purdie]

On Mon, 2026-06-08 at 18:54 +0200, Jörg Sommer via lists.openembedded.org wrote:
> From: Jörg Sommer <joerg.sommer@navimatix.de>
> 
> Fixes: bee29dc822c611 ("rpcbind: Remove IPv6 listener, if ipv6 not in DISTRO_FEATURES")
> Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
> ---
>  meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
> index bd8ba1e88a..6604774c1f 100644
> --- a/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
> +++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
> @@ -55,7 +55,8 @@ do_install:append () {
>  	install -d ${D}${systemd_system_unitdir}/rpcbind.service.d
>  	install -m 0644 ${UNPACKDIR}/rpcbind.systemd ${D}${systemd_system_unitdir}/rpcbind.service.d/rpcbind.conf
>  
> -	if ! ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}
> +	if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \
> +		&& ! ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}
>  	then
>  		sed -i '/^Listen.*=\[.*\]/s/^/# /' ${D}${systemd_system_unitdir}/*.socket
>  	fi

That can be simplified to:

bb.utils.contains('DISTRO_FEATURES', 'systemd ipv6', 'true', 'false', d)

Cheers,

Richard

Re: [OE-core] [PATCH] rpcbind: Modify socket file only, if systemd is used

[Jörg Sommer]

[-- Attachment #1: Type: text/plain, Size: 1994 bytes --]

Richard Purdie schrieb am Di 09. Jun, 08:41 (+0100):
> On Mon, 2026-06-08 at 18:54 +0200, Jörg Sommer via lists.openembedded.org wrote:
> > From: Jörg Sommer <joerg.sommer@navimatix.de>
> > 
> > Fixes: bee29dc822c611 ("rpcbind: Remove IPv6 listener, if ipv6 not in DISTRO_FEATURES")
> > Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
> > ---
> >  meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
> > index bd8ba1e88a..6604774c1f 100644
> > --- a/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
> > +++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
> > @@ -55,7 +55,8 @@ do_install:append () {
> >  	install -d ${D}${systemd_system_unitdir}/rpcbind.service.d
> >  	install -m 0644 ${UNPACKDIR}/rpcbind.systemd ${D}${systemd_system_unitdir}/rpcbind.service.d/rpcbind.conf
> >  
> > -	if ! ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}
> > +	if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \
> > +		&& ! ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}
> >  	then
> >  		sed -i '/^Listen.*=\[.*\]/s/^/# /' ${D}${systemd_system_unitdir}/*.socket
> >  	fi
> 
> That can be simplified to:
> 
> bb.utils.contains('DISTRO_FEATURES', 'systemd ipv6', 'true', 'false', d)

Actually, it is 'systemd ! ipv6'. I do not think this syntax is supported.

This pattern with true/false is used pretty often:

% for i in oe-core meta-openembedded; git -C $i grep "'true', 'false'" |wc -l
83
131

Is it worth to create a helper? Something like contains_tf?


Have a nice day, Jörg

-- 
Navimatix GmbH           T: 03641 - 327 99 0
Tatzendpromenade 2       F: 03641 - 526 306
07745 Jena               www.navimatix.de

Geschäftsführer: Steffen Späthe, Jan Rommeley
Registergericht: Amtsgericht Jena, HRB 501480

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5000 bytes --]

Re: [OE-core] [PATCH] rpcbind: Modify socket file only, if systemd is used

[Richard Purdie]

On Tue, 2026-06-09 at 10:40 +0200, Jörg Sommer wrote:
> Richard Purdie schrieb am Di 09. Jun, 08:41 (+0100):
> > On Mon, 2026-06-08 at 18:54 +0200, Jörg Sommer via lists.openembedded.org wrote:
> > > From: Jörg Sommer <joerg.sommer@navimatix.de>
> > > 
> > > Fixes: bee29dc822c611 ("rpcbind: Remove IPv6 listener, if ipv6 not in DISTRO_FEATURES")
> > > Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
> > > ---
> > >  meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
> > > index bd8ba1e88a..6604774c1f 100644
> > > --- a/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
> > > +++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.8.bb
> > > @@ -55,7 +55,8 @@ do_install:append () {
> > >  	install -d ${D}${systemd_system_unitdir}/rpcbind.service.d
> > >  	install -m 0644 ${UNPACKDIR}/rpcbind.systemd ${D}${systemd_system_unitdir}/rpcbind.service.d/rpcbind.conf
> > >  
> > > -	if ! ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}
> > > +	if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \
> > > +		&& ! ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}
> > >  	then
> > >  		sed -i '/^Listen.*=\[.*\]/s/^/# /' ${D}${systemd_system_unitdir}/*.socket
> > >  	fi
> > 
> > That can be simplified to:
> > 
> > bb.utils.contains('DISTRO_FEATURES', 'systemd ipv6', 'true', 'false', d)
> 
> Actually, it is 'systemd ! ipv6'. I do not think this syntax is supported.
> 
> This pattern with true/false is used pretty often:
> 
> % for i in oe-core meta-openembedded; git -C $i grep "'true', 'false'" |wc -l
> 83
> 131
> 
> Is it worth to create a helper? Something like contains_tf?

Sorry, I missed the ! hidden in there!

I'm torn on the function. "contains" does have special optimisation
within bitbake and even if you wrap it, we'd lose that unless we add
more specialist code to bitbake to handle the new function.

I started wondering if a "to_shell()" type converter might be better if
we could then have truevalue default to True. The function could
convert True to "true" for shell usage.

Having d as a positional parameter in the arguments for contains makes
that hard to transition to though :(

Cheers,

Richard