gentoo auto-resync : 10:11:2024 - 03:03:09

4 files changed, 64 insertions, 1 deletions

diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index d01fe5d2700c..e788036ab071 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -6,6 +6,8 @@ AUX dracut-103-acct-user-group-gentoo.patch 915 BLAKE2B 75747b3775d04dd777d2a0f6
 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-105-ensure-abs-args-for-objcopy.patch 1816 BLAKE2B 181de3cc28bae34028f1b5f78d312e957470e1dd517aaab492bb05f75fa378101791c132ba8035ec272464e4b1f311e4bf8b28b112208ef0339416552ae96fbf SHA512 cde84cd5c882f25808f2026d118afcb364339c98c1e93ff887eaeac74cd138a06b53164e32858f8801fb5e873cc4eabedb8d6605d008d0f2479fe46ee540c225
+AUX dracut-105-fix-check_kernel_module.patch 1211 BLAKE2B 5ec7b962e334a8932166520014471f79f08337dab8a11664d14f1424bdc9db1c25a8093af02501524fadc171cbc096ca0f0ac8bfbdad6feac7f4966ab6d61506 SHA512 b3421d333f206b68f5a2dfedbea1381906b49c376df35090fb842017563bc2960ab540fa98e2ebcdf5bdea72b412d1abc4ed4f6fa97edc664ef6acbff7b45e15
+AUX dracut-105-systemd-cryptsetup.patch 1048 BLAKE2B 3256a3c0e211894c7253b993f2fca4f687a313c617d569ae46cec0b5c9d55a134d413b98a373e07b52bd0bc0eacff2616504809fbbbfc23c2e93750fbf38ac30 SHA512 e4a2aa3188974c34c0a9de1801d23ec989090265ac5dc1b9aeafe3fe953f28877a45de7a9b246defe8e0a2f0bced790e636fd14be35044c1bbe691c11eebe962
 AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f
 DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e
 DIST dracut-103.tar.gz 567713 BLAKE2B 7781c0b7fc83a2c0c461f6398687e053226b489fb5405b3132b30d8e7a4f3cea2bb73aa0fe6e4c4b27187d6270ba623f403916ec38025a912930ae347a7e25ce SHA512 ba0dbefbcbecb09c44ce240664bc4f4ee25dfb8be7bc060028ae3b1ccf7d70410491c105e64fcef3d6f44d2794cb6162bcea9404125906be46bf3dff098e0277
@@ -13,6 +15,6 @@ DIST dracut-105.tar.gz 575857 BLAKE2B 93463e3d1649e6e68accbb4f2480af471e851a5418
 EBUILD dracut-060_pre20240104-r4.ebuild 4582 BLAKE2B 2e90c9669b95ccbdc38a3bedd131010d2f2fbf04a01a328e3579f0f5b34ef33d1fa4849c088440930c11b1b67c69ba543156a74d4499c0ab47741ef2b7666f49 SHA512 aaa83faf86aa3ac1be70cace1ffbe906508c935b8cc9928e59c1ea841d4846f5f6d78167cdd0b3c804aa0ca2b788606ff226bebec94c3e8747910d3b4949d307
 EBUILD dracut-103-r2.ebuild 4693 BLAKE2B 739ea0296e64867ea756d0062e20b6a475e8a70e76b0f306930d35ab42857c83936e90463e01cde10bf255c439442b3309b12dba826f0fe6ce9b9faa909c386e SHA512 5d75977e66c881f067ce86ef52adc3acfe563f17d7bd1ef3887b6c23b9dcbd727b550f1dc4f1cd5352dcd7663d0b863625a4163e1cf2fd5727b42daeb450655e
 EBUILD dracut-103-r4.ebuild 6183 BLAKE2B d95d7f9b5f2f3c6abba94f647cc18c7bc2c752e16a348d78115008fac8251b3e4abca295e965045d15cbadaeb855f5a9bbf7d8ac8502ea151ab2df96b31049f5 SHA512 abaf01ca4ca3f5cae79a4c36ada95dc085ab9806ac03231561a77629e83b003b3540153ef93e39f0b57da605737193519e6a03abf238774a8913545997d7fa96
