summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-11-14 11:39:24 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-30 10:49:21 +0000
commit15a24f1e10a9f7c6bd097706cc7a80c5ffea1875 (patch)
tree9ba46aee9d9db5f9ac78e413dd65c5670f487608 /meta/recipes-core/systemd
parentda2e7e006de50939dee7aa5e080c0193b71f9fc9 (diff)
downloadpoky-15a24f1e10a9f7c6bd097706cc7a80c5ffea1875.tar.gz
systemd: fix duplication of CACHED_CONFIGUREVARS
Fix historical duplication that appears to have been caused by merging two independent fixes for the same issue: http://git.openembedded.org/openembedded-core/commit/?id=294adc0907a359d9c0ad260823188145aab294ad http://git.openembedded.org/openembedded-core/commit/?id=b30d7b1b97ffd1d44083d93ed0e572d80fcebc54 Also minor reformatting of EXTRA_OECONF values. (From OE-Core rev: 94bc5910ebdf7bb4677fa06150ba1219295e5eda) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd_234.bb44
1 files changed, 21 insertions, 23 deletions
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index d4e0b1f01e..bfcecb3d4e 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -149,11 +149,18 @@ PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
149PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" 149PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
150PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" 150PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
151 151
152CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" 152# Hardcode target binary paths to avoid AC_PROG_PATH in the systemd
153CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" 153# configure script detecting and setting paths from sysroot or host.
154CACHED_CONFIGUREVARS += "ac_cv_path_QUOTACHECK=${sbindir}/quotacheck" 154CACHED_CONFIGUREVARS_class-target = " \
155CACHED_CONFIGUREVARS += "ac_cv_path_QUOTAON=${sbindir}/quotaon" 155 ac_cv_path_KEXEC=${sbindir}/kexec \
156CACHED_CONFIGUREVARS += "ac_cv_path_SULOGIN=${base_sbindir}/sulogin" 156 ac_cv_path_KILL=${base_bindir}/kill \
157 ac_cv_path_KMOD=${base_bindir}/kmod \
158 ac_cv_path_MOUNT_PATH=${base_bindir}/mount \
159 ac_cv_path_QUOTACHECK=${sbindir}/quotacheck \
160 ac_cv_path_QUOTAON=${sbindir}/quotaon \
161 ac_cv_path_SULOGIN=${base_sbindir}/sulogin \
162 ac_cv_path_UMOUNT_PATH=${base_bindir}/umount \
163"
157 164
158# Helper variables to clarify locations. This mirrors the logic in systemd's 165# Helper variables to clarify locations. This mirrors the logic in systemd's
159# build system. 166# build system.
@@ -161,24 +168,15 @@ rootprefix ?= "${root_prefix}"
161rootlibdir ?= "${base_libdir}" 168rootlibdir ?= "${base_libdir}"
162rootlibexecdir = "${rootprefix}/lib" 169rootlibexecdir = "${rootprefix}/lib"
163 170
164CACHED_CONFIGUREVARS_class-target = "\ 171EXTRA_OECONF = " \
165 ac_cv_path_MOUNT_PATH=${base_bindir}/mount \ 172 --without-python \
166 ac_cv_path_UMOUNT_PATH=${base_bindir}/umount \ 173 --with-roothomedir=${ROOT_HOME} \
167 ac_cv_path_KMOD=${base_bindir}/kmod \ 174 --with-rootlibdir=${rootlibdir} \
168 ac_cv_path_KILL=${base_bindir}/kill \ 175 --with-rootprefix=${rootprefix} \
169 ac_cv_path_SULOGIN=${base_sbindir}/sulogin \ 176 --with-sysvrcnd-path=${sysconfdir} \
170 ac_cv_path_KEXEC=${sbindir}/kexec \ 177 --with-firmware-path=${nonarch_base_libdir}/firmware \
171 ac_cv_path_QUOTACHECK=${sbindir}/quotacheck \ 178"
172 ac_cv_path_QUOTAON=${sbindir}/quotaon \ 179
173 "
174
175EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
176 --with-rootlibdir=${rootlibdir} \
177 --with-roothomedir=${ROOT_HOME} \
178 --without-python \
179 --with-sysvrcnd-path=${sysconfdir} \
180 --with-firmware-path=${nonarch_base_libdir}/firmware \
181 "
182# per the systemd README, define VALGRIND=1 to run under valgrind 180# per the systemd README, define VALGRIND=1 to run under valgrind
183CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}" 181CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}"
184 182