dracut: update to 053.

Closes: #30584.
This commit is contained in:
Andrew J. Hesford 2021-04-29 12:24:04 -04:00
parent 25f3674b3b
commit b35283498e
4 changed files with 8 additions and 48 deletions

View file

@ -1,14 +0,0 @@
--- modules.d/00bootchart/module-setup.sh.orig 2021-01-24 16:00:46.529880095 +0700
+++ modules.d/00bootchart/module-setup.sh 2021-01-24 16:00:56.134911133 +0700
@@ -19,10 +19,8 @@
inst_multiple bootchartd bash \
/lib/bootchart/bootchart-collector /etc/bootchartd.conf \
- accton \
echo \
- grep \
- usleep
+ grep
inst /usr/bin/pkill /bin/pkill
inst /usr/bin/[ /bin/[

View file

@ -1,13 +0,0 @@
diff --git modules.d/99squash/module-setup.sh modules.d/99squash/module-setup.sh
index 9a61a59d..96543a58 100644
--- modules.d/99squash/module-setup.sh
+++ modules.d/99squash/module-setup.sh
@@ -2,8 +2,7 @@
check() {
if ! dracut_module_included "systemd-initrd"; then
- derror "dracut-squash only supports systemd bases initramfs"
return 1
fi
if ! type -P mksquashfs >/dev/null || ! type -P unsquashfs >/dev/null ; then

View file

@ -1,8 +1,6 @@
diff --git modules.d/99base/dracut-lib.sh modules.d/99base/dracut-lib.sh
index 99cb9dbc..3df77257 100755
--- modules.d/99base/dracut-lib.sh
+++ modules.d/99base/dracut-lib.sh
@@ -1159,11 +1159,11 @@
@@ -1128,11 +1128,11 @@
case "$_emergency_action" in
reboot)

View file

@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
version=051
revision=2
version=053
revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@ -13,18 +13,18 @@ maintainer="q66 <daniel@octaforge.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz"
checksum=95bc2586b771e3f4ab5c8637201732a137bb682395d25ab496374241091906e3
checksum=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
subpackages="dracut-network"
# Checks require distfiles come from a git repository
make_check=no
make_dirs="
/etc/dracut.conf.d 0755 root root
/usr/lib/dracut/dracut.conf.d 0755 root root"
case "$XBPS_TARGET_MACHINE" in
*-musl) # Add musl-fts implementation
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-fts-devel"
;;
esac
fi
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) # archs supported by dracut for EFI bundle
@ -32,17 +32,6 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
do_build() {
case "$XBPS_TARGET_MACHINE" in
*-musl) make ${makejobs} LDLIBS="-lfts" ;;
esac
}
do_check() {
# Requires the distfile to be a git repository
:
}
post_install() {
# kernel hooks.
vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 20-dracut