-EBUILD dracut-105-r1.ebuild 6586 BLAKE2B a9ad67355b32f698f563aa6bbae1880bd2b2c64de22da9a4d07d06488f77cddeee7a51bd389b351e4fc2ab4e5c19d615e2cbf1ccd827ae96ca9b1071e7e44df5 SHA512 37f33702aabf84a18f9596e42ca222a0f385007c9f182913a369a1b020b6c7d3a00e270baf127c5bca4477d52e4117652394e3eb94c3ac1ea0fb42cbaf3aae52
+EBUILD dracut-105-r3.ebuild 6794 BLAKE2B 44d022baa8c4a06a0ce64ba2e1c79ee207574cd5af8183109276418b286e677e6c5ae0fd64e965985385314e5719abe80490d24a61b86d66ad497abd20627103 SHA512 eba341246301114ad86f73054e6cea7761c1311ea85f05a7203f3dfb703c0e38b4dd74c42e576d067f102ed39012f6165b02203e183c1b10418e48463443cccd
 EBUILD dracut-9999.ebuild 5989 BLAKE2B f43ffa2760d3bb523bf36002255d5f49f280c177140a16becbd61b73c4181e1fb15f56f843e34369978d3345297a0625169be935fe0759f86bc9ab6074675a0e SHA512 9edec1f4c46a95f0d4b1947b99c587ea5d4ab64bba4cad9a25c82b1f8ae8ca218adb0e17d3c7f663c7d6ef9f6d39b5958b0b66db33fd697d90ac87bf7b8f3db7
 MISC metadata.xml 572 BLAKE2B a1f308c046673cc7acfc4c74cb78b8fd24527241eec46193004ac64fdd17f325eab761b19fdd5428071f4db6e7c1cc27ccaedd89a2724adc6226dd7e96f3714f SHA512 651ea5de77053dbb2b172e3f2a8d8e2d57957bfb726ef78801091f9f1c7c03fde9fe086cd28e94e2e6102b9a2e99f32cb84a6150b4f6b2b6a9cadae3856bad29
diff --git a/sys-kernel/dracut/dracut-105-r1.ebuild b/sys-kernel/dracut/dracut-105-r3.ebuild
index 70692cd367a4..fc035356162f 100644
--- a/sys-kernel/dracut/dracut-105-r1.ebuild
+++ b/sys-kernel/dracut/dracut-105-r3.ebuild
@@ -101,6 +101,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch
 	# https://github.com/dracut-ng/dracut-ng/pull/834
 	"${FILESDIR}"/${PN}-105-ensure-abs-args-for-objcopy.patch
+	# https://github.com/dracut-ng/dracut-ng/pull/904
+	"${FILESDIR}"/${PN}-105-fix-check_kernel_module.patch
+	# https://github.com/dracut-ng/dracut-ng/pull/921
+	"${FILESDIR}"/dracut-105-systemd-cryptsetup.patch
 )
 
 src_configure() {
diff --git a/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch b/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch
new file mode 100644
index 000000000000..e1fc7924c303
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch
@@ -0,0 +1,28 @@
+From b90eda4b431af23d1101f1ea68b656929c6a82b2 Mon Sep 17 00:00:00 2001
+From: Nowa Ammerlaan <andrewammerlaan@gentoo.org>
+Date: Fri, 8 Nov 2024 20:01:54 +0100
+Subject: [PATCH] fix(dracut-functions.sh): check for modules in --kmoddir, not
+ in --sysroot
+
+Modules are installed from the directory specified by --kmoddir, but currently
+the check_kernel_module() function is checking for the module in
+--sysroot/lib/modules. This is notably not the same when kernels packages are
+being built inside some docker container. We should check for the modules
+existence in the directory we are actually going to install it from.
+---
+ dracut-functions.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 865c31290..245c69cb6 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -761,7 +761,7 @@ check_kernel_config() {
+ # 0 if the kernel module is either built-in or available
+ # 1 if the kernel module is not enabled
+ check_kernel_module() {
+-    modprobe -d "$dracutsysrootdir" -S "$kernel" --dry-run "$1" &> /dev/null || return 1
++    modprobe -d "$drivers_dir/../../" -S "$kernel" --dry-run "$1" &> /dev/null || return 1
+ }
+ 
+ # get_cpu_vendor
diff --git a/sys-kernel/dracut/files/dracut-105-systemd-cryptsetup.patch b/sys-kernel/dracut/files/dracut-105-systemd-cryptsetup.patch
new file mode 100644
index 000000000000..154bd21ca13c
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-105-systemd-cryptsetup.patch
@@ -0,0 +1,29 @@
+https://github.com/dracut-ng/dracut-ng/pull/921
+https://bugs.gentoo.org/943035
+
+From 2d4b550c71cc79ac7a3f18afc09d8263963d5de2 Mon Sep 17 00:00:00 2001
+From: Jo Zzsi <jozzsicsataban@gmail.com>
+Date: Sat, 9 Nov 2024 14:06:57 -0500
+Subject: [PATCH] fix(dracut-systemd): check systemd-cryptsetup before
+ including
+
+---
+ modules.d/98dracut-systemd/module-setup.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/98dracut-systemd/module-setup.sh b/modules.d/98dracut-systemd/module-setup.sh
+index 0438e40f0..f2502cd78 100755
+--- a/modules.d/98dracut-systemd/module-setup.sh
++++ b/modules.d/98dracut-systemd/module-setup.sh
+@@ -19,7 +19,10 @@ depends() {
+     # systemd-cryptsetup is mandatory dependency
+     # see https://github.com/dracut-ng/dracut-ng/issues/563
+     if dracut_module_included "crypt"; then
+-        deps+=" systemd-cryptsetup"
++        module_check systemd-cryptsetup > /dev/null 2>&1
++        if [[ $? == 255 ]]; then
++            deps+=" systemd-cryptsetup"
++        fi
+     fi
+ 
+     echo "$deps"