Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] dracut: update to 059+git20231027
@ 2023-10-28  3:36 LaszloGombos
  2023-10-28  3:38 ` classabbyamp
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: LaszloGombos @ 2023-10-28  3:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 766 bytes --]

There is a new pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/46936

dracut: update to 059+git20231027
#### Testing the changes
- I tested the changes in this PR: **NO**

Add a new version of dracut based on the latest git commit.
With this version upgrade I was able to remove 4 patches maintained in the tree.
Help is needed to test this upgrade.

It has been over 10 months since the last upstream dracut release. Upstream release generation is stalled, see - https://github.com/dracutdevs/dracut/issues/2431#issuecomment-1754305440

A patch file from https://github.com/void-linux/void-packages/pull/46936.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-46936.patch --]
[-- Type: text/x-diff, Size: 7782 bytes --]

From 2065abfa70a2f75d65bff29dacc5cf30850e297d Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Fri, 27 Oct 2023 23:31:09 -0400
Subject: [PATCH] dracut: update to 059+git20231027

---
 srcpkgs/dracut/patches/crypt-openssl-3.patch  | 24 ------------
 srcpkgs/dracut/patches/fix-fsck.patch         | 27 --------------
 .../dracut/patches/isoscan-udev-trigger.patch | 25 -------------
 srcpkgs/dracut/patches/network.patch          | 37 -------------------
 srcpkgs/dracut/template                       |  9 +++--
 5 files changed, 5 insertions(+), 117 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
 delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
 delete mode 100644 srcpkgs/dracut/patches/network.patch

diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
-             systemd-ask-password systemd-tty-ask-password-agent
-     fi
- 
-+    # Install required libraries.
-+    _arch=${DRACUT_ARCH:-$(uname -m)}
-+    inst_libdir_file \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
-     dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
- 
-     info "issuing $_drv $_fop $_dev"
-     # we enforce non-interactive run, so $() is fine
--    _out=$($_drv "$_fop" "$_dev")
-+    # shellcheck disable=SC2086
-+    _out=$($_drv $_fop "$_dev")
-     _ret=$?
-     fsck_tail
- 
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
-         mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
-         if [ -f "/run/initramfs/isoscan/$isofile" ]; then
-             losetup -f "/run/initramfs/isoscan/$isofile"
-+            udevadm trigger --action=add > /dev/null 2>&1
-             ln -s "$dev" /run/initramfs/isoscandev
-             rm -f -- "$job"
-             exit 0
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
-     done
-
-     if [ -z "$network_handler" ]; then
--        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-             network_handler="network-wicked"
--        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-             network_handler="connman"
--        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
-             network_handler="network-manager"
--        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-             network_handler="systemd-networkd"
--        else
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-             network_handler="network-legacy"
-         fi
-     fi
---
-2.34.1
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 6fad8af51d57e9..7f3209305d7ec1 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,8 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=059
-revision=4
+version=059+git20231027
+revision=5
+_commit=b2af8c8bcfc72802e02e2c0adc2eed9279101624
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -13,8 +14,8 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/dracutdevs/dracut/wiki"
 changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+distfiles="https://github.com/dracutdevs/dracut/archive/${_commit}.tar.gz"
+checksum=cfd45a6e8457e5d693bd2261214caa9f105ecfad826e0e800df6e990a62c4b69
 alternatives="
  initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
  initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059+git20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
@ 2023-10-28  3:38 ` classabbyamp
  2023-10-28  3:38 ` classabbyamp
                   ` (16 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2023-10-28  3:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783684662

Comment:
we shouldn't need to update as we still use gummiboot, which is not affected by the broken UKI math

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059+git20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
  2023-10-28  3:38 ` classabbyamp
@ 2023-10-28  3:38 ` classabbyamp
  2023-10-28  3:45 ` [PR PATCH] [Updated] " LaszloGombos
                   ` (15 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2023-10-28  3:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 252 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783684662

Comment:
we shouldn't need to update as we still use gummiboot stubs, which is not affected by the broken UKI math

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] dracut: update to 059+git20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
  2023-10-28  3:38 ` classabbyamp
  2023-10-28  3:38 ` classabbyamp
@ 2023-10-28  3:45 ` LaszloGombos
  2023-10-28  3:45 ` LaszloGombos
                   ` (14 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: LaszloGombos @ 2023-10-28  3:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 771 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/46936

dracut: update to 059+git20231027
#### Testing the changes
- I tested the changes in this PR: **NO**

Add a new version of dracut based on the latest git commit.
With this version upgrade I was able to remove 4 patches maintained in the tree.
Help is needed to test this upgrade.

It has been over 10 months since the last upstream dracut release. Upstream release generation is stalled, see - https://github.com/dracutdevs/dracut/issues/2431#issuecomment-1754305440

A patch file from https://github.com/void-linux/void-packages/pull/46936.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-46936.patch --]
[-- Type: text/x-diff, Size: 7779 bytes --]

From 9b899d8d57f833e17d6787d783c0c20acd3f5076 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Fri, 27 Oct 2023 23:31:09 -0400
Subject: [PATCH] dracut: update to 059+git20231027

---
 srcpkgs/dracut/patches/crypt-openssl-3.patch  | 24 ------------
 srcpkgs/dracut/patches/fix-fsck.patch         | 27 --------------
 .../dracut/patches/isoscan-udev-trigger.patch | 25 -------------
 srcpkgs/dracut/patches/network.patch          | 37 -------------------
 srcpkgs/dracut/template                       |  9 +++--
 5 files changed, 5 insertions(+), 117 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
 delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
 delete mode 100644 srcpkgs/dracut/patches/network.patch

diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
-             systemd-ask-password systemd-tty-ask-password-agent
-     fi
- 
-+    # Install required libraries.
-+    _arch=${DRACUT_ARCH:-$(uname -m)}
-+    inst_libdir_file \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
-     dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
- 
-     info "issuing $_drv $_fop $_dev"
-     # we enforce non-interactive run, so $() is fine
--    _out=$($_drv "$_fop" "$_dev")
-+    # shellcheck disable=SC2086
-+    _out=$($_drv $_fop "$_dev")
-     _ret=$?
-     fsck_tail
- 
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
-         mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
-         if [ -f "/run/initramfs/isoscan/$isofile" ]; then
-             losetup -f "/run/initramfs/isoscan/$isofile"
-+            udevadm trigger --action=add > /dev/null 2>&1
-             ln -s "$dev" /run/initramfs/isoscandev
-             rm -f -- "$job"
-             exit 0
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
-     done
-
-     if [ -z "$network_handler" ]; then
--        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-             network_handler="network-wicked"
--        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-             network_handler="connman"
--        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
-             network_handler="network-manager"
--        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-             network_handler="systemd-networkd"
--        else
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-             network_handler="network-legacy"
-         fi
-     fi
---
-2.34.1
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 6fad8af51d57e9..e7891349e15647 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,8 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=059
-revision=4
+version=059.20231027
+revision=5
+_commit=b2af8c8bcfc72802e02e2c0adc2eed9279101624
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -13,8 +14,8 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/dracutdevs/dracut/wiki"
 changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+distfiles="https://github.com/dracutdevs/dracut/archive/${_commit}.tar.gz"
+checksum=cfd45a6e8457e5d693bd2261214caa9f105ecfad826e0e800df6e990a62c4b69
 alternatives="
  initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
  initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] dracut: update to 059+git20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (2 preceding siblings ...)
  2023-10-28  3:45 ` [PR PATCH] [Updated] " LaszloGombos
@ 2023-10-28  3:45 ` LaszloGombos
  2023-10-28  3:49 ` [PR PATCH] [Updated] dracut: update to 059.20231027 LaszloGombos
                   ` (13 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: LaszloGombos @ 2023-10-28  3:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 771 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/46936

dracut: update to 059+git20231027
#### Testing the changes
- I tested the changes in this PR: **NO**

Add a new version of dracut based on the latest git commit.
With this version upgrade I was able to remove 4 patches maintained in the tree.
Help is needed to test this upgrade.

It has been over 10 months since the last upstream dracut release. Upstream release generation is stalled, see - https://github.com/dracutdevs/dracut/issues/2431#issuecomment-1754305440

A patch file from https://github.com/void-linux/void-packages/pull/46936.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-46936.patch --]
[-- Type: text/x-diff, Size: 7776 bytes --]

From 7bedb1757f7d5fe6f7dec50c0435ade1494f41e6 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Fri, 27 Oct 2023 23:31:09 -0400
Subject: [PATCH] dracut: update to 059.20231027

---
 srcpkgs/dracut/patches/crypt-openssl-3.patch  | 24 ------------
 srcpkgs/dracut/patches/fix-fsck.patch         | 27 --------------
 .../dracut/patches/isoscan-udev-trigger.patch | 25 -------------
 srcpkgs/dracut/patches/network.patch          | 37 -------------------
 srcpkgs/dracut/template                       |  9 +++--
 5 files changed, 5 insertions(+), 117 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
 delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
 delete mode 100644 srcpkgs/dracut/patches/network.patch

diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
-             systemd-ask-password systemd-tty-ask-password-agent
-     fi
- 
-+    # Install required libraries.
-+    _arch=${DRACUT_ARCH:-$(uname -m)}
-+    inst_libdir_file \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
-     dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
- 
-     info "issuing $_drv $_fop $_dev"
-     # we enforce non-interactive run, so $() is fine
--    _out=$($_drv "$_fop" "$_dev")
-+    # shellcheck disable=SC2086
-+    _out=$($_drv $_fop "$_dev")
-     _ret=$?
-     fsck_tail
- 
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
-         mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
-         if [ -f "/run/initramfs/isoscan/$isofile" ]; then
-             losetup -f "/run/initramfs/isoscan/$isofile"
-+            udevadm trigger --action=add > /dev/null 2>&1
-             ln -s "$dev" /run/initramfs/isoscandev
-             rm -f -- "$job"
-             exit 0
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
-     done
-
-     if [ -z "$network_handler" ]; then
--        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-             network_handler="network-wicked"
--        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-             network_handler="connman"
--        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
-             network_handler="network-manager"
--        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-             network_handler="systemd-networkd"
--        else
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-             network_handler="network-legacy"
-         fi
-     fi
---
-2.34.1
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 6fad8af51d57e9..e7891349e15647 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,8 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=059
-revision=4
+version=059.20231027
+revision=5
+_commit=b2af8c8bcfc72802e02e2c0adc2eed9279101624
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -13,8 +14,8 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/dracutdevs/dracut/wiki"
 changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+distfiles="https://github.com/dracutdevs/dracut/archive/${_commit}.tar.gz"
+checksum=cfd45a6e8457e5d693bd2261214caa9f105ecfad826e0e800df6e990a62c4b69
 alternatives="
  initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
  initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (3 preceding siblings ...)
  2023-10-28  3:45 ` LaszloGombos
@ 2023-10-28  3:49 ` LaszloGombos
  2023-10-28  3:55 ` LaszloGombos
                   ` (12 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: LaszloGombos @ 2023-10-28  3:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 768 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/46936

dracut: update to 059.20231027
#### Testing the changes
- I tested the changes in this PR: **NO**

Add a new version of dracut based on the latest git commit.
With this version upgrade I was able to remove 4 patches maintained in the tree.
Help is needed to test this upgrade.

It has been over 10 months since the last upstream dracut release. Upstream release generation is stalled, see - https://github.com/dracutdevs/dracut/issues/2431#issuecomment-1754305440

A patch file from https://github.com/void-linux/void-packages/pull/46936.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-46936.patch --]
[-- Type: text/x-diff, Size: 8107 bytes --]

From a9029692c73a772725d9f31ccb96c6eb8dba229b Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Fri, 27 Oct 2023 23:31:09 -0400
Subject: [PATCH] dracut: update to 059.20231027

---
 srcpkgs/dracut/patches/crypt-openssl-3.patch  | 24 ------------
 srcpkgs/dracut/patches/fix-fsck.patch         | 27 --------------
 .../dracut/patches/isoscan-udev-trigger.patch | 25 -------------
 srcpkgs/dracut/patches/network.patch          | 37 -------------------
 srcpkgs/dracut/template                       | 11 +++---
 5 files changed, 6 insertions(+), 118 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
 delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
 delete mode 100644 srcpkgs/dracut/patches/network.patch

diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
-             systemd-ask-password systemd-tty-ask-password-agent
-     fi
- 
-+    # Install required libraries.
-+    _arch=${DRACUT_ARCH:-$(uname -m)}
-+    inst_libdir_file \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
-     dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
- 
-     info "issuing $_drv $_fop $_dev"
-     # we enforce non-interactive run, so $() is fine
--    _out=$($_drv "$_fop" "$_dev")
-+    # shellcheck disable=SC2086
-+    _out=$($_drv $_fop "$_dev")
-     _ret=$?
-     fsck_tail
- 
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
-         mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
-         if [ -f "/run/initramfs/isoscan/$isofile" ]; then
-             losetup -f "/run/initramfs/isoscan/$isofile"
-+            udevadm trigger --action=add > /dev/null 2>&1
-             ln -s "$dev" /run/initramfs/isoscandev
-             rm -f -- "$job"
-             exit 0
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
-     done
-
-     if [ -z "$network_handler" ]; then
--        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-             network_handler="network-wicked"
--        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-             network_handler="connman"
--        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
-             network_handler="network-manager"
--        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-             network_handler="systemd-networkd"
--        else
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-             network_handler="network-legacy"
-         fi
-     fi
---
-2.34.1
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 6fad8af51d57e9..5e6e144a8c8414 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,8 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=059
-revision=4
+version=059.20231027
+revision=5
+_commit=b2af8c8bcfc72802e02e2c0adc2eed9279101624
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -13,8 +14,8 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/dracutdevs/dracut/wiki"
 changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+distfiles="https://github.com/dracutdevs/dracut/archive/${_commit}.tar.gz"
+checksum=cfd45a6e8457e5d693bd2261214caa9f105ecfad826e0e800df6e990a62c4b69
 alternatives="
  initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
  initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -52,7 +53,7 @@ post_install() {
 
 	# systemd dependent additional dracut modules
 	for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
-		35connman 35network-manager 35network-wicked 80lvmmerge \
+		35connman 35network-manager 80lvmmerge \
 		99memstrack 99squash; do
 		rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
 	done

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (4 preceding siblings ...)
  2023-10-28  3:49 ` [PR PATCH] [Updated] dracut: update to 059.20231027 LaszloGombos
@ 2023-10-28  3:55 ` LaszloGombos
  2023-10-28  3:58 ` LaszloGombos
                   ` (11 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: LaszloGombos @ 2023-10-28  3:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 768 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/46936

dracut: update to 059.20231027
#### Testing the changes
- I tested the changes in this PR: **NO**

Add a new version of dracut based on the latest git commit.
With this version upgrade I was able to remove 4 patches maintained in the tree.
Help is needed to test this upgrade.

It has been over 10 months since the last upstream dracut release. Upstream release generation is stalled, see - https://github.com/dracutdevs/dracut/issues/2431#issuecomment-1754305440

A patch file from https://github.com/void-linux/void-packages/pull/46936.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-46936.patch --]
[-- Type: text/x-diff, Size: 8400 bytes --]

From bb3004ce188c9d0575bf75adc5873391b1aa3ac8 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Fri, 27 Oct 2023 23:31:09 -0400
Subject: [PATCH] dracut: update to 059.20231027

---
 srcpkgs/dracut/patches/crypt-openssl-3.patch  | 24 ------------
 srcpkgs/dracut/patches/fix-fsck.patch         | 27 --------------
 .../dracut/patches/isoscan-udev-trigger.patch | 25 -------------
 srcpkgs/dracut/patches/network.patch          | 37 -------------------
 srcpkgs/dracut/template                       | 16 +++-----
 5 files changed, 6 insertions(+), 123 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
 delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
 delete mode 100644 srcpkgs/dracut/patches/network.patch

diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
-             systemd-ask-password systemd-tty-ask-password-agent
-     fi
- 
-+    # Install required libraries.
-+    _arch=${DRACUT_ARCH:-$(uname -m)}
-+    inst_libdir_file \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
-     dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
- 
-     info "issuing $_drv $_fop $_dev"
-     # we enforce non-interactive run, so $() is fine
--    _out=$($_drv "$_fop" "$_dev")
-+    # shellcheck disable=SC2086
-+    _out=$($_drv $_fop "$_dev")
-     _ret=$?
-     fsck_tail
- 
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
-         mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
-         if [ -f "/run/initramfs/isoscan/$isofile" ]; then
-             losetup -f "/run/initramfs/isoscan/$isofile"
-+            udevadm trigger --action=add > /dev/null 2>&1
-             ln -s "$dev" /run/initramfs/isoscandev
-             rm -f -- "$job"
-             exit 0
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
-     done
-
-     if [ -z "$network_handler" ]; then
--        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-             network_handler="network-wicked"
--        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-             network_handler="connman"
--        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
-             network_handler="network-manager"
--        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-             network_handler="systemd-networkd"
--        else
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-             network_handler="network-legacy"
-         fi
-     fi
---
-2.34.1
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 6fad8af51d57e9..c4ca068f5bd566 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,8 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=059
-revision=4
+version=059.20231027
+revision=5
+_commit=b2af8c8bcfc72802e02e2c0adc2eed9279101624
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -13,8 +14,8 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/dracutdevs/dracut/wiki"
 changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+distfiles="https://github.com/dracutdevs/dracut/archive/${_commit}.tar.gz"
+checksum=cfd45a6e8457e5d693bd2261214caa9f105ecfad826e0e800df6e990a62c4b69
 alternatives="
  initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
  initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -37,11 +38,6 @@ case "$XBPS_TARGET_MACHINE" in
 	;;
 esac
 
-pre_build() {
-	# Upstream tarball is missing version information
-	DRACUT_VERSION="${version}" make dracut-version.sh
-}
-
 post_install() {
 	# kernel hooks.
 	vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut
@@ -52,7 +48,7 @@ post_install() {
 
 	# systemd dependent additional dracut modules
 	for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
-		35connman 35network-manager 35network-wicked 80lvmmerge \
+		35connman 35network-manager 80lvmmerge \
 		99memstrack 99squash; do
 		rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
 	done

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (5 preceding siblings ...)
  2023-10-28  3:55 ` LaszloGombos
@ 2023-10-28  3:58 ` LaszloGombos
  2023-10-28  3:59 ` [PR PATCH] [Updated] " LaszloGombos
                   ` (10 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: LaszloGombos @ 2023-10-28  3:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 603 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783688564

Comment:
> we shouldn't need to update as we still use gummiboot stubs, which is not affected by the broken UKI math

There might be other good reasons to take this version besides removing the 4 patches maintained in the tree.

Just to pick an example - https://github.com/dracutdevs/dracut/commit/6c80408c8644a0add1907b0593eb83f90d6247b1 might be needed for [kernel 6.6-rc1](https://github.com/torvalds/linux/commit/42a7f6e3ffe06308c1ec43a7dac39a27de101574)


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Updated] dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (6 preceding siblings ...)
  2023-10-28  3:58 ` LaszloGombos
@ 2023-10-28  3:59 ` LaszloGombos
  2023-10-28 11:33 ` ahesford
                   ` (9 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: LaszloGombos @ 2023-10-28  3:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 768 bytes --]

There is an updated pull request by LaszloGombos against master on the void-packages repository

https://github.com/LaszloGombos/void-packages master
https://github.com/void-linux/void-packages/pull/46936

dracut: update to 059.20231027
#### Testing the changes
- I tested the changes in this PR: **NO**

Add a new version of dracut based on the latest git commit.
With this version upgrade I was able to remove 4 patches maintained in the tree.
Help is needed to test this upgrade.

It has been over 10 months since the last upstream dracut release. Upstream release generation is stalled, see - https://github.com/dracutdevs/dracut/issues/2431#issuecomment-1754305440

A patch file from https://github.com/void-linux/void-packages/pull/46936.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-46936.patch --]
[-- Type: text/x-diff, Size: 8400 bytes --]

From 56f0437ae266d6e17f5bb25c4b72ab1e0b98c354 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Fri, 27 Oct 2023 23:31:09 -0400
Subject: [PATCH] dracut: update to 059.20231027

---
 srcpkgs/dracut/patches/crypt-openssl-3.patch  | 24 ------------
 srcpkgs/dracut/patches/fix-fsck.patch         | 27 --------------
 .../dracut/patches/isoscan-udev-trigger.patch | 25 -------------
 srcpkgs/dracut/patches/network.patch          | 37 -------------------
 srcpkgs/dracut/template                       | 16 +++-----
 5 files changed, 6 insertions(+), 123 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
 delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
 delete mode 100644 srcpkgs/dracut/patches/network.patch

diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
-             systemd-ask-password systemd-tty-ask-password-agent
-     fi
- 
-+    # Install required libraries.
-+    _arch=${DRACUT_ARCH:-$(uname -m)}
-+    inst_libdir_file \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
-     dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
- 
-     info "issuing $_drv $_fop $_dev"
-     # we enforce non-interactive run, so $() is fine
--    _out=$($_drv "$_fop" "$_dev")
-+    # shellcheck disable=SC2086
-+    _out=$($_drv $_fop "$_dev")
-     _ret=$?
-     fsck_tail
- 
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
-         mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
-         if [ -f "/run/initramfs/isoscan/$isofile" ]; then
-             losetup -f "/run/initramfs/isoscan/$isofile"
-+            udevadm trigger --action=add > /dev/null 2>&1
-             ln -s "$dev" /run/initramfs/isoscandev
-             rm -f -- "$job"
-             exit 0
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
-     done
-
-     if [ -z "$network_handler" ]; then
--        if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+        if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-             network_handler="network-wicked"
--        elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35connman ]]  && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-             network_handler="connman"
--        elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]]  && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
-             network_handler="network-manager"
--        elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+        elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-             network_handler="systemd-networkd"
--        else
-+        elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
-             network_handler="network-legacy"
-         fi
-     fi
---
-2.34.1
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 6fad8af51d57e9..de22d6e2226bcf 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,8 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=059
-revision=4
+version=059.20231027
+revision=1
+_commit=b2af8c8bcfc72802e02e2c0adc2eed9279101624
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -13,8 +14,8 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/dracutdevs/dracut/wiki"
 changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+distfiles="https://github.com/dracutdevs/dracut/archive/${_commit}.tar.gz"
+checksum=cfd45a6e8457e5d693bd2261214caa9f105ecfad826e0e800df6e990a62c4b69
 alternatives="
  initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
  initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -37,11 +38,6 @@ case "$XBPS_TARGET_MACHINE" in
 	;;
 esac
 
-pre_build() {
-	# Upstream tarball is missing version information
-	DRACUT_VERSION="${version}" make dracut-version.sh
-}
-
 post_install() {
 	# kernel hooks.
 	vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut
@@ -52,7 +48,7 @@ post_install() {
 
 	# systemd dependent additional dracut modules
 	for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
-		35connman 35network-manager 35network-wicked 80lvmmerge \
+		35connman 35network-manager 80lvmmerge \
 		99memstrack 99squash; do
 		rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
 	done

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (7 preceding siblings ...)
  2023-10-28  3:59 ` [PR PATCH] [Updated] " LaszloGombos
@ 2023-10-28 11:33 ` ahesford
  2023-10-28 11:33 ` [PR PATCH] [Closed]: " ahesford
                   ` (8 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2023-10-28 11:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783785170

Comment:
We don't permit updating to unreleased repository snapshots like this.

If there are a few **critical** patches you would like to backport to an official Dracut release, that would be acceptable; that would involve keeping the same version and just incrementing the revision.

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PR PATCH] [Closed]: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (8 preceding siblings ...)
  2023-10-28 11:33 ` ahesford
@ 2023-10-28 11:33 ` ahesford
  2023-10-28 12:08 ` LaszloGombos
                   ` (7 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2023-10-28 11:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

There's a closed pull request on the void-packages repository

dracut: update to 059.20231027
https://github.com/void-linux/void-packages/pull/46936

Description:
#### Testing the changes
- I tested the changes in this PR: **NO**

Add a new version of dracut based on the latest git commit.
With this version upgrade I was able to remove 4 patches maintained in the tree.
Help is needed to test this upgrade.

It has been over 10 months since the last upstream dracut release. Upstream release generation is stalled, see - https://github.com/dracutdevs/dracut/issues/2431#issuecomment-1754305440

CC @zdykstra

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (9 preceding siblings ...)
  2023-10-28 11:33 ` [PR PATCH] [Closed]: " ahesford
@ 2023-10-28 12:08 ` LaszloGombos
  2023-10-28 12:09 ` LaszloGombos
                   ` (6 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: LaszloGombos @ 2023-10-28 12:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783792001

Comment:
Thanks @ahesford . 

I noticed that some packages are updated from repository snapshots - e.g. https://github.com/void-linux/void-packages/commit/728d0d7e00c8689550f6058a84c5969997d16e92 .

 > We don't permit updating to unreleased repository snapshots like this.
 Is this policy only for the Dracut package ? 

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (10 preceding siblings ...)
  2023-10-28 12:08 ` LaszloGombos
@ 2023-10-28 12:09 ` LaszloGombos
  2023-10-28 13:43 ` ahesford
                   ` (5 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: LaszloGombos @ 2023-10-28 12:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 464 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783792001

Comment:
Thanks @ahesford . 

I noticed that some packages are updated from repository snapshots - e.g. https://github.com/void-linux/void-packages/commit/728d0d7e00c8689550f6058a84c5969997d16e92 .

 > We don't permit updating to unreleased repository snapshots like this.

 Is this policy only for the Dracut package ? 

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (11 preceding siblings ...)
  2023-10-28 12:09 ` LaszloGombos
@ 2023-10-28 13:43 ` ahesford
  2023-10-28 13:44 ` ahesford
                   ` (4 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2023-10-28 13:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783815511

Comment:
No, the policy applies to all packages and is described at the end of the [requirements section of our contributor guidelines](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements). There are rare exceptions, of course. In particular, the Intel video driver is legacy software that is not generally recommended for X11 (the mode setting driver is the recommended approach for Intel hardware). We tolerate a deviation from policy in this case because the legacy may be required for functionality with certain older hardware and backporting critical patches only would become an excessive maintenance burden.

In the case of Dracut, it seems we're looking at only a few key patches to maintain functionality. This case is complicated by the fact that some people, including you, maintain write privileges with Dracut but lack the authority to tag releases that we would accept as package updates. If this problem continues indefinitely, we can investigate other alternatives for keeping Dracut up to date. In the meantime, I hope that you and your collaborators can find a way to restore full, active maintenance of the project repository.

We appreciate the work you do to advance the state of Dracut and the fact that you remain mindful of the needs of distributions that do not use systemd (and, more generally, do not use it in initramfs images).

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (12 preceding siblings ...)
  2023-10-28 13:43 ` ahesford
@ 2023-10-28 13:44 ` ahesford
  2023-10-28 13:44 ` ahesford
                   ` (3 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2023-10-28 13:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783815511

Comment:
No, the policy applies to all packages and is described at the end of the [requirements section of our contributor guidelines](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements). There are rare exceptions, of course. In particular, the Intel video driver is legacy software that is not generally recommended for X11 (the mode-setting driver is the recommended approach for Intel hardware). We tolerate a deviation from policy in this case because the legacy may be required for functionality with certain older hardware and backporting critical patches only would become an excessive maintenance burden.

In the case of Dracut, it seems we're looking at only a few key patches to maintain functionality. This case is complicated by the fact that some people, including you, maintain write privileges with Dracut but lack the authority to tag releases that we would accept as package updates. If this problem continues indefinitely, we can investigate other alternatives for keeping Dracut up to date. In the meantime, I hope that you and your collaborators can find a way to restore full, active maintenance of the project repository.

We appreciate the work you do to advance the state of Dracut and the fact that you remain mindful of the needs of distributions that do not use systemd (and, more generally, do not use it in initramfs images).

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (13 preceding siblings ...)
  2023-10-28 13:44 ` ahesford
@ 2023-10-28 13:44 ` ahesford
  2023-10-28 13:51 ` zdykstra
                   ` (2 subsequent siblings)
  17 siblings, 0 replies; 19+ messages in thread
From: ahesford @ 2023-10-28 13:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1542 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783815511

Comment:
No, the policy applies to all packages and is described at the end of the [requirements section of our contributor guidelines](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements). There are rare exceptions, of course. In particular, the Intel video driver is legacy software that is not generally recommended for X11 (the mode-setting driver is the recommended approach for Intel hardware). We tolerate a deviation from policy in this case because the legacy driver may be required for functionality with certain older hardware and backporting critical patches only would become an excessive maintenance burden. In the case of Dracut, it seems we're looking at only a few key patches to maintain functionality.

This case is complicated by the fact that some people, including you, maintain write privileges with Dracut but lack the authority to tag releases that we would accept as package updates. If this problem continues indefinitely, we can investigate other alternatives for keeping Dracut up to date. In the meantime, I hope that you and your collaborators can find a way to restore full, active maintenance of the project repository.

We appreciate the work you do to advance the state of Dracut and the fact that you remain mindful of the needs of distributions that do not use systemd (and, more generally, do not use it in initramfs images).

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (14 preceding siblings ...)
  2023-10-28 13:44 ` ahesford
@ 2023-10-28 13:51 ` zdykstra
  2023-10-28 14:38 ` LaszloGombos
  2023-10-28 14:51 ` zdykstra
  17 siblings, 0 replies; 19+ messages in thread
From: zdykstra @ 2023-10-28 13:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 457 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783817843

Comment:
The stub that Void ships, Gummiboot, still works with the old UKI process. When/if we get systemd-boot in the repositories, we can look to backport the UKI offset fixes.

I'm not seeing anything in the linked issue that indicates why releases are stalled. Is there an issue I can follow that tracks that problem?

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (15 preceding siblings ...)
  2023-10-28 13:51 ` zdykstra
@ 2023-10-28 14:38 ` LaszloGombos
  2023-10-28 14:51 ` zdykstra
  17 siblings, 0 replies; 19+ messages in thread
From: LaszloGombos @ 2023-10-28 14:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]

