commit: e61f3ce15b3dc04d48abb894b2cdc7df8b293702
Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 3 15:38:48 2025 +0000
Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Mon Feb 3 17:40:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61f3ce1
sys-kernel/dracut: add 106
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>
sys-kernel/dracut/Manifest | 1 +
sys-kernel/dracut/{dracut-9999.ebuild => dracut-106.ebuild} | 4 ++--
sys-kernel/dracut/dracut-9999.ebuild | 4 ++--
.../dracut/files/dracut-106-acct-user-group-gentoo.patch | 13 +++++++++++++
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 5db010d68363..5f3e6e8f2956 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,3 +1,4 @@
DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B
935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3
SHA512
f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e
DIST dracut-103.tar.gz 567713 BLAKE2B
7781c0b7fc83a2c0c461f6398687e053226b489fb5405b3132b30d8e7a4f3cea2bb73aa0fe6e4c4b27187d6270ba623f403916ec38025a912930ae347a7e25ce
SHA512
ba0dbefbcbecb09c44ce240664bc4f4ee25dfb8be7bc060028ae3b1ccf7d70410491c105e64fcef3d6f44d2794cb6162bcea9404125906be46bf3dff098e0277
DIST dracut-105.tar.gz 575857 BLAKE2B
93463e3d1649e6e68accbb4f2480af471e851a54185771cec01e8b7112f5c4158901747bdc1180e08e270d3b3b21afb4d510dae09ca6ef00e309300bede188d1
SHA512
1608fb31d6a53905ea25a279586573db5fc7e084b4f6ff06e52065cbcb4ff503c2d51c0a282345844228232b1b590382b482a224183e0c4ee16c9c9e6932b275
+DIST dracut-106.tar.gz 527743 BLAKE2B
837621da329500b88b0c81a724990702a9f4e816a4818c26622b2bc5e3885c908f0bbba682a262f967d9a08a912cfd63a33270143560a30e3d067dc4217c5262
SHA512
ab17f9440129e2db7c2902115459309132ce7f7b29bbb3172002b7a8ea8ab54799d62d89fbf3f84581a5c14196f6754d33669b583b9d758ab4686a3443a3c4ad
diff --git a/sys-kernel/dracut/dracut-9999.ebuild
b/sys-kernel/dracut/dracut-106.ebuild
similarity index 98%
copy from sys-kernel/dracut/dracut-9999.ebuild
copy to sys-kernel/dracut/dracut-106.ebuild
index 40da9319cb51..d4781eb67c6b 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-106.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -100,7 +100,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
# Gentoo specific acct-user and acct-group conf adjustments
- "${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch
+ "${FILESDIR}"/${PN}-106-acct-user-group-gentoo.patch
)
pkg_setup() {
diff --git a/sys-kernel/dracut/dracut-9999.ebuild
b/sys-kernel/dracut/dracut-9999.ebuild
index 40da9319cb51..d4781eb67c6b 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -100,7 +100,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
# Gentoo specific acct-user and acct-group conf adjustments
- "${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch
+ "${FILESDIR}"/${PN}-106-acct-user-group-gentoo.patch
)
pkg_setup() {
diff --git a/sys-kernel/dracut/files/dracut-106-acct-user-group-gentoo.patch
b/sys-kernel/dracut/files/dracut-106-acct-user-group-gentoo.patch
new file mode 100644
index 000000000000..25792a5445c0
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-106-acct-user-group-gentoo.patch
@@ -0,0 +1,13 @@
+diff --git a/modules.d/91tpm2-tss/module-setup.sh
b/modules.d/91tpm2-tss/module-setup.sh
+index 4441f5528..4b5654d56 100755
+--- a/modules.d/91tpm2-tss/module-setup.sh
++++ b/modules.d/91tpm2-tss/module-setup.sh
+@@ -30,7 +30,7 @@ installkernel() {
+
+ # Install the required file(s) and directories for the module in the
initramfs.
+ install() {
+- inst_sysusers tpm2-tss.conf
++ inst_sysusers tss.conf
+
+ inst_multiple -o \
+ "$tmpfilesdir"/tpm2-tss-fapi.conf \
