shaba/mkimage-profiles
1
0
Fork 0
forked from altcloud/mkimage-profiles
Code Issues 1 Pull Requests Releases Wiki Activity

syslinux: get rid of ^s with gfxboot

Browse Source 
Keyboard accelerators rather make sense
with menu/vesamenu UI.
This commit is contained in:
Michael Shigorin 2012-06-14 00:52:31 +03:00
parent 07d812d7ff
commit 2935c44dbb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
features.in/syslinux/generate.mk
View File

@ -48,14 +48,14 @@ cfg = $(wildcard cfg.in/??$(1).cfg)
# #
# arguments get evaluated before recipe body execution thus prep # arguments get evaluated before recipe body execution thus prep
all: debug timeout bootargs all: debug timeout
@### proper text branding should be implemented @### proper text branding should be implemented
@sed -i 's,@mkimage-profiles@,$(IMAGE_NAME),' $(DSTDIR)/*.cfg @sed -i 's,@mkimage-profiles@,$(IMAGE_NAME),' $(DSTDIR)/*.cfg
@echo $(SYSLINUX_MODULES) > $(DSTDIR)/modules.list @echo $(SYSLINUX_MODULES) > $(DSTDIR)/modules.list
@echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list @echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list
# integerity check # integerity check
timeout: copy timeout: bootargs
@if [ "$(SYSLINUX_TIMEOUT)" -ge 0 ] 2>/dev/null; then \ @if [ "$(SYSLINUX_TIMEOUT)" -ge 0 ] 2>/dev/null; then \
TIMEOUT="$(SYSLINUX_TIMEOUT)"; \ TIMEOUT="$(SYSLINUX_TIMEOUT)"; \
else \ else \
@ -64,12 +64,17 @@ timeout: copy
sed -i "s,@timeout@,$$TIMEOUT," $(DSTDIR)/*.cfg sed -i "s,@timeout@,$$TIMEOUT," $(DSTDIR)/*.cfg
# pass over additional parameters, if any # pass over additional parameters, if any
bootargs: copy bootargs: clean
@if [ -n "$(INSTALL2_BOOTARGS)" ]; then \ @if [ -n "$(INSTALL2_BOOTARGS)" ]; then \
sed -i "s,@bootargs@,$(INSTALL2_BOOTARGS)," $(DSTDIR)/*.cfg; \ sed -i "s,@bootargs@,$(INSTALL2_BOOTARGS)," $(DSTDIR)/*.cfg; \
fi; \ fi; \
sed -i "s,@bootargs@,," $(DSTDIR)/*.cfg sed -i "s,@bootargs@,," $(DSTDIR)/*.cfg
clean: copy
@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
sed -i "s,\^,," $(DSTDIR)/*.cfg; \
fi
copy: prep copy: prep
@cp -pLt $(DSTDIR) -- $(sort \ @cp -pLt $(DSTDIR) -- $(sort \
$(foreach C,$(SYSLINUX_CFG),$(call cfg,$(C))) \ $(foreach C,$(SYSLINUX_CFG),$(call cfg,$(C))) \