Re: [ptxdist] [APPLIED] systemd: regexp matching support using pcre2

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 09ac86f71cfccb32b57afe7fb8f1b040e4f67468.

Michael

[sent from post-receive hook]

On Fri, 17 Feb 2023 16:36:00 +0100, Artur Wiebe <artur@4wiebe.de> wrote:
> Signed-off-by: Artur Wiebe <artur@4wiebe.de>
> Message-Id: <20230216091921.1816952-1-artur@4wiebe.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/systemd.in b/rules/systemd.in
> index 17997574b62e..e18bdb24f3c1 100644
> --- a/rules/systemd.in
> +++ b/rules/systemd.in
> @@ -23,6 +23,7 @@ menuconfig SYSTEMD
>  	select XZ		if SYSTEMD_XZ
>  	select LZ4		if SYSTEMD_LZ4
>  	select ZSTD		if SYSTEMD_ZSTD
> +	select PCRE2		if SYSTEMD_PCRE2
>  	select LIBMICROHTTPD	if SYSTEMD_MICROHTTPD
>  	select LIBSECCOMP	if SYSTEMD_SECCOMP
>  	select IPTABLES		if SYSTEMD_IPMASQUERADE
> @@ -180,6 +181,10 @@ config SYSTEMD_ZSTD
>  	bool
>  	prompt "ZSTD compressed journal support"
>  
> +config SYSTEMD_PCRE2
> +	bool
> +	prompt "regexp matching support using pcre2"
> +
>  config SYSTEMD_JOURNAL_REMOTE
>  	bool
>  	select SYSTEMD_MICROHTTPD
> diff --git a/rules/systemd.make b/rules/systemd.make
> index 7e085f49de69..298b05702d4e 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -151,7 +151,7 @@ SYSTEMD_CONF_OPT	:= \
>  	-Doss-fuzz=false \
>  	-Dp11kit=false \
>  	-Dpam=false \
> -	-Dpcre2=false \
> +	-Dpcre2=$(call ptx/truefalse,PTXCONF_SYSTEMD_PCRE2) \
>  	-Dpolkit=$(call ptx/truefalse,PTXCONF_SYSTEMD_POLKIT) \
>  	-Dportabled=false \
>  	-Dpstore=false \