New comment by LaszloGombos on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783832638

Comment:
> I'm not seeing anything in the linked issue that indicates why releases are stalled. Is there an issue I can follow that tracks that problem?

This is indeed the key issue here. I think @ahesford 's comment is already a great summary of the situation, but just to add...

> Currently only Github project admins can tag git commits in this project. The current project admins are documented in the wiki - https://github.com/dracutdevs/dracut/wiki/Dracut-development

At closer look you would notice that none of the project admins are active, and the remaining active maintainers are not able to make a tagged release. Here is one more pointer of a failed release attempt from July: https://github.com/dracutdevs/dracut/issues/2444

> If this problem continues indefinitely, we can investigate other alternatives for keeping Dracut up to date.

I just wanted to get a sense of how much this community is willing to wait for a release for something as critical to the boot process of the system. I think it is reasonable to revisit this issue in e.g. in 2024.

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: dracut: update to 059.20231027
  2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
                   ` (16 preceding siblings ...)
  2023-10-28 14:38 ` LaszloGombos
@ 2023-10-28 14:51 ` zdykstra
  17 siblings, 0 replies; 19+ messages in thread
From: zdykstra @ 2023-10-28 14:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1683 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/46936#issuecomment-1783836760

Comment:
> > I'm not seeing anything in the linked issue that indicates why releases are stalled. Is there an issue I can follow that tracks that problem?
> 
> This is indeed the key issue here. I think @ahesford 's comment is already a great summary of the situation, but just to add...
> 
> > Currently only Github project admins can tag git commits in this project. The current project admins are documented in the wiki - https://github.com/dracutdevs/dracut/wiki/Dracut-development
> 
> At closer look you would notice that none of the project admins are active, and the remaining active maintainers are not able to make a tagged release. Here is one more pointer of a failed release attempt from July: [dracutdevs/dracut#2444](https://github.com/dracutdevs/dracut/issues/2444)
> 
> > If this problem continues indefinitely, we can investigate other alternatives for keeping Dracut up to date.
> 
> I just wanted to get a sense of how much this community is willing to wait for a release for something as critical to the boot process of the system. I think it is reasonable to revisit this issue in e.g. in 2024.

Right now, I think Void is pretty comfortable with the version of Dracut that we ship. Our tooling is more-or-less stable, so we aren't having to chase any systemd behavioral changes. We use an older EFI stub for UKI's, so the recent systemd-boot stub change didn't impact us.

For my needs (Dracut user, ZFSBootMenu developer), Dracut as it stands is a stable tool that has quirks that are known and can be targeted.

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2023-10-28 14:51 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-28  3:36 [PR PATCH] dracut: update to 059+git20231027 LaszloGombos
2023-10-28  3:38 ` classabbyamp
2023-10-28  3:38 ` classabbyamp
2023-10-28  3:45 ` [PR PATCH] [Updated] " LaszloGombos
2023-10-28  3:45 ` LaszloGombos
2023-10-28  3:49 ` [PR PATCH] [Updated] dracut: update to 059.20231027 LaszloGombos
2023-10-28  3:55 ` LaszloGombos
2023-10-28  3:58 ` LaszloGombos
2023-10-28  3:59 ` [PR PATCH] [Updated] " LaszloGombos
2023-10-28 11:33 ` ahesford
2023-10-28 11:33 ` [PR PATCH] [Closed]: " ahesford
2023-10-28 12:08 ` LaszloGombos
2023-10-28 12:09 ` LaszloGombos
2023-10-28 13:43 ` ahesford
2023-10-28 13:44 ` ahesford
2023-10-28 13:44 ` ahesford
2023-10-28 13:51 ` zdykstra
2023-10-28 14:38 ` LaszloGombos
2023-10-28 14:51 ` zdykstra

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).