keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

boot.mk, build-distro: handle e2k

Browse Source 
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.
This commit is contained in:
Michael Shigorin 2018-05-10 11:31:33 +03:00
parent daa81f9ba9
commit cdaa9cdaa3
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features.in/build-distro/lib/90-build-distro.mk
View File

@ -11,7 +11,12 @@ BOOT_BIBL := $(META_BIBLIO)
BOOT_ABST := $(META_ABSTRACT) BOOT_ABST := $(META_ABSTRACT)
DATE_F := $(shell date +%F) 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 BOOT_TYPE := isolinux
endif
all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \ all: | $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
postprocess $(GLOBAL_CLEAN_WORKDIR) postprocess $(GLOBAL_CLEAN_WORKDIR)

6
lib/boot.mk
View File

@ -3,7 +3,13 @@ $(error this makefile is designed to be included in toplevel one)
endif endif
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
# install media bootloader # install media bootloader
boot/isolinux: use/syslinux boot/isolinux: use/syslinux
@$(call set,BOOTLOADER,isolinux) @$(call set,BOOTLOADER,isolinux)
endif endif
ifeq (,$(filter-out e2k%,$(ARCH)))
boot/isolinux:
@$(call set,BOOTLOADER,e2k-boot)
endif
endif