[devel-distro] [PATCH] lib/boot.mk: do not define BOOTLOADER type for e2k

Антон Мидюков midyukov-anton at ya.ru
Sat Aug 5 05:48:33 MSK 2023


05.08.2023 03:42, Gleb Fotengauer-Malinovskiy пишет:
> It is unnecessary to define the BOOTLOADER type for e2k in this context.
> The reason is that images for e2k use the mkimage isodata pack method,
> which is unaffected by any value of the BOOTLOADER variable (BOOT_TYPE
> in the mkimage).  Therefore, defining the BOOTLOADER type does not make
> any sense.
> 

Этот коммит ломает сборку на e2k, так как в sub.in/stage1/Makefile:
ifeq (,$(BOOTLOADER))
$(error BOOTLOADER not defined)
endif

Но скорее всего эта проверка стала излишней после упразднения в этом Makefile
copy-$(BOOTLOADER)

> Fixes: e8fcdaf8 ("lib/boot.mk: Set IMAGE_PACKTYPE to isodata for e2k")
> ---
>  lib/boot.mk | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/lib/boot.mk b/lib/boot.mk
> index 2c58f378..e8940dc7 100644
> --- a/lib/boot.mk
> +++ b/lib/boot.mk
> @@ -13,7 +13,6 @@ ifeq (,$(filter-out aarch64 riscv64 loongarch64,$(ARCH)))
>  	@$(call try,BOOTLOADER,efiboot)
>  endif
>  ifeq (,$(filter-out e2k%,$(ARCH)))
> -	@$(call try,BOOTLOADER,e2kboot)
>  	@$(call set,IMAGE_PACKTYPE,isodata)
>  endif
>  ifeq (,$(filter-out ppc64le,$(ARCH)))

-- 
С уважением, Антон Мидюков <antohami �� altlinux.org>



More information about the devel-distro mailing list