Skip to content

M
mkimage-profiles
Commit cdaa9cda authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

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.
parent daa81f9b
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 0 deletions
features.in/build-distro/lib/90-build-distro.mk
View file @ cdaa9cda
...@@ -11,7 +11,12 @@ BOOT_BIBL := $(META_BIBLIO) ...@@ -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)
......
lib/boot.mk
View file @ cdaa9cda
...@@ -3,7 +3,13 @@ $(error this makefile is designed to be included in toplevel one) ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment