gentoo auto-resync : 02:02:2024 - 17:45:32

6 files changed, 27 insertions, 14 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 88d4d38f89da..412ae7f809c2 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index f30b16d7cfed..d51359a89c20 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -7,7 +7,7 @@ AUX 059-uki-systemd-254.patch 6162 BLAKE2B 60d7fdb8189d26d30fa92c8964e0b6a26b7cf
 AUX dracut-059-dmsquash-live.patch 936 BLAKE2B 6dcbc59561179bba5d7e998f901cda99d8deeeba15886c267e4f77033ab8308cf39b8aaa8ad4c99eca13b2689a052226fdbee6cdae370039bcf40f0e070a8c41 SHA512 34a1b34a09186fd05901f8114260170bf3a51cf96967aa58872c99d6bb1fb1673b8f0246171368837b88e0a1c83c5aac9c20e2f73ed88ed69df72362d55f911f
 AUX dracut-059-install-new-systemd-hibernate-resume.service.patch 1048 BLAKE2B e2b2e2f8c92aa9ae42ce93e2423ffd30642caf05267faee84d02c7200527dd4bd1f31c76739f607d21d9799a69d68efa8457caed980efdf614151a454ed0fb3e SHA512 2ddfd57d8cca3b4564de6207471a47201edb13f9ba5598333874b976e1710e6e8fae910c35d7cf679dc023c82ec9aafad190b3953b0e73000e3531e9963a913f
 AUX dracut-060-fix-resume-hostonly.patch 2670 BLAKE2B fc86da8dd8152c9d50480e302f06903bc0595449a12dbe2b8b34438df767284b0f7947b8d962312c1feb16ebd5fe0749f77191b0a22f42a4bfc0b12373be96be SHA512 d3bc3b1d5d3b71647846288b84b7b3dd8f8a1c0d2279a9373cd462202c82bc7d20e5eca585e2ae70f60fa93d8835ff3ec791a510b54b03e9b147d94068cd9663
-AUX dracut-060-grub-layout.patch 1155 BLAKE2B 3efbc0e34beb777f407907176fc5e567b95c78395410c756f00370d2db8f694c39f1eb20eeacb3b428676f4d8b1591f72a3d1c7893cf68d36ef39d8e0bf2b13e SHA512 2d4ffe6815b8bd38a7f5f5d037630f0bd69c8da4152098b07825daea775efbdbbc89afdf7cd01edce613ca347b5246b526808e17cc279baaa51ba09c580114a7
+AUX dracut-060-grub-layout.patch 1348 BLAKE2B a542acacd1a1e317be287c653fdd82be91bf432d754321be3f96adbb6e0139afa27c206f411668492b493f2f599651c4033c59c6dd0de228d7ea35a8ae7a6188 SHA512 ec5fdb72ebbe1af2faf4a626ec1c5c8a98c5516ae9de91bfbb93f41a011f2e2a54abfadd0467679ab6f88c83c92fd97f5cf98d57ca600ce5e34f79617ff61575
 AUX dracut-060-systemd-255.patch 1185 BLAKE2B 8198736b5f48ed20712de40088d8c86ec6f4e3637f97a69273218257e9570e1924cb00270550f6f5314644cadc73c03377ffe6da69c83c8d8ac7aabaf62807c3 SHA512 f4f50edb2be4b4c3ab4e85c262d54da7eb20234ede8d7fd0236a4a92e11302b5f65295d8ab1d3fa56f50c01b144de51aa5818b7214c1929bc06e99068c85b845
 AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f
 AUX gentoo-network-r1.patch 1002 BLAKE2B 719ff76c315e29c2a40f0a485e315622d6678ef0a325681af22ca060189649119ce08024b1b81be02b28cf532d33165918f5707742bb9927abd08ce49ee0565d SHA512 694f493384e2c0b6a46508f2290efca78d1b6f742fe8441f970837280558d160a711e36ba835ca767cfd158bf191856017af146ae19c5aa1aecbd10a69be38a1
@@ -16,6 +16,6 @@ DIST dracut-060_pre20231030.tar.gz 498954 BLAKE2B ce47f06e1304f732cbad66046c70cb
 DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e
 EBUILD dracut-059-r7.ebuild 4715 BLAKE2B 119097a741c83262e2041e215f5c8d78d897901b07a1c93deccff48e6f750f44a702b769a88088e332ae1289a1e95cad866fc305c2a6b9e6e3d3b0003de3ccc9 SHA512 e8ccab043299e5c542809ba7154c2bd9712fd055e4dd085c6c325c66b49526423dc576b97ea1849cdc79440fb8e91ff5a86c6d339e48bc0560ea4b68c1fb84a2
 EBUILD dracut-060_pre20231030-r2.ebuild 4532 BLAKE2B 1103591973694d6378c40d178c8b217d5babb1c385256bc7ca8929ab27e2456f7557e5d007590b38dbcf57a1811e4a4a3b5e6045f1664400dd21e0139c25285a SHA512 a0a1dfabc22cbbb62c33a8ff3ca4852fdf793cc54b5d368e07dd4f42fb0bb169aa072c3a0dd429c0ea9c70f5c915592ba736dc61d5c88d35713122fbfa1d4b47
