summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/systemd/systemd_254.bb8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_254.bb b/meta/recipes-core/systemd/systemd_254.bb
index 6ef148ac36..7ba4233f6a 100644
--- a/meta/recipes-core/systemd/systemd_254.bb
+++ b/meta/recipes-core/systemd/systemd_254.bb
@@ -239,7 +239,9 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \
239 -Dsystem-gid-max=999 \ 239 -Dsystem-gid-max=999 \
240 " 240 "
241 241
242# Hardcode target binary paths to avoid using paths from sysroot 242# Hardcode target binary paths to avoid using paths from sysroot or worse
243# it pokes for these binaries on build host and encodes that distro assumption
244# into target
243EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \ 245EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \
244 -Dkmod-path=${base_bindir}/kmod \ 246 -Dkmod-path=${base_bindir}/kmod \
245 -Dmount-path=${base_bindir}/mount \ 247 -Dmount-path=${base_bindir}/mount \
@@ -247,7 +249,9 @@ EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \
247 -Dquotaon-path=${sbindir}/quotaon \ 249 -Dquotaon-path=${sbindir}/quotaon \
248 -Dsulogin-path=${base_sbindir}/sulogin \ 250 -Dsulogin-path=${base_sbindir}/sulogin \
249 -Dnologin-path=${base_sbindir}/nologin \ 251 -Dnologin-path=${base_sbindir}/nologin \
250 -Dumount-path=${base_bindir}/umount" 252 -Dumount-path=${base_bindir}/umount \
253 -Dloadkeys-path=${base_bindir}/loadkeys \
254 -Dsetfont-path=${base_bindir}/setfont"
251 255
252# The 60 seconds is watchdog's default vaule. 256# The 60 seconds is watchdog's default vaule.
253WATCHDOG_TIMEOUT ??= "60" 257WATCHDOG_TIMEOUT ??= "60"