[01/19] util-linux: Use PCRE for hardlink

Submitted by Khem Raj on Dec. 29, 2019, 6:43 p.m. | Patch ID: 168416

Details

Message ID 20191229184415.19514-1-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj Dec. 29, 2019, 6:43 p.m.
Use PCRE, this enables using posix extended Regexps on cmdline

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/util-linux/util-linux.inc | 3 +++
 1 file changed, 3 insertions(+)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 1fa82363b1..8262217fc1 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -106,6 +106,7 @@  EXTRA_OECONF_append_class-target = " --enable-setpriv"
 EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv"
 EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv"
 
+PACKAGECONFIG ?= "pcre2"
 PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
 # inherit manpages requires this to be present, however util-linux does not have 
 # configuration options, and installs manpages always
@@ -117,6 +118,8 @@  PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_s
 PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3"
 # Readline support
 PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
+# PCRE support in hardlink
+PACKAGECONFIG[pcre2] = ",,libpcre2"
 
 EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'"
 

Comments

Richard Purdie Dec. 30, 2019, 10:15 a.m.
On Sun, 2019-12-29 at 10:43 -0800, Khem Raj wrote:
> Use PCRE, this enables using posix extended Regexps on cmdline
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-core/util-linux/util-linux.inc | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index 1fa82363b1..8262217fc1 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -106,6 +106,7 @@ EXTRA_OECONF_append_class-target = " --enable-setpriv"
>  EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv"
>  EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv"
>  
> +PACKAGECONFIG ?= "pcre2"
>  PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
>  # inherit manpages requires this to be present, however util-linux does not have 
>  # configuration options, and installs manpages always
> @@ -117,6 +118,8 @@ PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_s
>  PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3"
>  # Readline support
>  PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
> +# PCRE support in hardlink
> +PACKAGECONFIG[pcre2] = ",,libpcre2"
>  
>  EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'"

Can we clarify whether this change is meant to be affecting the target
or not (a comment maybe)? At the moment it would only affect
native/nativesdk which I'm fine with, I just want to ensure someone
else doesn't think it was a bug.

Cheers,

Richard