diff mbox series

[scarthgap] systemd: add libpcre2 as RRECOMMENDS if pcre2 is enabled

Message ID 20250303134038.102355-1-alexis.cellier@smile.fr
State Superseded
Delegated to: Steve Sakoman
Headers show
Series [scarthgap] systemd: add libpcre2 as RRECOMMENDS if pcre2 is enabled | expand

Commit Message

Alexis Cellier March 3, 2025, 1:40 p.m. UTC
The libpcre2 is now dlopen'ed, so it is not automatically added to the
DEPENDS anymore. Add it to the RRECOMMENDS list.

Cc: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Alexis Cellier <alexis.cellier@smile.fr>
---
 meta/recipes-core/systemd/systemd_255.17.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Steve Sakoman March 3, 2025, 3:09 p.m. UTC | #1
Is this also an issue on master?  If so, this needs to be accepted
there first before I can take it for the stable branches.

Steve

On Mon, Mar 3, 2025 at 5:41 AM Alexis Cellier via
lists.openembedded.org
<alexis.cellier=smile.fr@lists.openembedded.org> wrote:
>
> The libpcre2 is now dlopen'ed, so it is not automatically added to the
> DEPENDS anymore. Add it to the RRECOMMENDS list.
>
> Cc: Yoann Congal <yoann.congal@smile.fr>
> Signed-off-by: Alexis Cellier <alexis.cellier@smile.fr>
> ---
>  meta/recipes-core/systemd/systemd_255.17.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/systemd/systemd_255.17.bb b/meta/recipes-core/systemd/systemd_255.17.bb
> index 8f5170929f..f85ad61080 100644
> --- a/meta/recipes-core/systemd/systemd_255.17.bb
> +++ b/meta/recipes-core/systemd/systemd_255.17.bb
> @@ -188,7 +188,7 @@ PACKAGECONFIG[oomd] = "-Doomd=true,-Doomd=false"
>  PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl"
>  PACKAGECONFIG[p11kit] = "-Dp11kit=true,-Dp11kit=false,p11-kit"
>  PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}"
> -PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2"
> +PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2,,libpcre2"
>  PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
>  # If polkit is disabled and networkd+hostnamed are in use, enabling this option and
>  # using dbus-broker will allow networkd to be authorized to change the
> --
> 2.48.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#212208): https://lists.openembedded.org/g/openembedded-core/message/212208
> Mute This Topic: https://lists.openembedded.org/mt/111487747/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Alexis Cellier March 3, 2025, 3:21 p.m. UTC | #2
Hi,

> Is this also an issue on master?  If so, this needs to be accepted
> there first before I can take it for the stable branches.

No, this is not an issue on master.
On master, systemd (v257) has a tool to generate those "weak"
dependencies, based on "notes" in the code, that is used (see file:
`meta/recipes-core/systemd/dlopen-deps.inc`).
On scarthgap, systemd (v255) already uses dlopen, but this tool and
"notes" are not in the code yet. So we cannot backport what has be
done on master.

Regards,
Steve Sakoman March 3, 2025, 3:52 p.m. UTC | #3
On Mon, Mar 3, 2025 at 7:21 AM Alexis CELLIER <alexis.cellier@smile.fr> wrote:
>
> Hi,
>
> > Is this also an issue on master?  If so, this needs to be accepted
> > there first before I can take it for the stable branches.
>
> No, this is not an issue on master.
> On master, systemd (v257) has a tool to generate those "weak"
> dependencies, based on "notes" in the code, that is used (see file:
> `meta/recipes-core/systemd/dlopen-deps.inc`).
> On scarthgap, systemd (v255) already uses dlopen, but this tool and
> "notes" are not in the code yet. So we cannot backport what has be
> done on master.

Thanks for the explanation.  Will styhead need this patch?

Steve
Quentin Schulz March 3, 2025, 4:18 p.m. UTC | #4
Hi Alexis,

