From ffd2f9b3e776e8f2d00ab79642665b8f9ebd7733 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 29 Apr 2021 12:24:04 -0400 Subject: [PATCH] dracut: update to 053. --- .../patches/00bootchart-requirements.patch | 14 ----------- .../patches/99squash-no-systemd-error.patch | 13 ---------- srcpkgs/dracut/patches/force_poweroff.patch | 4 +-- srcpkgs/dracut/template | 25 ++++++------------- 4 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 srcpkgs/dracut/patches/00bootchart-requirements.patch delete mode 100644 srcpkgs/dracut/patches/99squash-no-systemd-error.patch diff --git a/srcpkgs/dracut/patches/00bootchart-requirements.patch b/srcpkgs/dracut/patches/00bootchart-requirements.patch deleted file mode 100644 index a617565a0c17..000000000000 --- a/srcpkgs/dracut/patches/00bootchart-requirements.patch +++ /dev/null @@ -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/[ diff --git a/srcpkgs/dracut/patches/99squash-no-systemd-error.patch b/srcpkgs/dracut/patches/99squash-no-systemd-error.patch deleted file mode 100644 index d93f6d895b17..000000000000 --- a/srcpkgs/dracut/patches/99squash-no-systemd-error.patch +++ /dev/null @@ -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 diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch index b965b93bfc2e..6ffda53e31a6 100644 --- a/srcpkgs/dracut/patches/force_poweroff.patch +++ b/srcpkgs/dracut/patches/force_poweroff.patch @@ -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) diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 791591ae7c30..c8db2195c8a0 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -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 " 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