From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] dracut: update to 053.
Date: Fri, 30 Apr 2021 19:26:20 +0200 [thread overview]
Message-ID: <20210430172620.aFRkZ7r8K-zkkvw-VgQO8Q83SsI-73RdGgFGRiNcodE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30584@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 730 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages dracut
https://github.com/void-linux/void-packages/pull/30584
dracut: update to 053.
Looks like `00bootchart` has been dropped and `99squash` has been refactored, so we can drop a few patches. This creates a bootable initramfs for me. Testers welcome.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/30584.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-30584.patch --]
[-- Type: text/x-diff, Size: 4260 bytes --]
From ba6ca69108b2ba603788150b8ec34ff9265cfa76 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
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 <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
next prev parent reply other threads:[~2021-04-30 17:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-29 17:31 [PR PATCH] " ahesford
2021-04-29 18:14 ` [PR PATCH] [Updated] " ahesford
2021-04-30 1:46 ` zdykstra
2021-04-30 7:17 ` sgn
2021-04-30 17:26 ` ahesford [this message]
2021-04-30 17:54 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210430172620.aFRkZ7r8K-zkkvw-VgQO8Q83SsI-73RdGgFGRiNcodE@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).