From cdaa9cdaa38accb392dc6f9e2377419390b09f67 Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Thu, 10 May 2018 11:31:33 +0300
Subject: [PATCH] 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.
---
 features.in/build-distro/lib/90-build-distro.mk | 5 +++++
 lib/boot.mk                                     | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/features.in/build-distro/lib/90-build-distro.mk b/features.in/build-distro/lib/90-build-distro.mk
index 3cff22bf..2d5fef17 100644
--- 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)
diff --git a/lib/boot.mk b/lib/boot.mk
index 39bb2d81..a05c8ae3 100644
--- 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