diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd_255.4.bb')
-rw-r--r-- | meta/recipes-core/systemd/systemd_255.4.bb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_255.4.bb b/meta/recipes-core/systemd/systemd_255.4.bb index 8a816c4bc1..e7498c802d 100644 --- a/meta/recipes-core/systemd/systemd_255.4.bb +++ b/meta/recipes-core/systemd/systemd_255.4.bb | |||
@@ -28,7 +28,6 @@ SRC_URI += " \ | |||
28 | file://systemd-pager.sh \ | 28 | file://systemd-pager.sh \ |
29 | file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ | 29 | file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ |
30 | file://0008-implment-systemd-sysv-install-for-OE.patch \ | 30 | file://0008-implment-systemd-sysv-install-for-OE.patch \ |
31 | file://0001-NamePolicy.patch \ | ||
32 | " | 31 | " |
33 | 32 | ||
34 | # patches needed by musl | 33 | # patches needed by musl |
@@ -66,7 +65,7 @@ PAM_PLUGINS = " \ | |||
66 | " | 65 | " |
67 | 66 | ||
68 | PACKAGECONFIG ??= " \ | 67 | PACKAGECONFIG ??= " \ |
69 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam selinux smack usrmerge polkit seccomp', d)} \ | 68 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam pni-names selinux smack usrmerge polkit seccomp', d)} \ |
70 | ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump elfutils', '', d)} \ | 69 | ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump elfutils', '', d)} \ |
71 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ | 70 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ |
72 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ | 71 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ |
@@ -197,6 +196,7 @@ PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false" | |||
197 | PACKAGECONFIG[polkit_hostnamed_fallback] = ",,,,dbus-broker,polkit" | 196 | PACKAGECONFIG[polkit_hostnamed_fallback] = ",,,,dbus-broker,polkit" |
198 | PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false" | 197 | PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false" |
199 | PACKAGECONFIG[pstore] = "-Dpstore=true,-Dpstore=false" | 198 | PACKAGECONFIG[pstore] = "-Dpstore=true,-Dpstore=false" |
199 | PACKAGECONFIG[pni-names] = ",,," | ||
200 | PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode,,qrencode" | 200 | PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode,,qrencode" |
201 | PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" | 201 | PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" |
202 | PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" | 202 | PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" |
@@ -389,6 +389,15 @@ do_install() { | |||
389 | sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ | 389 | sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ |
390 | ${D}/${sysconfdir}/systemd/system.conf | 390 | ${D}/${sysconfdir}/systemd/system.conf |
391 | fi | 391 | fi |
392 | |||
393 | if ${@bb.utils.contains('PACKAGECONFIG', 'pni-names', 'true', 'false', d)}; then | ||
394 | if ! grep -q '^NamePolicy=.*mac' ${D}${rootlibexecdir}/systemd/network/99-default.link; then | ||
395 | sed -i '/^NamePolicy=/s/$/ mac/' ${D}${rootlibexecdir}/systemd/network/99-default.link | ||
396 | fi | ||
397 | if ! grep -q 'AlternativeNamesPolicy=.*mac' ${D}${rootlibexecdir}/systemd/network/99-default.link; then | ||
398 | sed -i '/AlternativeNamesPolicy=/s/$/ mac/' ${D}${rootlibexecdir}/systemd/network/99-default.link | ||
399 | fi | ||
400 | fi | ||
392 | } | 401 | } |
393 | 402 | ||
394 | python populate_packages:prepend (){ | 403 | python populate_packages:prepend (){ |