diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index fcf2494..07b9c26 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1 +1 @@ -DIST dracut-101.tar.gz 556673 BLAKE2B 8780451aeafd3d9fdfcabc8eb077bb44cc6d64d69cd3138e7447985fcf225495caea937269cf4f0a09a10a6ce2202cc10e817777090aac0bb207fec99e1c8bc8 SHA512 827f073b749a374b703f317ba249479312043ed54af82609ce45332c27349870a68a1d9883118e0a3ecd1cbb33d64aca8bcf6aac56eb75f721fd3380bd12005b +DIST dracut-102.tar.gz 559538 BLAKE2B 665f1313c71269856b8e5fd540ecf645844ed196d705122752c9577a00a30e91ad8ce4b3336f49507381e78d381e4b5b9982217cc496200b1c97692fa5c6aea9 SHA512 463ad75f0508392431d58796763a41accf5a1dc17fe27d36e37d588153ca9c5b32b453faa9149524ea2dc2906805126d1e023feecb6554206595a972508f6a32 diff --git a/sys-kernel/dracut/dracut-101-r1.ebuild b/sys-kernel/dracut/dracut-102.ebuild similarity index 98% rename from sys-kernel/dracut/dracut-101-r1.ebuild rename to sys-kernel/dracut/dracut-102.ebuild index e523421..5fad472 100644 --- a/sys-kernel/dracut/dracut-101-r1.ebuild +++ b/sys-kernel/dracut/dracut-102.ebuild @@ -67,7 +67,6 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch - "${FILESDIR}"/dracut-060-grub-layout.patch ) src_configure() { @@ -100,9 +99,10 @@ src_install() { AUTHORS NEWS.md README.md + docs/HACKING.md docs/README.cross - docs/README.generic docs/README.kernel + docs/RELEASE.md docs/SECURITY.md ) diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index fdf4e40..1af870a 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -98,9 +98,10 @@ src_install() { AUTHORS NEWS.md README.md + docs/HACKING.md docs/README.cross - docs/README.generic docs/README.kernel + docs/RELEASE.md docs/SECURITY.md ) diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch b/sys-kernel/dracut/files/dracut-060-grub-layout.patch deleted file mode 100644 index 543efa1..0000000 --- a/sys-kernel/dracut/files/dracut-060-grub-layout.patch +++ /dev/null @@ -1,31 +0,0 @@ -Ensures that the generated initrd is installed in the "new" way via the -staging area in the grub layout. This prevents accidentally creating -an UKI named initrd, and also ensures that BOOT_ROOT and -KERNEL_INSTALL_INITRD_GENERATOR are respected when the layout is set to grub. - -Downstream only since the grub layout for using grub with systemd's -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 441414ac..a98449fe 100755 ---- a/install.d/50-dracut.install -+++ b/install.d/50-dracut.install -@@ -38,6 +38,17 @@ elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; t - else - exit 0 - fi -+elif [[ $KERNEL_INSTALL_LAYOUT == "grub" || $KERNEL_INSTALL_LAYOUT == "compat" || $KERNEL_INSTALL_LAYOUT == "efistub" ]]; 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=""