Commit 5f704a4b authored by Anton Midyukov's avatar Anton Midyukov

Drop refind and elilo support everything

parent ca8d16a5
# step 4: build the distribution image # step 4: build the distribution image
DOT_BASE += $(call branding,$(THE_BRANDING)) 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))) ...@@ -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) @$(call add,STAGE1_PACKAGES,shim-signed-installer-kludge grub-efi alt-uefi-certs dosfstools mtools)
endif 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 use/efi/memtest86: use/efi
@$(call set,EFI_MEMTEST86,efi-memtest86) @$(call set,EFI_MEMTEST86,efi-memtest86)
else else
use/efi/signed use/efi/shell \ use/efi/signed use/efi/shell use/efi/memtest86: use/efi; @:
use/efi/refind use/efi/memtest86 use/efi/lilo: use/efi; @:
endif endif
...@@ -64,8 +57,8 @@ endif ...@@ -64,8 +57,8 @@ endif
else else
# ignore on an unsupported target arch but make it hybrid at least # 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 use/efi/signed use/efi/debug use/efi/grub \
use/efi/refind use/efi/shell use/efi/memtest86: use/isohybrid; @: use/efi/shell use/efi/memtest86: use/isohybrid; @:
endif endif
......
...@@ -25,15 +25,6 @@ mv boot/$kname-$kverdef boot/$kname ...@@ -25,15 +25,6 @@ mv boot/$kname-$kverdef boot/$kname
cp $verbose -af $initrd boot/ cp $verbose -af $initrd boot/
mv boot/initrd-$kverdef.img boot/initrd.img 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 # copy dtb for default kernel
if [ -n "$GLOBAL_COPY_DTB" ]; then if [ -n "$GLOBAL_COPY_DTB" ]; then
dtb_dir= dtb_dir=
......
lilo@X86 lilo@X86
elilo@x86_64
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment