'[Ipcop-svn] SF.net SVN: ipcop: [606] ipcop/trunk'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop: [606] ipcop/trunk
From:       chepati () users ! sourceforge ! net
Date:       2007-10-31 8:38:49
Message-ID: E1In969-0006tu-0V () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]

Revision: 606
          http://ipcop.svn.sourceforge.net/ipcop/?rev=606&view=rev
Author:   chepati
Date:     2007-10-31 01:38:48 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
All the *.img files should have the VERSION in their filename.  All, except on x86 \
where syslinux imposes the DOS 8.3 limit.

Modified Paths:
--------------
    ipcop/trunk/config/alpha/aboot-install.conf
    ipcop/trunk/config/ppc/yaboot-install.conf
    ipcop/trunk/config/sparc/silo-install.conf
    ipcop/trunk/lfs/cdrom
    ipcop/trunk/lfs/initrd

Modified: ipcop/trunk/config/alpha/aboot-install.conf
===================================================================
--- ipcop/trunk/config/alpha/aboot-install.conf	2007-10-31 08:11:10 UTC (rev 605)
+++ ipcop/trunk/config/alpha/aboot-install.conf	2007-10-31 08:38:48 UTC (rev 606)
@@ -1,4 +1,4 @@
-0:install ide=nodma initrd=instroot.img root=/dev/ram0 rw
-1:install ide=nodma initrd=instroot.img root=/dev/ram0 rw nopcmcia
-2:install ide=nodma initrd=instroot.img root=/dev/ram0 rw nousb
-3:install ide=nodma initrd=instroot.img root=/dev/ram0 rw nopcmcia nousb
+0:install ide=nodma initrd=instroot-VERSION.img root=/dev/ram0 rw
+1:install ide=nodma initrd=instroot-VERSION.img root=/dev/ram0 rw nopcmcia
+2:install ide=nodma initrd=instroot-VERSION.img root=/dev/ram0 rw nousb
+3:install ide=nodma initrd=instroot-VERSION.img root=/dev/ram0 rw nopcmcia nousb

Modified: ipcop/trunk/config/ppc/yaboot-install.conf
===================================================================
--- ipcop/trunk/config/ppc/yaboot-install.conf	2007-10-31 08:11:10 UTC (rev 605)
+++ ipcop/trunk/config/ppc/yaboot-install.conf	2007-10-31 08:38:48 UTC (rev 606)
@@ -5,7 +5,7 @@
 
 image=/boot/vmlinuz
 	label=install
-	initrd=/boot/instroot.img
+	initrd=/boot/instroot-VERSION.img
 	append="video=ofonly"
 	read-only
 

Modified: ipcop/trunk/config/sparc/silo-install.conf
===================================================================
--- ipcop/trunk/config/sparc/silo-install.conf	2007-10-31 08:11:10 UTC (rev 605)
+++ ipcop/trunk/config/sparc/silo-install.conf	2007-10-31 08:38:48 UTC (rev 606)
@@ -7,5 +7,5 @@
 # This will only work on Ultrasparcs
 image[sun4u]=/boot/vmlinuz64
 	label=install
-	initrd=/boot/instroot.img
+	initrd=/boot/instroot-VERSION.img
 	append="console=tty0 console=ttyS0,9600n8 video=atyfb:off"

