boot.mk, build-distro: handle e2k

It needs (and has) no isolinux in the first place; this is also the situation with most or all non-x86 arches, the code should probably reflect that.

boot.mk, build-distro: handle e2k
cdaa9cda · Michael Shigorin · daa81f9b · cdaa9cda · cdaa9cda
Commit cdaa9cda authored May 10, 2018 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

90-build-distro.mk features.in/build-distro/lib/90-build-distro.mk +5 -0

boot.mk lib/boot.mk +6 -0

No files found.
--- a/features.in/build-distro/lib/90-build-distro.mk
+++ b/features.in/build-distro/lib/90-build-distro.mk
@@ -11,7 +11,12 @@ BOOT_BIBL := $(META_BIBLIO)
 BOOT_ABST := $(META_ABSTRACT)
 DATE_F    := $(shell date +%F)

+### we might want a e2k data iso too
+ifeq (,$(filter-out e2k%,$(ARCH)))
+BOOT_TYPE := e2kboot
+else
 BOOT_TYPE := isolinux
+endif

 all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)

--- a/lib/boot.mk
+++ b/lib/boot.mk
@@ -3,7 +3,13 @@ $(error this makefile is designed to be included in toplevel one)
 endif

 ifeq (distro,$(IMAGE_CLASS))
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 # install media bootloader
 boot/isolinux: use/syslinux
 	@$(call set,BOOTLOADER,isolinux)
 endif
+ifeq (,$(filter-out e2k%,$(ARCH)))
+boot/isolinux:
+	@$(call set,BOOTLOADER,e2k-boot)
+endif
+endif