summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-06-14 14:30:44 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:15 +0100
commit4525708784bcd2de44c1ea71ccc4d8115ab02570 (patch)
tree58ebb946befd425816be59bcece5dbbfeb3ca517
parentd8232565dcceb51936dac3149ee1a0c4ab986153 (diff)
downloadpoky-4525708784bcd2de44c1ea71ccc4d8115ab02570.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'. (From OE-Core rev: 7ca0415c26d5a8b00716b0a49f069e26fdeac30c) 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.bb8
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 += " \
36SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" 36SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
37 37
38PACKAGECONFIG ??= "xz \ 38PACKAGECONFIG ??= "xz \
39 ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig', d)} \ 39 ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig usrmerge', d)} \
40 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ 40 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
41 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ 41 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
42 binfmt \ 42 binfmt \
@@ -119,6 +119,7 @@ PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2"
119PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" 119PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4"
120PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" 120PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
121PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" 121PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
122PACKAGECONFIG[usrmerge] = "--disable-split-usr, --enable-split-usr"
122 123
123CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" 124CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill"
124CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" 125CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod"
@@ -128,7 +129,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_SULOGIN=${base_sbindir}/sulogin"
128 129
129# Helper variables to clarify locations. This mirrors the logic in systemd's 130# Helper variables to clarify locations. This mirrors the logic in systemd's
130# build system. 131# build system.
131rootprefix ?= "${base_prefix}" 132rootprefix ?= "${root_prefix}"
132rootlibdir ?= "${base_libdir}" 133rootlibdir ?= "${base_libdir}"
133rootlibexecdir = "${rootprefix}/lib" 134rootlibexecdir = "${rootprefix}/lib"
134 135
@@ -146,10 +147,9 @@ CACHED_CONFIGUREVARS_class-target = "\
146EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ 147EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
147 --with-rootlibdir=${rootlibdir} \ 148 --with-rootlibdir=${rootlibdir} \
148 --with-roothomedir=${ROOT_HOME} \ 149 --with-roothomedir=${ROOT_HOME} \
149 --enable-split-usr \
150 --without-python \ 150 --without-python \
151 --with-sysvrcnd-path=${sysconfdir} \ 151 --with-sysvrcnd-path=${sysconfdir} \
152 --with-firmware-path=/lib/firmware \ 152 --with-firmware-path=${nonarch_base_libdir}/firmware \
153 --with-testdir=${PTEST_PATH} \ 153 --with-testdir=${PTEST_PATH} \
154 " 154 "
155# per the systemd README, define VALGRIND=1 to run under valgrind 155# per the systemd README, define VALGRIND=1 to run under valgrind