[OE-core] [PATCH v3 3/8] systemd: chagnes to support merged /usr

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core-bounces at lists.openembedded.org
> [mailto:openembedded-core-bounces at lists.openembedded.org] On Behalf Of
> Amarnath Valluri
> Sent: den 13 juni 2017 08:53
> To: openembedded-core at lists.openembedded.org
> Subject: [OE-core] [PATCH v3 3/8] systemd: chagnes to support merged

Change "chagnes" to "changes".

> /usr
> 
> - Disable the split-usr support in systemd when 'usrmerge' DISTRO_FEATURE is
>   enabled.
> - Modify rootprefix to point to ${root_prefix}, rather than ${base_prefix}.
> - And fixed firmware path to use ${nonarch_base_libdir} instead of hard-coded
>   '/lib', because when 'usrmege' distro feature enabled this path would be
>   '/usr/lib'.
> 
> Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
> ---
>  meta/recipes-core/systemd/systemd_232.bb | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-
> core/systemd/systemd_232.bb
> index f843c58..22c7254 100644
> --- a/meta/recipes-core/systemd/systemd_232.bb
> +++ b/meta/recipes-core/systemd/systemd_232.bb
> @@ -131,7 +131,7 @@ CACHED_CONFIGUREVARS +=
> "ac_cv_path_SULOGIN=${base_sbindir}/sulogin"
> 
>  # Helper variables to clarify locations.  This mirrors the logic in systemd's
>  # build system.
> -rootprefix ?= "${base_prefix}"
> +rootprefix ?= "${root_prefix}"
>  rootlibdir ?= "${base_libdir}"
>  rootlibexecdir = "${rootprefix}/lib"
> 
> @@ -149,10 +149,10 @@ CACHED_CONFIGUREVARS_class-target = "\
>  EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
>                   --with-rootlibdir=${rootlibdir} \
>                   --with-roothomedir=${ROOT_HOME} \
> -                 --enable-split-usr \
> +                 ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '--disable-split-usr', '--enable-split-usr', d)} \

I recommend that you add a PACKAGECONFIG for this instead:

PACKAGECONFIG[usrmerge] = "--disable-split-usr,--enable-split-usr"

And add 'usrmerge' to the bb.utils.filter() call in the definition of 
PACKAGECONFIG.

>                   --without-python \
>                   --with-sysvrcnd-path=${sysconfdir} \
> -                 --with-firmware-path=/lib/firmware \
> +                 --with-firmware-path=${nonarch_base_libdir}/firmware \
>                   --with-testdir=${PTEST_PATH} \
>                 "
>  # per the systemd README, define VALGRIND=1 to run under valgrind
> --
> 2.7.4

//Peter