systemd: Correct the indentation in do_install()
PATCH 1/2 systemd: Correct the indentation in do_install()
There was a mix of using tabs and spaces for indentation.
Signed-off-by Peter Kjellerstedt <[email protected]>
--- meta/recipes-core/systemd/systemd_256.bb | 27 ++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-)
meta/recipes-core/systemd/systemd_256.bb +14 -13
@@ -278,16 +278,17 @@ WATCHDOG_TIMEOUT ??= "60" do_install() { meson_do_install + if ${@bb.utils.contains('PACKAGECONFIG', 'sysusers', 'true', 'false', d)}; then - # Change the root user's home directory in /lib/sysusers.d/basic.conf. - # This is done merely for backward compatibility with previous systemd recipes. - # systemd hardcodes root user's HOME to be "/root". Changing to use other values - # may have unexpected runtime behaviors. - if [ "${ROOT_HOME}" != "/root" ]; then - bbwarn "Using ${ROOT_HOME} as root user's home directory is not fully supported by systemd" - sed -i -e 's#/root#${ROOT_HOME}#g' ${D}${exec_prefix}/lib/sysusers.d/basic.conf - fi - fi + # Change the root user's home directory in /lib/sysusers.d/basic.conf. + # This is done merely for backward compatibility with previous systemd recipes. + # systemd hardcodes root user's HOME to be "/root". Changing to use other values + # may have unexpected runtime behaviors. + if [ "${ROOT_HOME}" != "/root" ]; then + bbwarn "Using ${ROOT_HOME} as root user's home directory is not fully supported by systemd" + sed -i -e 's#/root#${ROOT_HOME}#g' ${D}${exec_prefix}/lib/sysusers.d/basic.conf + fi + fi install -d ${D}/${base_sbindir} if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then # Provided by a separate recipe
@@ -395,10 +396,10 @@ do_install() { # add a profile fragment to disable systemd pager with busybox less install -Dm 0644 ${UNPACKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh - if [ -n "${WATCHDOG_TIMEOUT}" ]; then - sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ - ${D}/${sysconfdir}/systemd/system.conf - fi + if [ -n "${WATCHDOG_TIMEOUT}" ]; then + sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ + ${D}/${sysconfdir}/systemd/system.conf + fi if ${@bb.utils.contains('PACKAGECONFIG', 'pni-names', 'true', 'false', d)}; then if ! grep -q '^NamePolicy=.*mac' ${D}${rootlibexecdir}/systemd/network/99-default.link; then
PATCH 2/2 systemd: Move the MIME file to a separate package
The systemd-mime package is added as a recommendation for systemd so that it is installed by default, but can be excluded, e.g., via BAD_RECOMMENDATIONS. Excluding it avoids pulling in the MIME database for products that have no use for it.
Signed-off-by Peter Kjellerstedt <[email protected]>
--- meta/recipes-core/systemd/systemd_256.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_256.bb +5 -1
@@ -429,6 +429,7 @@ PACKAGE_BEFORE_PN = "\ ${PN}-journal-upload \ ${PN}-journal-remote \ ${PN}-kernel-install \ + ${PN}-mime \ ${PN}-rpm-macros \ ${PN}-udev-rules \ ${PN}-vconsole-setup \
@@ -634,6 +635,9 @@ FILES:${PN}-extra-utils = "\ ${rootlibexecdir}/systemd/systemd-cgroups-agent \ " +FILES:${PN}-mime = "${MIMEDIR}" +RRECOMMENDS:${PN} += "${PN}-mime" + FILES:${PN}-udev-rules = "\ ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \ ${rootlibexecdir}/udev/rules.d/71-seat.rules \
@@ -731,7 +735,7 @@ RDEPENDS:${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTEND RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" RDEPENDS:${PN} += "volatile-binds" -RRECOMMENDS:${PN} += "systemd-extra-utils \ +RRECOMMENDS:${PN} += "${PN}-extra-utils \ udev-hwdb \ e2fsprogs-e2fsck \ kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \