Drop refind and elilo support everything
This commit is contained in:
parent
ca8d16a510
commit
5f704a4b1f
@ -1,9 +1,3 @@
|
||||
# step 4: build the distribution image
|
||||
|
||||
DOT_BASE += $(call branding,$(THE_BRANDING))
|
||||
|
||||
# needed for refind only
|
||||
ifeq (,$(filter-out x86_64,$(ARCH)))
|
||||
CHROOT_PACKAGES_REGEXP += $(call branding,bootloader)
|
||||
CHROOT_PACKAGES += ImageMagick-tools
|
||||
endif
|
||||
|
@ -38,19 +38,12 @@ ifeq (,$(filter-out p10 c10f1,$(BRANCH)))
|
||||
@$(call add,STAGE1_PACKAGES,shim-signed-installer-kludge grub-efi alt-uefi-certs dosfstools mtools)
|
||||
endif
|
||||
|
||||
use/efi/lilo: use/efi use/bootloader/lilo
|
||||
@$(call set,EFI_BOOTLOADER,elilo)
|
||||
|
||||
use/efi/refind: use/efi
|
||||
@$(call set,EFI_BOOTLOADER,refind)
|
||||
|
||||
use/efi/memtest86: use/efi
|
||||
@$(call set,EFI_MEMTEST86,efi-memtest86)
|
||||
|
||||
else
|
||||
|
||||
use/efi/signed use/efi/shell \
|
||||
use/efi/refind use/efi/memtest86 use/efi/lilo: use/efi; @:
|
||||
use/efi/signed use/efi/shell use/efi/memtest86: use/efi; @:
|
||||
|
||||
endif
|
||||
|
||||
@ -64,8 +57,8 @@ endif
|
||||
else
|
||||
|
||||
# ignore on an unsupported target arch but make it hybrid at least
|
||||
use/efi use/efi/signed use/efi/debug use/efi/grub use/efi/lilo \
|
||||
use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid; @:
|
||||
use/efi use/efi/signed use/efi/debug use/efi/grub \
|
||||
use/efi/shell use/efi/memtest86: use/isohybrid; @:
|
||||
|
||||
endif
|
||||
|
||||
|
@ -25,15 +25,6 @@ mv boot/$kname-$kverdef boot/$kname
|
||||
cp $verbose -af $initrd boot/
|
||||
mv boot/initrd-$kverdef.img boot/initrd.img
|
||||
|
||||
# config is generated in mkimage
|
||||
case "$GLOBAL_EFI_BOOTLOADER" in
|
||||
refind|elilo)
|
||||
mkdir -p EFI/BOOT
|
||||
cp -lpLf boot/vmlinuz EFI/BOOT/
|
||||
cp -lpLf boot/initrd.img EFI/BOOT/full.cz
|
||||
;;
|
||||
esac
|
||||
|
||||
# copy dtb for default kernel
|
||||
if [ -n "$GLOBAL_COPY_DTB" ]; then
|
||||
dtb_dir=
|
||||
|
@ -1,2 +1 @@
|
||||
lilo@X86
|
||||
elilo@x86_64
|
||||
|
Loading…
Reference in New Issue
Block a user