diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2025-06-16 11:50:00 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-20 12:07:27 +0100 |
| commit | dc9faa3cdc057983b55fb6bd19091722c58bc62c (patch) | |
| tree | 71d3e00e269779049376fc64ca9fa7c10b5b9707 /meta/recipes-core/systemd | |
| parent | 0ad5fb3431b5f5875326d929442124a8fabe0642 (diff) | |
| download | poky-dc9faa3cdc057983b55fb6bd19091722c58bc62c.tar.gz | |
meta: remove consecutive blank lines
Some of them were introduced by mass-removal of S = WORKDIR/git assignments;
rather than try to fix up (or redo) just these, I've run this sed command over
the whole tree:
sed -i -z -E 's/([ \t\f\v\r]*\n){3,}/\n\n/g' `find . -name *.bb -o -name *.inc`
The rationale is that more than one empty line is wasting vertical screen space, and
does nothing for readability.
(From OE-Core rev: cedc4ff7c9bcfb22a20e43e47f9759f4007a4f1a)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
| -rw-r--r-- | meta/recipes-core/systemd/systemd-compat-units.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd-machine-units_1.0.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_257.6.bb | 2 |
4 files changed, 0 insertions, 5 deletions
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb index 187f0d4626..d6da34e9b8 100644 --- a/meta/recipes-core/systemd/systemd-compat-units.bb +++ b/meta/recipes-core/systemd/systemd-compat-units.bb | |||
| @@ -2,7 +2,6 @@ SUMMARY = "Enhances systemd compatilibity with existing SysVinit scripts" | |||
| 2 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" | 2 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" |
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | 4 | ||
| 5 | |||
| 6 | PACKAGE_WRITE_DEPS += "systemd-systemctl-native" | 5 | PACKAGE_WRITE_DEPS += "systemd-systemctl-native" |
| 7 | 6 | ||
| 8 | S = "${UNPACKDIR}" | 7 | S = "${UNPACKDIR}" |
diff --git a/meta/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta/recipes-core/systemd/systemd-machine-units_1.0.bb index 8df7ff7cf1..a366f199ee 100644 --- a/meta/recipes-core/systemd/systemd-machine-units_1.0.bb +++ b/meta/recipes-core/systemd/systemd-machine-units_1.0.bb | |||
| @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda | |||
| 5 | 5 | ||
| 6 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 6 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 7 | 7 | ||
| 8 | |||
| 9 | inherit systemd features_check | 8 | inherit systemd features_check |
| 10 | REQUIRED_DISTRO_FEATURES += "usrmerge" | 9 | REQUIRED_DISTRO_FEATURES += "usrmerge" |
| 11 | SYSTEMD_SERVICE:${PN} = "" | 10 | SYSTEMD_SERVICE:${PN} = "" |
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index cd90491431..101457140f 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc | |||
| @@ -19,5 +19,4 @@ SRCREV = "00a12c234e2506f5cab683460199575f13c454db" | |||
| 19 | SRCBRANCH = "v257-stable" | 19 | SRCBRANCH = "v257-stable" |
| 20 | SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH};tag=v${PV}" | 20 | SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH};tag=v${PV}" |
| 21 | 21 | ||
| 22 | |||
| 23 | CVE_PRODUCT = "systemd" | 22 | CVE_PRODUCT = "systemd" |
diff --git a/meta/recipes-core/systemd/systemd_257.6.bb b/meta/recipes-core/systemd/systemd_257.6.bb index 995b55580e..5f7f20c434 100644 --- a/meta/recipes-core/systemd/systemd_257.6.bb +++ b/meta/recipes-core/systemd/systemd_257.6.bb | |||
| @@ -519,7 +519,6 @@ RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'ker | |||
| 519 | 519 | ||
| 520 | RDEPENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}" | 520 | RDEPENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}" |
| 521 | 521 | ||
| 522 | |||
| 523 | FILES:${PN}-journal-gatewayd = "${nonarch_libdir}/systemd/systemd-journal-gatewayd \ | 522 | FILES:${PN}-journal-gatewayd = "${nonarch_libdir}/systemd/systemd-journal-gatewayd \ |
| 524 | ${systemd_system_unitdir}/systemd-journal-gatewayd.service \ | 523 | ${systemd_system_unitdir}/systemd-journal-gatewayd.service \ |
| 525 | ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \ | 524 | ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \ |
| @@ -542,7 +541,6 @@ FILES:${PN}-journal-remote = "${nonarch_libdir}/systemd/systemd-journal-remote \ | |||
| 542 | " | 541 | " |
| 543 | SYSTEMD_SERVICE:${PN}-journal-remote = "systemd-journal-remote.socket" | 542 | SYSTEMD_SERVICE:${PN}-journal-remote = "systemd-journal-remote.socket" |
| 544 | 543 | ||
| 545 | |||
| 546 | FILES:${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ | 544 | FILES:${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ |
| 547 | ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ | 545 | ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ |
| 548 | ${sysconfdir}/systemd/system/multi-user.target.wants/machines.target \ | 546 | ${sysconfdir}/systemd/system/multi-user.target.wants/machines.target \ |
