aboutsummaryrefslogtreecommitdiff
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-29 23:41:35 +0000
commit94bc5910ebdf7bb4677fa06150ba1219295e5eda (patch)
tree0b2a567e1479c75d59b3769d7e1c5ffc13fe6d63
parent7a188e646a7a713ec5eab73580de624dc61f2936 (diff)
downloadopenembedded-core-94bc5910ebdf7bb4677fa06150ba1219295e5eda.zip
openembedded-core-94bc5910ebdf7bb4677fa06150ba1219295e5eda.tar.gz
openembedded-core-94bc5910ebdf7bb4677fa06150ba1219295e5eda.tar.bz2
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. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 d4e0b1f..bfcecb3 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"
PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
-CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill"
-CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod"
-CACHED_CONFIGUREVARS += "ac_cv_path_QUOTACHECK=${sbindir}/quotacheck"
-CACHED_CONFIGUREVARS += "ac_cv_path_QUOTAON=${sbindir}/quotaon"
-CACHED_CONFIGUREVARS += "ac_cv_path_SULOGIN=${base_sbindir}/sulogin"
+# Hardcode target binary paths to avoid AC_PROG_PATH in the systemd
+# configure script detecting and setting paths from sysroot or host.
+CACHED_CONFIGUREVARS_class-target = " \
+ ac_cv_path_KEXEC=${sbindir}/kexec \
+ ac_cv_path_KILL=${base_bindir}/kill \
+ ac_cv_path_KMOD=${base_bindir}/kmod \
+ ac_cv_path_MOUNT_PATH=${base_bindir}/mount \
+ ac_cv_path_QUOTACHECK=${sbindir}/quotacheck \
+ ac_cv_path_QUOTAON=${sbindir}/quotaon \
+ ac_cv_path_SULOGIN=${base_sbindir}/sulogin \
+ ac_cv_path_UMOUNT_PATH=${base_bindir}/umount \
+"
# Helper variables to clarify locations. This mirrors the logic in systemd's
# build system.
@@ -161,24 +168,15 @@ rootprefix ?= "${root_prefix}"
rootlibdir ?= "${base_libdir}"
rootlibexecdir = "${rootprefix}/lib"
-CACHED_CONFIGUREVARS_class-target = "\
- ac_cv_path_MOUNT_PATH=${base_bindir}/mount \
- ac_cv_path_UMOUNT_PATH=${base_bindir}/umount \
- ac_cv_path_KMOD=${base_bindir}/kmod \
- ac_cv_path_KILL=${base_bindir}/kill \
- ac_cv_path_SULOGIN=${base_sbindir}/sulogin \
- ac_cv_path_KEXEC=${sbindir}/kexec \
- ac_cv_path_QUOTACHECK=${sbindir}/quotacheck \
- ac_cv_path_QUOTAON=${sbindir}/quotaon \
- "
-
-EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
- --with-rootlibdir=${rootlibdir} \
- --with-roothomedir=${ROOT_HOME} \
- --without-python \
- --with-sysvrcnd-path=${sysconfdir} \
- --with-firmware-path=${nonarch_base_libdir}/firmware \
- "
+EXTRA_OECONF = " \
+ --without-python \
+ --with-roothomedir=${ROOT_HOME} \
+ --with-rootlibdir=${rootlibdir} \
+ --with-rootprefix=${rootprefix} \
+ --with-sysvrcnd-path=${sysconfdir} \
+ --with-firmware-path=${nonarch_base_libdir}/firmware \
+"
+
# per the systemd README, define VALGRIND=1 to run under valgrind
CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}"