[oe-commits] Khem Raj : systemd: Cache/define tool paths for target

git at git.openembedded.org git at git.openembedded.org
Sun Aug 30 11:49:35 UTC 2015


Module: openembedded-core.git
Branch: master-next
Commit: b30d7b1b97ffd1d44083d93ed0e572d80fcebc54
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b30d7b1b97ffd1d44083d93ed0e572d80fcebc54

Author: Khem Raj <raj.khem at gmail.com>
Date:   Sat Aug 15 15:04:31 2015 -0700

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)

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/systemd/systemd_219.bb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 98bf66f..4d32fd5 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -104,7 +104,17 @@ rootprefix ?= "${base_prefix}"
 rootlibdir ?= "${base_libdir}"
 rootlibexecdir = "${rootprefix}/lib"
 
-# The gtk+ tools should get built as a separate recipe e.g. systemd-tools
+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} \



More information about the Openembedded-commits mailing list