[Lunar-commits] r14887 - in lunar-iso/trunk: . scripts

[Auke Kok]

Author: sofar
Date: 2005-05-20 20:03:12 +0000 (Fri, 20 May 2005)
New Revision: 14887

Removed:
   lunar-iso/trunk/scripts/isolinux
Modified:
   lunar-iso/trunk/Makefile
   lunar-iso/trunk/scripts/isofs
Log:
Remove isolinux script, merged changes into 'isofs' script which finishes off everything.


Modified: lunar-iso/trunk/Makefile
===================================================================
--- lunar-iso/trunk/Makefile	2005-05-20 18:47:46 UTC (rev 14886)
+++ lunar-iso/trunk/Makefile	2005-05-20 20:03:12 UTC (rev 14887)
@@ -20,16 +20,11 @@
 
 all: iso
 
-iso: isolinux $(ISO_TARGET)/.iso
+iso: initrd proper $(ISO_TARGET)/.iso
 $(ISO_TARGET)/.iso:
-	@echo "Generating .iso file"
+	@echo "Generating ISO"
 	@scripts/isofs
 
-isolinux: proper memtest $(ISO_TARGET)/isolinux
-$(ISO_TARGET)/isolinux:
-	@echo "Generating isolinux files"
-	@scripts/isolinux
-
 proper: aaa_dev aaa_base $(ISO_TARGET)/.proper
 $(ISO_TARGET)/.proper:
 	@echo "Cleaning BUILD"

Modified: lunar-iso/trunk/scripts/isofs
===================================================================
--- lunar-iso/trunk/scripts/isofs	2005-05-20 18:47:46 UTC (rev 14886)
+++ lunar-iso/trunk/scripts/isofs	2005-05-20 20:03:12 UTC (rev 14887)
@@ -17,9 +17,6 @@
 cp lunar-install/init.d/lunar-install $ISO_TARGET/etc/init.d/
 cp lunar-install/sbin/lunar-install $ISO_TARGET/sbin/
 ln -s /etc/init.d/lunar-install $ISO_TARGET/etc/rc2.d/S20lunar-install
-sedit "s:%VERSION%:${ISO_VERSION}:g" $ISO_TARGET/sbin/lunar-install $ISO_TARGET/etc/motd
-sedit "s:%CODENAME%:${ISO_CODENAME}:g" $ISO_TARGET/sbin/lunar-install $ISO_TARGET/etc/motd
-sedit "s:%ISO_DATE%:${ISO_DATE}:g" $ISO_TARGET/sbin/lunar-install $ISO_TARGET/etc/motd
 cp $ISO_SOURCE/lunar-install/etc/inittab $ISO_TARGET/etc/
 
 echo "+ adding isolinux code"
@@ -31,13 +28,12 @@
 cp $ISO_SOURCE/kernels/safe $ISO_TARGET/isolinux/
 cp $ISO_SOURCE/memtest/memtest $ISO_TARGET/isolinux/
 
-cd $ISO_SOURCE/isolinux
-for file in f{1,2,3}.txt boot.cat isolinux.bin isolinux.cfg ; do
-  VERBOSE=off
-  cp $file $ISO_TARGET/isolinux
-  sedit "s:%VERSION%:${ISO_VERSION}:g" $ISO_TARGET/isolinux/f?.txt
-  sedit "s:%CODENAME%:${ISO_CODENAME}:g" $ISO_TARGET/isolinux/f?.txt
-  sedit "s:%KERNEL%:${ISO_KVER}:g" $ISO_TARGET/isolinux/f?.txt
+cp $ISO_SOURCE/isolinux/{f{1,2,3}.txt,boot.cat,isolinux.{bin,cfg},generate-iso.sh,README} $ISO_TARGET/isolinux/
+
+for file in $ISO_TARGET/isolinux/{f{1,2,3}.txt,boot.cat,isolinux.{bin,cfg}} $ISO_TARGET/etc/motd $ISO_TARGET/etc/motd $ISO_TARGET/sbin/lunar-install ; do
+  sed -i -e "s:%VERSION%:${ISO_VERSION}:g" \
+         -e "s:%CODENAME%:${ISO_CODENAME}:g" \
+         -e "s:%KERNEL%:${ISO_KVER}:g" $file
 done
 
 echo "+ copying package listing"

Deleted: lunar-iso/trunk/scripts/isolinux