efi: employ mkimage

The initial approach required some quite involved postprocessing as described in http://www.altlinux.org/UEFI#HOWTO; after having ironed out the kinks so that initial EFI support could be merged into mkimage proper we're better off just using it, eh?

efi: employ mkimage
5a61e2d4 · Michael Shigorin · 8d6f58fc · 5a61e2d4 · 5a61e2d4 · 5a61e2d4
Commit 5a61e2d4 authored Dec 12, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

config.mk features.in/efi/config.mk +4 -1

config.mk features.in/pack/config.mk +1 -1

Makefile image.in/Makefile +3 -1

Makefile sub.in/stage1/Makefile +3 -3

No files found.
--- a/features.in/efi/config.mk
+++ b/features.in/efi/config.mk
 use/efi:
+	@$(call add_feature)
+	@$(call set,MKI_VER_MINIMAL,0.2.5)	# see #28219
 	@$(call add,THE_LISTS,$(call tags,base efi))
 	@$(call add,INSTALL2_PACKAGES,dosfstools)
+	@$(call set,EFI_BOOTLOADER,elilo)	### no choice right now

 use/efi/debug: use/efi
 	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
-	@$(call set,KFLAVOURS,led-ws)	### CONFIG_FB_EFI
+	@$(call set,KFLAVOURS,led-ws)
--- a/features.in/pack/config.mk
+++ b/features.in/pack/config.mk
@@ -10,7 +10,7 @@ use/pack:
 # for direct bootable usbflash imaging
 use/pack/iso: use/pack boot/isolinux $(ISOHYBRID:%=use/isohybrid)
 ifeq (distro,$(IMAGE_CLASS))
-	@$(call set,IMAGE_PACKTYPE,isoboot)
+	@$(call set,IMAGE_PACKTYPE,boot)
 else
 	@$(call set,IMAGE_PACKTYPE,isodata)
 endif

--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -5,8 +5,10 @@ CURRENT_LINK := mkimage-profiles
 OUT_LINK := out

 # there were mkimage fixes induced by mkimage-profile development
+# - minimal version is bumped for critical bugfixes/features
+# - optimal one relates to the less universally relevant bits
 MKI_VER_MINIMAL = 0.1.7
-MKI_VER_OPTIMAL = 0.2.0
+MKI_VER_OPTIMAL = 0.2.5

 include distcfg.mk
 include functions.mk

--- a/sub.in/stage1/Makefile
+++ b/sub.in/stage1/Makefile
@@ -14,9 +14,6 @@ endif
 GLOBAL_BOOTLOADER := $(BOOTLOADER)

 MKI_PACK_RESULTS = data
-PROPAGATOR_VERSION = ALT Linux
-PROPAGATOR_MAR_MODULES = ./modules
-PROPAGATOR_INITFS = ./initfs
 COPY_TREE = ./files

 include $(MKIMAGE_PREFIX)/targets.mk
@@ -29,6 +26,9 @@ STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))

 # propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso)
 ifneq "$(STAGE1_KFLAVOUR)" ""
+PROPAGATOR_VERSION = ALT Linux
+PROPAGATOR_MAR_MODULES = ./modules
+PROPAGATOR_INITFS = ./initfs
 BUILD_PROPAGATOR = build-propagator
 INFO_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR)
 CHROOT_PACKAGES_REGEXP := $(call kpackages, \