mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
isolinux.mk: Code beautification
- File name filter expression is now only at one place in code - Initrds now follow kernel naming conventions
This commit is contained in:
parent
3f08e0730f
commit
b5ee1beb6c
1 changed files with 8 additions and 3 deletions
|
|
@ -58,10 +58,12 @@ unpack.done: dload.done
|
|||
tar -xjf $(DLOAD_PKG)
|
||||
touch $@
|
||||
|
||||
NAME_FILTER = tr [A-Z] [a-z] | sed 's/\.tar\.gz/.tgz/; s/-/_/g; s/\([^.]*\)\.\([^.]*\)$$/\1@\2/; s/\./_/g; s/@/./'
|
||||
|
||||
copy.done: unpack.done dirs.done $(CD_FILES)
|
||||
mkdir -p $(BUILD_DIR)
|
||||
for i in $(CD_FILES); do \
|
||||
n=`basename $$i | tr [A-Z] [a-z] | sed 's/\.tar\.gz/.tgz/; s/-/_/g; s/\([^.]*\)\.\([^.]*\)$$/\1@\2/; s/\./_/g; s/@/./'` ;\
|
||||
n=`basename $$i | $(NAME_FILTER)` ;\
|
||||
echo "copying $$i -> $(BUILD_DIR)/$$n" ;\
|
||||
cp $$i $(BUILD_DIR)/$$n ;\
|
||||
done
|
||||
|
|
@ -73,14 +75,17 @@ $(ISO_IMAGE): copy.done
|
|||
-no-emul-boot -boot-load-size 4 -boot-info-table \
|
||||
$(BUILD_DIR)
|
||||
|
||||
# n =`basename $$k | tr [A-Z] [a-z] | sed 's/\.tar\.gz/.tgz/; s/-/_/g; s/\([^.]*\)\.\([^.]*\)$$/\1@\2/; s/\./_/g; s/@/./'` ;\
|
||||
|
||||
isolinux.cfg:
|
||||
( \
|
||||
echo DEFAULT menu.c32 ;\
|
||||
echo PROMPT 0 ;\
|
||||
for k in $(notdir $(KERNELS)); do \
|
||||
l=`echo $$k | sed 's/vmlinuz-//g'` ;\
|
||||
n=`basename $$k | tr [A-Z] [a-z] | sed 's/\.tar\.gz/.tgz/; s/-/_/g; s/\([^.]*\)\.\([^.]*\)$$/\1@\2/; s/\./_/g; s/@/./'` ;\
|
||||
echo -e "LABEL $$l\n KERNEL $$n\n APPEND initrd=initrd root=$(ROOT_FS_DEVICE)" ;\
|
||||
i=`echo initrd-$$l | $(NAME_FILTER)` ;\
|
||||
n=`basename $$k | $(NAME_FILTER)` ;\
|
||||
echo -e "LABEL $$l\n KERNEL $$n\n APPEND initrd=$$i root=$(ROOT_FS_DEVICE)" ;\
|
||||
done \
|
||||
) > $@
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue