Commit 5a61e2d4 authored by Michael Shigorin's avatar Michael Shigorin

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?
parent 8d6f58fc
use/efi: 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,THE_LISTS,$(call tags,base efi))
@$(call add,INSTALL2_PACKAGES,dosfstools) @$(call add,INSTALL2_PACKAGES,dosfstools)
@$(call set,EFI_BOOTLOADER,elilo) ### no choice right now
use/efi/debug: use/efi use/efi/debug: use/efi
@$(call add,STAGE2_PACKAGES,efibootmgr gdisk) @$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
@$(call set,KFLAVOURS,led-ws) ### CONFIG_FB_EFI @$(call set,KFLAVOURS,led-ws)
...@@ -10,7 +10,7 @@ use/pack: ...@@ -10,7 +10,7 @@ use/pack:
# for direct bootable usbflash imaging # for direct bootable usbflash imaging
use/pack/iso: use/pack boot/isolinux $(ISOHYBRID:%=use/isohybrid) use/pack/iso: use/pack boot/isolinux $(ISOHYBRID:%=use/isohybrid)
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
@$(call set,IMAGE_PACKTYPE,isoboot) @$(call set,IMAGE_PACKTYPE,boot)
else else
@$(call set,IMAGE_PACKTYPE,isodata) @$(call set,IMAGE_PACKTYPE,isodata)
endif endif
......
...@@ -5,8 +5,10 @@ CURRENT_LINK := mkimage-profiles ...@@ -5,8 +5,10 @@ CURRENT_LINK := mkimage-profiles
OUT_LINK := out OUT_LINK := out
# there were mkimage fixes induced by mkimage-profile development # 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_MINIMAL = 0.1.7
MKI_VER_OPTIMAL = 0.2.0 MKI_VER_OPTIMAL = 0.2.5
include distcfg.mk include distcfg.mk
include functions.mk include functions.mk
......
...@@ -14,9 +14,6 @@ endif ...@@ -14,9 +14,6 @@ endif
GLOBAL_BOOTLOADER := $(BOOTLOADER) GLOBAL_BOOTLOADER := $(BOOTLOADER)
MKI_PACK_RESULTS = data MKI_PACK_RESULTS = data
PROPAGATOR_VERSION = ALT Linux
PROPAGATOR_MAR_MODULES = ./modules
PROPAGATOR_INITFS = ./initfs
COPY_TREE = ./files COPY_TREE = ./files
include $(MKIMAGE_PREFIX)/targets.mk include $(MKIMAGE_PREFIX)/targets.mk
...@@ -29,6 +26,9 @@ STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS)) ...@@ -29,6 +26,9 @@ STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))
# propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso) # propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso)
ifneq "$(STAGE1_KFLAVOUR)" "" ifneq "$(STAGE1_KFLAVOUR)" ""
PROPAGATOR_VERSION = ALT Linux
PROPAGATOR_MAR_MODULES = ./modules
PROPAGATOR_INITFS = ./initfs
BUILD_PROPAGATOR = build-propagator BUILD_PROPAGATOR = build-propagator
INFO_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR) INFO_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR)
CHROOT_PACKAGES_REGEXP := $(call kpackages, \ CHROOT_PACKAGES_REGEXP := $(call kpackages, \
......
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