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

efi: employ mkimage

Browse Source 
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?
This commit is contained in:
Michael Shigorin 2012-12-12 00:00:35 +04:00
parent 8d6f58fcd1
commit 5a61e2d4cc
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features.in/efi/config.mk
View File

@ -1,7 +1,10 @@
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)

2
features.in/pack/config.mk
View File

@ -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

4
image.in/Makefile
View File

@ -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

6
sub.in/stage1/Makefile
View File

@ -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, \