On 3/3/25 2:40 PM, Alexis Cellier via lists.openembedded.org wrote:
> [You don't often get email from alexis.cellier=smile.fr@lists.openembedded.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> 
> The libpcre2 is now dlopen'ed, so it is not automatically added to the
> DEPENDS anymore. Add it to the RRECOMMENDS list.

Should read RDEPENDS I believe instead of DEPENDS, with the automagic 
mechanism that detects shlib dependencies and insert their packages if 
the recipe building those packages is part of DEPENDS?

Also, why adding to RRECOMMENDS and not RDEPENDS?

Cheers,
Quentin
Alexis Cellier March 3, 2025, 4:20 p.m. UTC | #5
On Mon, Mar 3, 2025 at 4:52 PM Steve Sakoman <steve@sakoman.com> wrote:
>
> On Mon, Mar 3, 2025 at 7:21 AM Alexis CELLIER <alexis.cellier@smile.fr> wrote:
> >
> > Hi,
> >
> > > Is this also an issue on master?  If so, this needs to be accepted
> > > there first before I can take it for the stable branches.
> >
> > No, this is not an issue on master.
> > On master, systemd (v257) has a tool to generate those "weak"
> > dependencies, based on "notes" in the code, that is used (see file:
> > `meta/recipes-core/systemd/dlopen-deps.inc`).
> > On scarthgap, systemd (v255) already uses dlopen, but this tool and
> > "notes" are not in the code yet. So we cannot backport what has be
> > done on master.
>
> Thanks for the explanation.  Will styhead need this patch?

On styhead, systemd (v256.5) already has the tool and notes. So we
should backport what has been done on master.
Alexis Cellier March 3, 2025, 4:23 p.m. UTC | #6
Hi Quentin,

> On 3/3/25 2:40 PM, Alexis Cellier via lists.openembedded.org wrote:
> > [You don't often get email from alexis.cellier=smile.fr@lists.openembedded.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> >
> > The libpcre2 is now dlopen'ed, so it is not automatically added to the
> > DEPENDS anymore. Add it to the RRECOMMENDS list.
>
> Should read RDEPENDS I believe instead of DEPENDS, with the automagic
> mechanism that detects shlib dependencies and insert their packages if
> the recipe building those packages is part of DEPENDS?

The library is dlopen'd, so shlib does not work here.

> Also, why adding to RRECOMMENDS and not RDEPENDS?

Because systemd says libpcre2 is "suggest" (with its tool on master),
and I've asked on IRC.

Regards,
Alexis Cellier March 3, 2025, 4:30 p.m. UTC | #7
> Should read RDEPENDS I believe instead of DEPENDS, with the automagic
> mechanism that detects shlib dependencies and insert their packages if
> the recipe building those packages is part of DEPENDS?

Yes, I did a typo. It should be RDEPENDS.
Quentin Schulz March 3, 2025, 4:43 p.m. UTC | #8
Hi Alexis,

On 3/3/25 5:23 PM, Alexis Cellier via lists.openembedded.org wrote:
> Hi Quentin,
> 
>> On 3/3/25 2:40 PM, Alexis Cellier via lists.openembedded.org wrote:
>>> [You don't often get email from alexis.cellier=smile.fr@lists.openembedded.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>>>
>>> The libpcre2 is now dlopen'ed, so it is not automatically added to the
>>> DEPENDS anymore. Add it to the RRECOMMENDS list.
[...]
>> Also, why adding to RRECOMMENDS and not RDEPENDS?
> 
> Because systemd says libpcre2 is "suggest" (with its tool on master),
> and I've asked on IRC.
> 

OK, please mention that in the commit log.

Cheers,
Quentin
diff mbox series

Patch

diff --git a/meta/recipes-core/systemd/systemd_255.17.bb b/meta/recipes-core/systemd/systemd_255.17.bb
index 8f5170929f..f85ad61080 100644
--- a/meta/recipes-core/systemd/systemd_255.17.bb
+++ b/meta/recipes-core/systemd/systemd_255.17.bb
@@ -188,7 +188,7 @@  PACKAGECONFIG[oomd] = "-Doomd=true,-Doomd=false"
 PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl"
 PACKAGECONFIG[p11kit] = "-Dp11kit=true,-Dp11kit=false,p11-kit"
 PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}"
-PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2"
+PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2,,libpcre2"
 PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
 # If polkit is disabled and networkd+hostnamed are in use, enabling this option and
 # using dbus-broker will allow networkd to be authorized to change the