-EBUILD dracut-060_pre20240104.ebuild 4569 BLAKE2B c23a9a4be21f99df8bbcef6cabfcac9041443459c6603928f7d72a99d3202b97c15b06da1144deee1e8ba8e0c853284aac25401d6bf6f3135eac26e6bbbfdbd3 SHA512 1b765fb40427179eddb643f98b680df1ca4b2e5607bf6a5a95bcc71b10680894936ac598f1719a19433cb58181b68b8333f6386ec93c0e2f85a94bff3b278d8c
+EBUILD dracut-060_pre20240104-r1.ebuild 4569 BLAKE2B c23a9a4be21f99df8bbcef6cabfcac9041443459c6603928f7d72a99d3202b97c15b06da1144deee1e8ba8e0c853284aac25401d6bf6f3135eac26e6bbbfdbd3 SHA512 1b765fb40427179eddb643f98b680df1ca4b2e5607bf6a5a95bcc71b10680894936ac598f1719a19433cb58181b68b8333f6386ec93c0e2f85a94bff3b278d8c
 EBUILD dracut-9999.ebuild 4368 BLAKE2B be4a4599dd6b5c878a5875e35c98d9a2460c39d2bcc1f352c692e0fc8c1e3a97fe94192b9b439d02d37fc063d0f8d85832250ac1862f517277739022237a8740 SHA512 97b80cbaa29ab4df746466883dee4a97057ffdd3b01cc8c5849e8aeeca560dc7fca5e5130b02def84aea9d2e45bcd0286ced033e188a96f184c29205dfe372c9
 MISC metadata.xml 451 BLAKE2B 34fe004c76ad1ec98a27c53451f51a15689bda1413bb1dae895d4e7be68d810388cbf46d739b04da3b7869835eb70c1b9c03957d60fc6217b12bc028bd011b40 SHA512 51c81f853ab1be8d8dc240d69b1b2c9c69992efa804a394246222466d774bf673f0cb32031d46a56fc2628cd148b0a5c733a8690b78bff70806ca7f563a2855a
diff --git a/sys-kernel/dracut/dracut-060_pre20240104.ebuild b/sys-kernel/dracut/dracut-060_pre20240104-r1.ebuild
index cca90219d096..cca90219d096 100644
--- a/sys-kernel/dracut/dracut-060_pre20240104.ebuild
+++ b/sys-kernel/dracut/dracut-060_pre20240104-r1.ebuild
diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
index 5d8e9a9fcf9d..cf292b7168c4 100644
--- a/sys-kernel/dracut/files/dracut-060-grub-layout.patch
+++ b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
@@ -8,15 +8,24 @@ kernel-install is not supported by systemd upstream and therefore this
 patch is unlikely to be accepted by dracut upstream.
 
 diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
-index 441414a..cfd4fe7 100755
+index 441414ac..a98449fe 100755
 --- a/install.d/50-dracut.install
 +++ b/install.d/50-dracut.install
-@@ -30,7 +30,7 @@ if [[ $KERNEL_INSTALL_LAYOUT == "uki" && -n $KERNEL_INSTALL_STAGING_AREA ]]; the
+@@ -38,6 +38,17 @@ elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; t
      else
          exit 0
      fi
--elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
-+elif [[ $KERNEL_INSTALL_LAYOUT == "bls" || $KERNEL_INSTALL_LAYOUT == "grub" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
-     BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
-     if [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
-         IMAGE="initrd"
++elif [[ $KERNEL_INSTALL_LAYOUT == "grub" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
++    BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
++    if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR == "dracut" ]]; then
++        IMAGE="uki.efi"
++        UEFI_OPTS="--uefi"
++    elif [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
++        IMAGE="initrd"
++        UEFI_OPTS="--no-uefi"
++    else
++        exit 0
++    fi
+ else
+     # No layout information, use users --uefi/--no-uefi preference
+     UEFI_OPTS=""
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 6e44c3502403..db67fab39197 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,5 +1,5 @@
 DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
-DIST installkernel-23.tar.gz 14290 BLAKE2B 4384277d07ce0328c7f72c33dc3e08424b356a462609ad543c6ee556d6f7688ac8d819524067e6cf0fe5b3dc9d374f55395dfdb2a356e9e218b40650c74b06ef SHA512 508d95dadc34e813f3d05389ebfeaf78b921480b1e400ae7d9cb724307551acf4b9c6f2ca8d1f714b973295aaa3a5db5512859a480dac507665e883b582a4963
+DIST installkernel-24.tar.gz 14290 BLAKE2B 0d33efdc2bdec854643e6938b7813d46cb8adb0f1ab87dc4daa869b25c75440db0e2f2d25dc340833122ef88d4ecbf7e0a4eaaf883da52f7888bf8d58e4c4d11 SHA512 cca717435af47f22a4d9d86743dcd05012246790a7dd7ae2dc9f18859362cf7f6c68e3e8b15d428e0aede136036491065ff9fc871ef93121cec1c838f6237c1a
 EBUILD installkernel-12.ebuild 1490 BLAKE2B 88956c7ff428beaf980b47d567fc1baaaee6dfbba3139e3a5b3d178d9119fef8d712862ee07933b8132d00b406419fcd873eb698a22cbe7329675788488db7d7 SHA512 78d9f9958c56bb47902d8cb894bbc9574c96fb2d986b00cb6b7bbe20b2db58db7c41a53f33794b98726870bac9a1b2c4a381bc4609288dcc0a05b87102aaac7d
-EBUILD installkernel-23.ebuild 4468 BLAKE2B bf29ce2134eb1f85216fd4ccee7efce80ad2aa754fa6a4f2826120f887c9cfb22a90f790a01e188c73ea33f4137638b4fd424718e112bed7549add0407bb9ed3 SHA512 aa616f4426c54590812fb11c757444d8d6b73119724c9cbe5d8962241490a3031916fafeb3f95d991a6703d01740a9c6ac9733640f0ea08b5bc882930ba8c931
+EBUILD installkernel-24.ebuild 4578 BLAKE2B bea51d5983b74bee7e14b59d483010120bfcbb7cca3bbefb65495dfd799f86b278e45d2551ce1e5a4d7ebc7ceab5431a702453a6cea6a38213fa83baea3a5008 SHA512 8c26e47b1fb794856a6d6bdb2d3a2fdf0b9233057533219fa3332f0eb106077a2c9fcfb96a80904ffa59b177fcdab304a54e7cb0433f0b9ae7322209cad8a0a2
 MISC metadata.xml 939 BLAKE2B fd8d6a7c19c2a5f6f11e60cdf0a5b9e98f140d80bbab835f5350ac6fb87e786fa5a93e3157e9affd45f381d4eb20c454775d703c8bdf82d2a6161e2ca2420ef9 SHA512 9d1b025cf8c5c0875015e0e9b3cadbec2ab3770aa76c8792adb8b16037dbcdcf3cb75d23d0dcaad7a932138bbdb524c266c1bf1cab09df9541a1acac45d7ca82
diff --git a/sys-kernel/installkernel/installkernel-23.ebuild b/sys-kernel/installkernel/installkernel-24.ebuild
index 333ea4b45568..e825c472c126 100644
--- a/sys-kernel/installkernel/installkernel-23.ebuild
+++ b/sys-kernel/installkernel/installkernel-24.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="systemd-boot? ( systemd )"
 
 RDEPEND="
 	!<=sys-kernel/installkernel-systemd-3
-	dracut? ( >=sys-kernel/dracut-060_pre20240104 )
+	dracut? ( >=sys-kernel/dracut-060_pre20240104-r1 )
 	grub? ( sys-boot/grub )
 	systemd? (
 		|| (
@@ -66,7 +66,7 @@ src_install() {
 	doexe hooks/systemd/00-00machineid-directory.install
 	doexe hooks/systemd/10-copy-prebuilt.install
 	doexe hooks/systemd/90-compat.install
-	doexe hooks/systemd/91-grub-mkconfig.install
+	use grub && doexe hooks/systemd/91-grub-mkconfig.install
 
 	if use systemd; then
 		sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
@@ -89,7 +89,11 @@ src_install() {
 	if use dracut; then
 		echo "initrd_generator=dracut" >> "${T}/install.conf" || die
 		if ! use ukify; then
-			echo "uki_generator=dracut" >> "${T}/install.conf" || die
+			if use uki; then
+				echo "uki_generator=dracut" >> "${T}/install.conf" || die
+			else
+				echo "uki_generator=none" >> "${T}/install.conf" || die
+			fi
 		fi
 	else
 		echo "initrd_generator=none" >> "${T}/install.conf" || die