summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-08-15 15:04:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:35:56 +0100
commit06b97accfe6b13f31c63cc850bdcdebf8b4da24a (patch)
tree1200b1e996bf3dadd672d8219261682014e7a9f0
parent2a9cf4d0a769300878c5c670f496a62b64a71c18 (diff)
downloadpoky-06b97accfe6b13f31c63cc850bdcdebf8b4da24a.tar.gz
systemd: Cache/define tool paths for target
Recently, systemd has added a patch f00929ad622c978f8ad83590a15a765b4beecac9 where it now pokes at the system to find out the path of mount/umount tools, this caused the builds to fail because it ended up with identifying these programs from native sysroot but they were actually meant for target, this lead to boot failures due to none of mount worked because the paths are encoded into systemd binaries during build time. Correct few others while here, these are not yet detected wrongly in my build, because those binaries are not found in my native sysroot but if some one staged the native providers of these packages they will fail too. (From OE-Core rev: 9d87fbc87276673d958a65d476d06fec96add8e7) (From OE-Core rev: b30d7b1b97ffd1d44083d93ed0e572d80fcebc54) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_219.bb12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 98bf66f450..4d32fd5b62 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -104,7 +104,17 @@ rootprefix ?= "${base_prefix}"
104rootlibdir ?= "${base_libdir}" 104rootlibdir ?= "${base_libdir}"
105rootlibexecdir = "${rootprefix}/lib" 105rootlibexecdir = "${rootprefix}/lib"
106 106
107# The gtk+ tools should get built as a separate recipe e.g. systemd-tools 107CACHED_CONFIGUREVARS_class-target = "\
108 ac_cv_path_MOUNT_PATH=${base_bindir}/mount \
109 ac_cv_path_UMOUNT_PATH=${base_bindir}/umount \
110 ac_cv_path_KMOD=${base_bindir}/kmod \
111 ac_cv_path_KILL=${base_bindir}/kill \
112 ac_cv_path_SULOGIN=${base_sbindir}/sulogin \
113 ac_cv_path_KEXEC=${sbindir}/kexec \
114 ac_cv_path_QUOTACHECK=${sbindir}/quotacheck \
115 ac_cv_path_QUOTAON=${sbindir}/quotaon \
116 "
117
108EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ 118EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
109 --with-rootlibdir=${rootlibdir} \ 119 --with-rootlibdir=${rootlibdir} \
110 --with-roothomedir=${ROOT_HOME} \ 120 --with-roothomedir=${ROOT_HOME} \