systemd: change PACKAGECONFIG 'resolve' back to 'resolved'
cover systemd: change PACKAGECONFIG 'resolve' back to 'resolved'
The following changes since commit f49ee61422c867516db252054e993df29f775136:
systemd-boot: upgrade to 237 (2018-03-20 09:59:33 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/systemd-resolved
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-resolved
Chen Qi (1):
systemd: change PACKAGECONFIG 'resolve' back to 'resolved'
meta/recipes-core/systemd/systemd_237.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/1 systemd: change PACKAGECONFIG 'resolve' back to 'resolved'
When systemd was upgraded from 234 to 237, the PACKAGECONFIG item 'resolved' is changed to 'resolve', this is because meson_options.txt uses the word 'resolve' instead of 'resolved'.
However, this causes trouble for users. Backward compatibility is obviously more important, because we might have bbappend files in other layers using this PACKAGECONFIG item.
So change the name back to 'resolved'.
--- meta/recipes-core/systemd/systemd_237.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-core/systemd/systemd_237.bb +5 -5
@@ -81,7 +81,7 @@ PACKAGECONFIG ??= " \ polkit \ quotacheck \ randomseed \ - resolve \ + resolved \ smack \ sysusers \ timedated \
@@ -95,7 +95,7 @@ PACKAGECONFIG_remove_libc-musl = " \ localed \ myhostname \ nss \ - resolve \ + resolved \ selinux \ smack \ sysusers \
@@ -143,7 +143,7 @@ PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false" PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode" PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" -PACKAGECONFIG[resolve] = "-Dresolve=true,-Dresolve=false" +PACKAGECONFIG[resolved] = "-Dresolve=true,-Dresolve=false" PACKAGECONFIG[rfkill] = "-Drfkill=true,-Drfkill=false" # libseccomp is found in meta-security PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp"
@@ -246,7 +246,7 @@ do_install() { if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)} fi - if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolve', 'true', 'false', d)}; then + if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf echo 'd /run/systemd/resolve 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
@@ -300,7 +300,7 @@ USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}" USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}" USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolve', '--system -d / -M --shell /bin/nologin systemd-resolve;', '', d)}" +USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /bin/nologin systemd-resolve;', '', d)}" USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}" GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" USERADD_PARAM_${PN}-extra-utils += "--system -d / -M --shell /bin/nologin systemd-bus-proxy;"
Signature · 1 line
1.9.1