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

syslinux: piggybacking cleanups

Browse Source 
Avoid extra files where a variable would suffice; and use
the more specific "syslinux.list" rather than a "files.list".
This commit is contained in:
Michael Shigorin 2012-01-04 14:17:04 +02:00
parent 8fbf3585b0
commit 426c985da3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,8 +51,7 @@ all: prep debug
@### 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)/files.list @echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list
@echo $(BOOTLOADER) > $(DSTDIR)/bootloader
prep: prep:
@mkdir -p $(DSTDIR) @mkdir -p $(DSTDIR)

12
features.in/syslinux/stage1/scripts.d/01-syslinux
View File

@ -7,15 +7,15 @@ MODDIR="/usr/lib/syslinux"
mkdir -p "$WORKDIR/syslinux" mkdir -p "$WORKDIR/syslinux"
cd "$WORKDIR/syslinux" cd "$WORKDIR/syslinux"
# validate just in case (written by ../../generate.mk) # validate just in case (see also stage1 Makefile)
BOOTLOADER="$(cat .in/bootloader)" case "$GLOBAL_BOOTLOADER" in
case "$BOOTLOADER" in
isolinux|syslinux) ;; isolinux|syslinux) ;;
*) echo "$0: error: weird BOOTLOADER: $BOOTLOADER" >&2; exit 1;; *) echo "error: weird GLOBAL_BOOTLOADER: \`$GLOBAL_BOOTLOADER'" >&2;
exit 1;;
esac esac
# copy extra files, if any # copy extra files, if any
SYSLINUX_FILES="$(cat .in/files.list)" SYSLINUX_FILES="$(cat .in/syslinux.list)"
if [ -n "${SYSLINUX_FILES% }" ]; then if [ -n "${SYSLINUX_FILES% }" ]; then
cp -a $SYSLINUX_FILES . cp -a $SYSLINUX_FILES .
fi fi
@ -30,7 +30,7 @@ if [ -n "$SYSLINUX_MODULES" ]; then
fi fi
# number ordering sponsored by shell's pathname expansion # number ordering sponsored by shell's pathname expansion
grep -hv '^#' .in/[0-9][0-9]*.cfg > "$BOOTLOADER.cfg" grep -hv '^#' .in/[0-9][0-9]*.cfg > "$GLOBAL_BOOTLOADER.cfg"
# snippets are not going into the actual image # snippets are not going into the actual image
if [ "$DEBUG" != 2 ]; then rm -r .in/; fi if [ "$DEBUG" != 2 ]; then rm -r .in/; fi

1
sub.in/stage1/Makefile
View File

@ -11,6 +11,7 @@ include $(MKIMAGE_PREFIX)/config.mk
ifndef BOOTLOADER ifndef BOOTLOADER
$(error BOOTLOADER not defined) $(error BOOTLOADER not defined)
endif endif
GLOBAL_BOOTLOADER := $(BOOTLOADER)
MKI_PACK_RESULTS = data MKI_PACK_RESULTS = data
PROPAGATOR_VERSION = ALT Linux PROPAGATOR_VERSION = ALT Linux