From 1cf05b639c23c404f307602d35e59337fb23987f Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 21 Aug 2020 20:21:53 +0300 Subject: [PATCH] bootloader: just skip on e2k There's no need for bootloader on Elbrus platform since firmware boots Linux just fine; note that the whole feature is betted omitted since its script checks for the case when the feature is requested but not configured properly. --- features.in/bootloader/config.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/features.in/bootloader/config.mk b/features.in/bootloader/config.mk index 20d11cf5..9811ae59 100644 --- a/features.in/bootloader/config.mk +++ b/features.in/bootloader/config.mk @@ -9,6 +9,7 @@ GRUB_ARCHES := i586 x86_64 aarch64 ppc64le use/bootloader: use/pkgpriorities +ifneq (,$(filter-out e2k%,$(ARCH))) @$(call add_feature) @$(call try,BASE_BOOTLOADER,grub) @$(call xport,BASE_BOOTLOADER) @@ -19,6 +20,7 @@ ifeq (distro,$(IMAGE_CLASS)) @$(call add,PINNED_PACKAGES,alterator-$$(BASE_BOOTLOADER)) @$(call add,PINNED_PACKAGES,installer-bootloader-$$(BASE_BOOTLOADER)-stage2) endif +endif ifeq (,$(filter-out i586 x86_64,$(ARCH))) use/bootloader/lilo: \ @@ -39,8 +41,10 @@ endif use/bootloader/uboot: use/bootloader use/uboot @$(call set,BASE_BOOTLOADER,uboot) -use/bootloader/live: use/bootloader +use/bootloader/live: use/bootloader; @: +ifneq (,$(filter-out e2k%,$(ARCH))) @$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER)) +endif use/bootloader/os-prober: use/bootloader @$(call add,BASE_PACKAGES,os-prober)