quark/quarks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys-kernel/dracut: version bump

Browse Source
This commit is contained in:
Stefan Reimer 2025-04-06 19:13:48 +00:00
parent 57969a596a
commit dda645513a
8 changed files with 148 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys-kernel/dracut/Manifest
View File

@ -1,8 +1,8 @@
AUX crypt-ssh-luks.patch 4281 BLAKE2B 0588c4791c279a89be00da1fcdf4dcb38a88cac199fd0f34c0849e50262f86d7c6f194755a439fbf17abbd8b5ffd30833de27daf0d1e32001199b64e92ae73c1 SHA512 3c1274ae5449e31bade2d466080d66a5324d1d3e6539e67adf2fb47cda69cea9dc8962765dd8c539f6f23b27a36a331de771ccc401b0818692b3fd932ead764b
AUX dracut-103-acct-user-group-gentoo.patch 915 BLAKE2B 75747b3775d04dd777d2a0f61116bbb83784b1a58656655ee6b441e79d1dc8e35a940dfbb0d4018ff27ba80c0581949d98326ebbc6804348004546a2ee1285ed SHA512 e6b4115a6121289a4ec814ddf4e4394f64096b298c3ab6393e197b19235ff494258478d8d74b9dfc570b122cc2122375b24c088a037b0ebf2ac5d9f6a54dcb67
AUX dracut-103-always-install-libsystemd.patch 853 BLAKE2B d101e87231f09c376181a3b97d371dce218168d36d234f00e9aef526e03d7b1cfaea7bb7a275d3428649c4934b69c78ef645af027d7be90eb48af0dd4c64104a SHA512 413e9d95c613d0f6e21c89922b157af2e126ca581fbee070cd219e33915d38c288bc84a774103ce713a2e78d1453fcaecb07975d8b2df200bf0ce4cb33f2ee4e
AUX dracut-103-systemd-udev-256-kmod.patch 1616 BLAKE2B f1c15c4cd57d947f92f286c1fd9a4b045837017e965aa9b2707a15dea4426b0c349ad65e53f0b6a6e4dc7ddc999773a1af161cac2eac724d047a8d3109a8aeaa SHA512 359dfc2ee79d7647676c2b343f1b4bc23f11bc296c6b6c9be1525f87965be1ee8d4105f25dc6dc39dcdbca7a0d229a704a11416e7757739159493c6dc930f182
AUX dracut-106-acct-user-group-gentoo.patch 473 BLAKE2B 4e9ec6b60c6eaa5083ab63ba166d2245905bbaf7a73338ed4dbd33dc2e254f37c89d000e97116569a6c94adbd1b85a7189897829f6fb429ae03726f3ed4df96c SHA512 06c0a20c27be6875aef8cecb34eb32fb69780aaa0662bc7760e53355c7aa9f55026e8435513eb4ec62f5fcdbf70fec72150488259eb200a1b2c82f9e41b1e9ed
AUX dracut-106-fix-mdraid-module.patch 655 BLAKE2B 9dea5cce60c551ff4ec9b51c5ed6c5a95fa01849b12a3d39bd1bea3099b4f3b008f942ea29c44ad5f87c58aa0eb57bb9a32e12997d64c65e80193fd2de685113 SHA512 0c50d373462d90655d635e297948e3d012c1c85a639dd3fb90b6315aa9b4b89a19d0dd7dabbbf5641e11a4722e89007907ac68ecc353724b467ef56743be8477
AUX dracut-106-fix-rngd-module.patch 508 BLAKE2B 2ee18062f4af60297bcd04b833877f9ba58c4ec55a674efb7a209a6fdeeff8430053c74851746cfa73b6549a8c6624144e190a1e1c886fb6203913ea34ba1dbc SHA512 488c29239ff74c3df309bd90b0990eab42e8c0d79fdae5281ffecf37bb93a3675abe44d4ec3222df6b441f68ed82b6c9eb63f94083fad47873df3e0bcfe667cb
AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f
DIST dracut-103.tar.gz 567713 BLAKE2B 7781c0b7fc83a2c0c461f6398687e053226b489fb5405b3132b30d8e7a4f3cea2bb73aa0fe6e4c4b27187d6270ba623f403916ec38025a912930ae347a7e25ce SHA512 ba0dbefbcbecb09c44ce240664bc4f4ee25dfb8be7bc060028ae3b1ccf7d70410491c105e64fcef3d6f44d2794cb6162bcea9404125906be46bf3dff098e0277
EBUILD dracut-103-r4.ebuild 4942 BLAKE2B 8a4a27c437e25a135f0567388b2d35392be53d70c7d9bec92ad1ffd785b941fe934aa83beff593a37e71ee4b9e994ade7ba68f7baa554dfb6ab2e340b30313ae SHA512 76c8c66ff3f69828e20f98cafd5da5dd21617bd5db523a72ff2fc11c1a23f61f15dd872eb67cf5330ec90c912287a7f05e7a6c4428c56f9bee7e9e6fef4e57c2
DIST dracut-106.tar.gz 527743 BLAKE2B 837621da329500b88b0c81a724990702a9f4e816a4818c26622b2bc5e3885c908f0bbba682a262f967d9a08a912cfd63a33270143560a30e3d067dc4217c5262 SHA512 ab17f9440129e2db7c2902115459309132ce7f7b29bbb3172002b7a8ea8ab54799d62d89fbf3f84581a5c14196f6754d33669b583b9d758ab4686a3443a3c4ad
EBUILD dracut-106-r2.ebuild 7057 BLAKE2B 297e082334f4286813b1e76910ffe6de05aa926b31efc45f19acbbb0fb75b9d20d0f57b6f8dae44392348ad4dc184e9e37315bebd70b4bb46a1f6ca610c1e791 SHA512 99747e7905431adc0312315c3608174b315b85c068c78dcff3b887319dbcdf5ace8292319415cf07852d694806bd99b382f86f81cba8b8c67562d741c90c2132
MISC metadata.xml 479 BLAKE2B 76b6d6da8d9ee65fac81f1a30999f3a095a9cbd8c91fbee63edaad61c0a429d5ba43f18979e10cd73ba6a87d89213397a9ee6621f61168c1bd461bb866c4f02b SHA512 e4b9f639c157b0104058c0e124be1d3d1f01e836e7182f0c8ec6852133ed36a52b5cfe0ec83142f185ad3f9b20192c719b83e2ee405b874420bb4e09ec01a38b

124
sys-kernel/dracut/dracut-103-r4.ebuild → sys-kernel/dracut/dracut-106-r2.ebuild
View File

@ -1,16 +1,17 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
CARGO_OPTIONAL=1
inherit flag-o-matic bash-completion-r1 edo optfeature systemd toolchain-funcs
inherit cargo flag-o-matic bash-completion-r1 edo optfeature systemd toolchain-funcs
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng"
else
if [[ "${PV}" != *_rc* ]]; then
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
fi
SRC_URI="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-ng-${PV}"
@ -21,8 +22,9 @@ HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"
LICENSE="GPL-2"
SLOT="0"
IUSE="selinux test"
RESTRICT="!test? ( test )"
IUSE="+dracut-cpio selinux test"
RESTRICT="test"
PROPERTIES="test? ( test_privileged test_network )"
RDEPEND="
app-alternatives/cpio
@ -58,6 +60,39 @@ BDEPEND="
>=app-text/docbook-xsl-stylesheets-1.75.2
>=dev-libs/libxslt-1.1.26
virtual/pkgconfig
dracut-cpio? ( ${RUST_DEPEND} )
test? (
net-nds/rpcbind
net-fs/nfs-utils
sys-block/open-iscsi
sys-fs/btrfs-progs
sys-fs/dmraid
sys-fs/lvm2[lvm,thin]
sys-fs/mdadm
sys-fs/multipath-tools
alpha? ( app-emulation/qemu[qemu_softmmu_targets_alpha] )
amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
arm? ( app-emulation/qemu[qemu_softmmu_targets_arm] )
arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
hppa? ( app-emulation/qemu[qemu_softmmu_targets_hppa] )
loong? ( app-emulation/qemu[qemu_softmmu_targets_loongarch64] )
mips? ( || (
app-emulation/qemu[qemu_softmmu_targets_mips]
app-emulation/qemu[qemu_softmmu_targets_mips64]
app-emulation/qemu[qemu_softmmu_targets_mips64el]
) )
ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] )
ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] )
riscv? ( || (
app-emulation/qemu[qemu_softmmu_targets_riscv32]
app-emulation/qemu[qemu_softmmu_targets_riscv64]
) )
sparc? ( || (
app-emulation/qemu[qemu_softmmu_targets_sparc]
app-emulation/qemu[qemu_softmmu_targets_sparc64]
) )
x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] )
)
"
QA_MULTILIB_PATHS="usr/lib/dracut/.*"
@ -65,20 +100,26 @@ 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
# https://github.com/dracut-ng/dracut-ng/pull/507
"${FILESDIR}"/${PN}-103-systemd-udev-256-kmod.patch
# libsystemd-core is sometimes missing
"${FILESDIR}"/${PN}-103-always-install-libsystemd.patch
"${FILESDIR}"/crypt-ssh-luks.patch
"${FILESDIR}"/${PN}-106-acct-user-group-gentoo.patch
# https://github.com/dracut-ng/dracut-ng/pull/1207
"${FILESDIR}"/${PN}-106-fix-rngd-module.patch
# https://github.com/dracut-ng/dracut-ng/pull/1250
"${FILESDIR}"/${PN}-106-fix-mdraid-module.patch
#
"${FILESDIR}"/crypt-ssh-luks.patch
)
pkg_setup() {
use dracut-cpio && rust_pkg_setup
}
src_configure() {
local myconf=(
--prefix="${EPREFIX}/usr"
--sysconfdir="${EPREFIX}/etc"
--bashcompletiondir="$(get_bashcompdir)"
--systemdsystemunitdir="$(systemd_get_systemunitdir)"
--disable-dracut-cpio
)
# this emulates what the build system would be doing without us
@ -87,17 +128,37 @@ src_configure() {
tc-export CC PKG_CONFIG
edo ./configure "${myconf[@]}"
if use dracut-cpio; then
cargo_gen_config
cargo_src_configure
fi
}
src_compile() {
default
if use dracut-cpio; then
pushd src/dracut-cpio >/dev/null || die
cargo_src_compile
popd >/dev/null || die
fi
}
src_test() {
if [[ ${EUID} != 0 ]]; then
# Tests need root privileges, bug #298014
ewarn "Skipping tests: Not running as root."
elif [[ ! -w /dev/kvm ]]; then
ewarn "Skipping tests: Unable to access /dev/kvm."
addwrite /dev/kvm
# Translate ARCH so run-qemu can find the correct qemu-system-ARCH
local qemu_arch
if use amd64; then
qemu_arch=x86_64
elif use arm64; then
qemu_arch=aarch64
elif use loong; then
qemu_arch=loongarch64
elif use x86; then
qemu_arch=i386
else
emake -C test check
qemu_arch=$(tc-arch)
fi
ARCH=${qemu_arch} emake -C test check
}
src_install() {
@ -105,17 +166,30 @@ src_install() {
AUTHORS
NEWS.md
README.md
docs/HACKING.md
docs/README.cross
docs/README.kernel
docs/RELEASE.md
docs/SECURITY.md
)
default
if use dracut-cpio; then
exeinto /usr/lib/dracut
doexe "src/dracut-cpio/$(cargo_target_dir)/dracut-cpio"
fi
}
docinto html
dodoc dracut.html
pkg_preinst() {
# Remove directory/symlink conflicts
# https://bugs.gentoo.org/943007
local save_nullglob=$(shopt -p nullglob)
shopt -s nullglob
local module
for module in "${EROOT}"/usr/lib/dracut/modules.d/{80test,80test-makeroot,80test-root}; do
if [[ ! -L ${module} && -d ${module} ]]; then
rm -rv "${module}" || die
fi
local backups=( "${module}".backup.* )
if [[ ${#backups[@]} -gt 0 ]]; then
rm -v "${backups[@]}" || die
fi
done
eval "${save_nullglob}"
}
pkg_postinst() {

30
sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch
View File

@ -1,30 +0,0 @@
diff --git a/dracut-init.sh b/dracut-init.sh
index 986da96b..bd47bc92 100755
--- a/dracut-init.sh
+++ b/dracut-init.sh
@@ -711,10 +711,10 @@ inst_libdir_file() {
# install sysusers files
inst_sysusers() {
- inst_multiple -o "$sysusers/$*"
+ inst_multiple -o "$sysusers/acct-*-$*"
if [[ $hostonly ]]; then
- inst_multiple -H -o "$sysusersconfdir/$*"
+ inst_multiple -H -o "$sysusersconfdir/acct-*-$*"
fi
}
diff --git a/modules.d/91tpm2-tss/module-setup.sh b/modules.d/91tpm2-tss/module-setup.sh
index 4441f552..4b5654d5 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 \

21
sys-kernel/dracut/files/dracut-103-always-install-libsystemd.patch
View File

@ -1,21 +0,0 @@
From 921792f201e954de461d3b551e01b5369d666db8 Mon Sep 17 00:00:00 2001
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Tue, 10 Sep 2024 15:51:46 +0200
Subject: [PATCH] feat(systemd): always install libsystemd libraries
---
modules.d/00systemd/module-setup.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
index 498cd7edd..fb8a8200b 100755
--- a/modules.d/00systemd/module-setup.sh
+++ b/modules.d/00systemd/module-setup.sh
@@ -156,5 +156,6 @@ EOF
_arch=${DRACUT_ARCH:-$(uname -m)}
inst_libdir_file \
{"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
- {"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
+ {"tls/$_arch/",tls/,"$_arch/",}"libnss_*" \
+ {"tls/$_arch/",tls/,"$_arch/",}"systemd/libsystemd*.so"
}

41
sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch
View File

@ -1,41 +0,0 @@
From e16195f28669264227c169d45107ea95b83d8f48 Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <alexander@tsoy.me>
Date: Tue, 16 Jul 2024 08:48:54 +0300
Subject: [PATCH] fix(systemd): move installation of libkmod to udev-rules
module
libkmod library should be installed even if systemd module is
omitted, so move its installation to udev-rules module.
---
modules.d/00systemd/module-setup.sh | 1 -
modules.d/95udev-rules/module-setup.sh | 6 +++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
index ce7bb520c..e4fb9a586 100755
--- a/modules.d/00systemd/module-setup.sh
+++ b/modules.d/00systemd/module-setup.sh
@@ -171,6 +171,5 @@ EOF
_arch=${DRACUT_ARCH:-$(uname -m)}
inst_libdir_file \
{"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
- {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
{"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
}
diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index d82ed5eb9..6078751f6 100755
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -93,7 +93,11 @@ install() {
"${udevdir}"/usb_id \
"${udevdir}"/v4l_id
- inst_libdir_file "libnss_files*"
+ # Install required libraries.
+ _arch=${DRACUT_ARCH:-$(uname -m)}
+ inst_libdir_file \
+ {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
+ {"tls/$_arch/",tls/,"$_arch/",}"libnss_files*"
# Install the hosts local user configurations if enabled.
if [[ $hostonly ]]; then

13
sys-kernel/dracut/files/dracut-106-acct-user-group-gentoo.patch Normal file
View File

@ -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 \

17
sys-kernel/dracut/files/dracut-106-fix-mdraid-module.patch Normal file
View File

@ -0,0 +1,17 @@
https://github.com/dracut-ng/dracut-ng/pull/1250
diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
index 8ce5f2ee..b0ab8411 100755
--- a/modules.d/90mdraid/module-setup.sh
+++ b/modules.d/90mdraid/module-setup.sh
@@ -46,7 +46,7 @@ cmdline() {
[[ ${host_fs_types[$dev]} != *_raid_member ]] && continue
UUID=$(
- /sbin/mdadm --examine --export "$dev" \
+ mdadm --examine --export "$dev" \
| while read -r line || [[ "$line" ]]; do
[[ ${line#MD_UUID=} == "$line" ]] && continue
printf "%s" "${line#MD_UUID=} "
--
2.48.1

14
sys-kernel/dracut/files/dracut-106-fix-rngd-module.patch Normal file
View File

@ -0,0 +1,14 @@
https://github.com/dracut-ng/dracut-ng/pull/1207
diff --git a/modules.d/06rngd/module-setup.sh b/modules.d/06rngd/module-setup.sh
index 1fcc831c4..064379242 100755
--- a/modules.d/06rngd/module-setup.sh
+++ b/modules.d/06rngd/module-setup.sh
@@ -21,7 +21,7 @@
check() {
# if there's no rngd binary, no go.
require_binaries rngd || return 1
- require_binaries "${systemdsystemunitdir}/rngd.service" || return 1
+ [[ -e "${systemdsystemunitdir}/rngd.service" ]] || return 1
return 0
}