diff options
| author |   Amarnath Valluri <amarnath.valluri@intel.com> | 2017-06-14 14:30:44 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-06 14:38:09 +0100 |
| commit | 7ca0415c26d5a8b00716b0a49f069e26fdeac30c (patch) | |
| tree | 865e0947d149a61ac22a4652ed7f8a2ef7cc61d0 | |
| parent | 3ebb2da2eb1ff2f6072a2909e0ac71614e0db0bd (diff) | |
| download | openembedded-core-contrib-7ca0415c26d5a8b00716b0a49f069e26fdeac30c.tar.gz | |
systemd: changes to support merged /usr
- Enable/disable the split-usr support in systemd based on 'usrmerge'
DISTRO_FEATURE.
- 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@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/systemd/systemd_232.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb index 287e07b153..e8292ab388 100644 --- a/meta/recipes-core/systemd/systemd_232.bb +++ b/meta/recipes-core/systemd/systemd_232.bb @@ -36,7 +36,7 @@ SRC_URI += " \ SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" PACKAGECONFIG ??= "xz \ - ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig usrmerge', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ binfmt \ @@ -119,6 +119,7 @@ PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" +PACKAGECONFIG[usrmerge] = "--disable-split-usr, --enable-split-usr" CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" @@ -128,7 +129,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" @@ -146,10 +147,9 @@ CACHED_CONFIGUREVARS_class-target = "\ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ --with-rootlibdir=${rootlibdir} \ --with-roothomedir=${ROOT_HOME} \ - --enable-split-usr \ --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 |