diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/systemd/systemd_254.4.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb index 76cc07e86f..ef29116bf9 100644 --- a/meta/recipes-core/systemd/systemd_254.4.bb +++ b/meta/recipes-core/systemd/systemd_254.4.bb | |||
@@ -227,6 +227,8 @@ PACKAGECONFIG[xz] = "-Dxz=true,-Dxz=false,xz" | |||
227 | PACKAGECONFIG[zlib] = "-Dzlib=true,-Dzlib=false,zlib" | 227 | PACKAGECONFIG[zlib] = "-Dzlib=true,-Dzlib=false,zlib" |
228 | PACKAGECONFIG[zstd] = "-Dzstd=true,-Dzstd=false,zstd" | 228 | PACKAGECONFIG[zstd] = "-Dzstd=true,-Dzstd=false,zstd" |
229 | 229 | ||
230 | RESOLV_CONF ??= "" | ||
231 | |||
230 | # Helper variables to clarify locations. This mirrors the logic in systemd's | 232 | # Helper variables to clarify locations. This mirrors the logic in systemd's |
231 | # build system. | 233 | # build system. |
232 | rootprefix ?= "${root_prefix}" | 234 | rootprefix ?= "${root_prefix}" |
@@ -338,8 +340,9 @@ do_install() { | |||
338 | echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf | 340 | echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf |
339 | ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd | 341 | ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd |
340 | else | 342 | else |
341 | sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf | 343 | resolv_conf="${@bb.utils.contains('RESOLV_CONF', 'stub-resolv', 'run/systemd/resolve/stub-resolv.conf', 'run/systemd/resolve/resolv.conf', d)}" |
342 | ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd | 344 | sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../${resolv_conf}%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf |
345 | ln -s ../${resolv_conf} ${D}${sysconfdir}/resolv-conf.systemd | ||
343 | fi | 346 | fi |
344 | if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then | 347 | if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then |
345 | rm ${D}${exec_prefix}/lib/tmpfiles.d/x11.conf | 348 | rm ${D}${exec_prefix}/lib/tmpfiles.d/x11.conf |