]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
systemd: depend on util-linux-mkswap
authorMikko Rapeli <mikko.rapeli@linaro.org>
Thu, 20 Feb 2025 08:41:09 +0000 (10:41 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 21 Feb 2025 13:07:32 +0000 (13:07 +0000)
busybox mkswap doesn't support all needed options.
Fixes:

systemd[1]: Activating swap /dev/disk/by-uuid/38d0b388-9989-4744-8a0a-3e6be1135f5a...
swapon[210]: swapon: /dev/sda3: swap format pagesize does not match.
swapon[210]: swapon: /dev/sda3: reinitializing the swap.
swapon[212]: mkswap: invalid option -- 'U'
swapon[212]: BusyBox v1.37.0 () multi-call binary.
swapon[212]: Usage: mkswap [-L LBL] BLOCKDEV [KBYTES]
systemd[1]: dev-disk-by\x2duuid-38d0b388\x2d9989\x2d4744\x2d8a0a\x2d3e6be1135f5a.swap: Swap process exited, code=exited,

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/systemd/systemd_257.3.bb

index cdf72a5015779ac8f228c87740195df85087dd6b..7d862507770e166bfa474012088745bdfa06428b 100644 (file)
@@ -749,7 +749,7 @@ FILES:${PN} = " ${base_bindir}/* \
 
 FILES:${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
 
-RDEPENDS:${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck util-linux-swaponoff"
+RDEPENDS:${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck util-linux-swaponoff util-linux-mkswap"
 RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}"
 RDEPENDS:${PN} += "volatile-binds"