Modified: ipcop/trunk/lfs/cdrom
===================================================================
--- ipcop/trunk/lfs/cdrom	2007-10-31 08:11:10 UTC (rev 605)
+++ ipcop/trunk/lfs/cdrom	2007-10-31 08:38:48 UTC (rev 606)
@@ -153,7 +153,7 @@
 								$(INSTALLER_DIR)/cdrom/README.txt
 	cp $(DIR_SRC)/doc/COPYING				$(INSTALLER_DIR)/cdrom/
 	cp $(INSTALLER_DIR)/images/*.img			$(INSTALLER_DIR)/cdrom/images
-	rm -f $(INSTALLER_DIR)/cdrom/images/cdinitrd.img
+	rm -f $(INSTALLER_DIR)/cdrom/images/cdinitrd-$(VERSION).img
 
 	mkdir -p $(INSTALLER_DIR)/cdrom/doc/{english,francais,deutsch}
 	cp $(DIR_DL)/*-en-*.pdf							$(INSTALLER_DIR)/cdrom/doc/english
@@ -171,7 +171,7 @@
 ifeq "$(MACHINE)" "i486"
 	mkdir -p						$(INSTALLER_DIR)/cdrom/boot/isolinux
 	dd if=/dev/zero  bs=1k count=2 \
                >			$(INSTALLER_DIR)/cdrom/boot/isolinux/boot.catalog
-	cp $(INSTALLER_DIR)/images/cdinitrd.img			$(INSTALLER_DIR)/cdrom/boot/isolinux/instroot.img
 +	cp $(INSTALLER_DIR)/images/cdinitrd-$(VERSION).img	$(INSTALLER_DIR)/cdrom/boot/isolinux/instroot.img
  cp /boot/vmlinuz-$(KVER)				$(INSTALLER_DIR)/cdrom/boot/isolinux/vmlinuz
 	cp $(DIR_SRC)/config/$(MACHINE)/syslinux.cfg		$(INSTALLER_DIR)/cdrom/boot/isolinux/isolinux.cfg
  sed -e 's/boot IPCop/boot IPCop \
$(VERSION)/'		$(DIR_SRC)/config/kernel/install-message > \ @@ -192,9 +192,10 @@
 ifeq "$(MACHINE)" "alpha"
 	mkdir -p $(INSTALLER_DIR)/cdrom/etc
 	cp /boot/vmlinuz-$(KVER)				$(INSTALLER_DIR)/cdrom/vmlinuz
-	cp $(INSTALLER_DIR)/images/cdinitrd.img			$(INSTALLER_DIR)/cdrom/boot/instroot.img
+	cp $(INSTALLER_DIR)/images/cdinitrd-$(VERSION).img	$(INSTALLER_DIR)/cdrom/boot/instroot-$(VERSION).img
  cp /boot/bootlx						$(INSTALLER_DIR)/cdrom
-	cp $(DIR_SRC)/config/$(MACHINE)/aboot-install.conf	$(INSTALLER_DIR)/cdrom/etc/aboot.conf
 +	cat $(DIR_SRC)/config/$(MACHINE)/aboot-install.conf | sed "s,VERSION,$(VERSION),g" \
> \ +								$(INSTALLER_DIR)/cdrom/etc/aboot.conf
 
 	cd $(INSTALLER_DIR)/cdrom && mkisofs			-r \
 								-V "$(NAME)_$(VERSION)" . > \
@@ -206,10 +207,11 @@
 	mkdir -p $(INSTALLER_DIR)/cdrom/boot
 	cp $(DIR_SRC)/config/cdrom/README_OldWorld_Macs.txt	$(INSTALLER_DIR)/cdrom
 	cp /boot/vmlinuz-$(KVER)				$(INSTALLER_DIR)/cdrom/boot/vmlinuz
-	cp $(INSTALLER_DIR)/images/cdinitrd.img			$(INSTALLER_DIR)/cdrom/boot/instroot.img
-	cp $(DIR_SRC)/config/$(MACHINE)/yaboot-cdinstall.conf	$(INSTALLER_DIR)/cdrom/boot/yaboot.conf
 +	cp $(INSTALLER_DIR)/images/cdinitrd-$(VERSION).img	$(INSTALLER_DIR)/cdrom/boot/instroot-$(VERSION).img
 +	cat $(DIR_SRC)/config/$(MACHINE)/yaboot-install.conf  | sed \
"s,VERSION,$(VERSION),g" > \ +								$(INSTALLER_DIR)/cdrom/boot/yaboot.conf
 	cp /usr/lib/yaboot/yaboot				$(INSTALLER_DIR)/cdrom/boot
-	cp $(DIR_SRC)/config/$(MACHINE)/ofboot-cdinstall.b	$(INSTALLER_DIR)/cdrom/boot/ofboot.b
 +	cp $(DIR_SRC)/config/$(MACHINE)/ofboot-install.b	$(INSTALLER_DIR)/cdrom/boot/ofboot.b
  sed -e 's/boot IPCop/boot IPCop \
$(VERSION)/'		$(DIR_SRC)/config/kernel/install-message > \  \
$(INSTALLER_DIR)/cdrom/boot/message  
@@ -228,8 +230,9 @@
 	mkdir -p						$(INSTALLER_DIR)/cdrom/boot
 	cp -a /boot/{isofs,second}.b				$(INSTALLER_DIR)/cdrom/boot
 	cp /boot/vmlinuz-$(KVER)				$(INSTALLER_DIR)/cdrom/boot/vmlinuz64
-	cp $(INSTALLER_DIR)/images/cdinitrd.img			$(INSTALLER_DIR)/cdrom/boot/instroot.img
-	cp $(DIR_SRC)/config/$(MACHINE)/silo-install.conf	$(INSTALLER_DIR)/cdrom/boot/silo.conf
 +	cp $(INSTALLER_DIR)/images/cdinitrd-$(VERSION).img	$(INSTALLER_DIR)/cdrom/boot/instroot-$(VERSION).img
 +	cat $(DIR_SRC)/config/$(MACHINE)/silo-install.conf | sed "s,VERSION,$(VERSION),g" \
> \ +								$(INSTALLER_DIR)/cdrom/boot/silo.conf
 	sed -e 's/boot IPCop/boot IPCop \
$(VERSION)/'		$(DIR_SRC)/config/kernel/install-message > \  \
$(INSTALLER_DIR)/cdrom/boot/message  

Modified: ipcop/trunk/lfs/initrd
===================================================================
--- ipcop/trunk/lfs/initrd	2007-10-31 08:11:10 UTC (rev 605)
+++ ipcop/trunk/lfs/initrd	2007-10-31 08:38:48 UTC (rev 606)
@@ -57,7 +57,7 @@
 ###############################################################################
 
 $(TARGET) :
-	rm -f $(INSTALLER_DIR)/images/{cdinitrd.img,root-*.img}
+	rm -f $(INSTALLER_DIR)/images/{cdinitrd-$(VERSION).img,root-$(VERSION).img}
 
 	# Do stuff that's common for initrd for floppy and cd
 
@@ -112,13 +112,13 @@
 	cd $(INSTALLER_DIR)/mnt && find . | cpio -o -H newc | gzip -9 > \
$(INSTALLER_DIR)/images/root-$(VERSION).img  
 	# Create a file list for root floppy
-	-rm $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root.list \
$(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root-*.img +	-rm \
$(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root.list \
$(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root-$(VERSION).img  cd $(INSTALLER_DIR)/mnt && \
find ./ -type d | sed 's!\./!!g' | sort > \
$(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root.list  # we hide errors there listing empty \
                directories
 	-cd $(INSTALLER_DIR)/mnt && \
 		for dir in `cat $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root.list`; do \
 			echo $$dir >> $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root-$(VERSION).img; \
-			ls -s1 $$dir/* >> $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root.img 2>/dev/null; \
+			ls -s1 $$dir/* >> $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root-$(VERSION).img \
2>/dev/null; \  done
 	rm $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root.list
 
@@ -154,7 +154,7 @@
 	cd $(INSTALLER_DIR)/mnt && tar xzf $(INSTALLER_DIR)/images/drivers-$(VERSION).img
 	cd $(INSTALLER_DIR)/mnt && tar xzf $(INSTALLER_DIR)/images/scsidrv-$(VERSION).img
 	touch $(INSTALLER_DIR)/mnt/CDROMBOOT
-	cd $(INSTALLER_DIR)/mnt && find . | cpio -o -H newc | gzip -9 > \
$(INSTALLER_DIR)/images/cdinitrd.img +	cd $(INSTALLER_DIR)/mnt && find . | cpio -o -H \
newc | gzip -9 > $(INSTALLER_DIR)/images/cdinitrd-$(VERSION).img  
 	rm -rf $(INSTALLER_DIR)/mnt/*
 	# yes we want it rebuilt at each time, so no POSTBUILD


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic