[Lunar-commits] <lunar-iso> Substitude ISO_ variable in isolinux files

[Peter de Ridder]

commit ce62f33491968dbe7285e305004edadec7c8e3ec
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Sun, 23 Dec 2012 11:46:38 -0800
URL: https://github.com/lunar-linux/lunar-iso/commit/ce62f33491968dbe7285e305004edadec7c8e3ec

Substitude ISO_ variable in isolinux files
---
  isolinux/f1.txt -> isolinux/f1.txt.i686
  isolinux/f2.txt -> isolinux/f2.txt.i686
  isolinux/f3.txt -> isolinux/f3.txt.i686
  isolinux/generate-iso.sh                | +3/-3     
  isolinux/isolinux.cfg.i686              | +1/-1     
  isolinux/isolinux.cfg.x86_64            | +1/-1     
  mkfiles/iso.mk                          | +13/-4    
  7 files changed, 18 insertions(+), 9 deletions(-)

--- a/isolinux/generate-iso.sh
+++ b/isolinux/generate-iso.sh
@@ -4,11 +4,11 @@ cd ..
 
 touch .lunar-cd
 
-mkisofs -o ../unnamed.iso -R \
-        -V "unnamed" -v  \
+mkisofs -o ../lunar-linux.iso -R -J -l \
+        -V '%LABEL%' -v \
         -d -D -N -no-emul-boot -boot-load-size 4 -boot-info-table \
         -b isolinux/isolinux.bin \
         -c isolinux/boot.cat \
-        -A "unnamed" .
+        -A 'Lunar-%VERSION%' .
 
 rm -f .lunar.cd
@@ -1,5 +1,5 @@
 DEFAULT install
-APPEND ro initrd=initrd root=LABEL=Lunar-Linux_Mare_Ingenii readonlyroot rootdelay=10
+APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10
 DISPLAY f1.txt
 TIMEOUT 600
 PROMPT 1
@@ -1,5 +1,5 @@
 DEFAULT install
-APPEND ro initrd=initrd root=LABEL=Lunar-Linux_Mare_Ingenii readonlyroot rootdelay=10
+APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10
 DISPLAY f1.txt
 TIMEOUT 600
 PROMPT 1
--- a/mkfiles/iso.mk
+++ b/mkfiles/iso.mk
@@ -52,6 +52,8 @@ iso-strip: $(ISO_TARGET)/.iso-strip
 
 
 # Copy the isolinux files to the target
+ISOLINUX_FILES=README f1.txt f2.txt f3.txt f4.txt generate-iso.sh isolinux.cfg
+
 $(ISO_TARGET)/usr/share/syslinux/isolinux.bin: $(ISO_TARGET)/.iso-isolinux
 	@test -f $@
 	@touch $@
@@ -73,17 +75,24 @@ $(ISO_TARGET)/boot/initrd: $(ISO_TARGET)/.iso-isolinux
 $(ISO_TARGET)/isolinux/initrd: $(ISO_TARGET)/boot/initrd
 	@cp $< $@
 
+$(ISO_TARGET)/isolinux/%: $(ISO_SOURCE)/isolinux/%
+	@sed -e 's:%VERSION%:$(ISO_VERSION):g' -e 's:%CODENAME%:$(ISO_CODENAME):g' -e 's:%DATE%:$(ISO_DATE):g' -e 's:%KERNEL%:$(ISO_KERNEL):g' -e 's:%CNAME%:$(ISO_CNAME):g' -e 's:%COPYRIGHTYEAR%:$(ISO_COPYRIGHTYEAR):g' -e 's:%LABEL%:$(ISO_LABEL):' $< > $@
+
+$(ISO_TARGET)/isolinux/%: $(ISO_SOURCE)/isolinux/%.$(ISO_ARCH)
+	@sed -e 's:%VERSION%:$(ISO_VERSION):g' -e 's:%CODENAME%:$(ISO_CODENAME):g' -e 's:%DATE%:$(ISO_DATE):g' -e 's:%KERNEL%:$(ISO_KERNEL):g' -e 's:%CNAME%:$(ISO_CNAME):g' -e 's:%COPYRIGHTYEAR%:$(ISO_COPYRIGHTYEAR):g' -e 's:%LABEL%:$(ISO_LABEL):' $< > $@
+
 $(ISO_TARGET)/.iso-isolinux: iso-target
-	@cp -r $(ISO_SOURCE)/isolinux $(ISO_TARGET)
+	@echo iso-isolinux
+	@mkdir -p $(ISO_TARGET)/isolinux
 	@touch $@
 
-iso-isolinux: $(ISO_TARGET)/.iso-isolinux $(ISO_TARGET)/isolinux/isolinux.bin $(ISO_TARGET)/isolinux/linux $(ISO_TARGET)/isolinux/initrd
+iso-isolinux: $(ISO_TARGET)/.iso-isolinux $(ISO_TARGET)/isolinux/isolinux.bin $(ISO_TARGET)/isolinux/linux $(ISO_TARGET)/isolinux/initrd $(addprefix $(ISO_TARGET)/isolinux/, $(ISOLINUX_FILES))
 
 
 # Generate the actual image
 $(ISO_SOURCE)/lunar-$(ISO_VERSION).iso: iso-tools iso-files iso-isolinux iso-strip
 	mkisofs -o $@.tmp -R -J -l \
-		-V "Lunar-Linux_`echo -n $(ISO_CODENAME) | tr '[:space:]' _`" -v \
+	-V '$(ISO_LABEL) -v \
 	-d -D -N -no-emul-boot -boot-load-size 4 -boot-info-table \
 	-b isolinux/isolinux.bin \
 	-c isolinux/boot.cat \
@@ -103,6 +112,6 @@ $(ISO_SOURCE)/lunar-$(ISO_VERSION).iso: iso-tools iso-files iso-isolinux iso-str
 	-m '$(ISO_TARGET)/usr/src' \
 	-m '$(ISO_TARGET)/var/state/lunar/module_history' \
 	-m 'doc' \
-	-A "Lunar-$(ISO_VERSION)" $(ISO_TARGET)
+	-A 'Lunar-$(ISO_VERSION)' $(ISO_TARGET)
 	#mkhybrid $@.tmp
 	mv $@.tmp $@