Skip to content

Commit

Permalink
Update scripts/installkernel/installkernel-48-r1.ebuild.patch
Browse files Browse the repository at this point in the history
Signed-off-by: Gabi Falk <[email protected]>
  • Loading branch information
gabifalk committed Dec 23, 2024
1 parent b864153 commit 6ab77ca
Showing 1 changed file with 27 additions and 4 deletions.
31 changes: 27 additions & 4 deletions scripts/installkernel/installkernel-48-r1.ebuild.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,50 @@
?? ( efistub grub systemd-boot )
refind? ( !systemd-boot !grub )
systemd-boot? ( systemd )
+ make-initrd? ( !uki !ukify )
+ make-initrd? ( !ukify )
ukify? ( uki )
- ?? ( dracut ugrd )
+ ?? ( dracut ugrd make-initrd )
"
# Only select one flag that sets "layout=", except for uki since grub,
# systemd-boot, and efistub booting are all compatible with UKIs and
@@ -58,6 +59,7 @@
@@ -58,6 +59,16 @@
systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 )
!systemd? ( sys-boot/uefi-mkconfig )
)
+ make-initrd? ( sys-kernel/make-initrd )
+ make-initrd? (
+ sys-kernel/make-initrd
+ uki? (
+ >=sys-kernel/make-initrd-2.50.0
+ || (
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot(-)]
+ )
+ )
+ )
grub? ( sys-boot/grub )
refind? ( sys-boot/refind )
systemd? (
@@ -154,6 +156,8 @@
@@ -154,6 +165,13 @@
fi
elif use ugrd; then
echo "initrd_generator=ugrd" >> "${T}/install.conf" || die
+ elif use make-initrd; then
+ echo "initrd_generator=make-initrd" >> "${T}/install.conf" || die
+ if use uki; then
+ echo "uki_generator=make-initrd" >> "${T}/install.conf" || die
+ else
+ echo "uki_generator=none" >> "${T}/install.conf" || die
+ fi
else
echo "initrd_generator=none" >> "${T}/install.conf" || die
fi
@@ -161,7 +179,7 @@
if use ukify; then
echo "uki_generator=ukify" >> "${T}/install.conf" || die
else
- if ! use dracut; then
+ if ! use dracut && ! use make-initrd; then
echo "uki_generator=none" >> "${T}/install.conf" || die
fi
fi

0 comments on commit 6ab77ca

Please sign in to comment.