[Ipcop-svn] SF.net SVN: ipcop: [463] ipcop/trunk/lfs/initrd

[<ges...@us...>]

Revision: 463
          http://ipcop.svn.sourceforge.net/ipcop/?rev=463&view=rev
Author:   gespinasse
Date:     2007-07-28 18:25:12 -0700 (Sat, 28 Jul 2007)

Log Message:
-----------
Include VERSION in root img file name

Modified Paths:
--------------
    ipcop/trunk/lfs/initrd

Modified: ipcop/trunk/lfs/initrd
===================================================================
--- ipcop/trunk/lfs/initrd	2007-07-29 00:16:11 UTC (rev 462)
+++ ipcop/trunk/lfs/initrd	2007-07-29 01:25:12 UTC (rev 463)
@@ -57,7 +57,7 @@
 ###############################################################################
 
 $(TARGET) :
-	rm -f $(INSTALLER_DIR)/images/{cdinitrd.img,root.img}
+	rm -f $(INSTALLER_DIR)/images/{cdinitrd.img,root-*.img}
 
 	# Do stuff that's common for initrd for floppy and cd
 
@@ -108,15 +108,15 @@
 	cd $(INSTALLER_DIR)/mnt && find ./lib -maxdepth 1 -type f -exec $(TOOLS_DIR)/bin/strip --strip-all '{}' ';'
 
 	# Now squash everything and put it in root.img
-	mksquashfs $(INSTALLER_DIR)/mnt $(INSTALLER_DIR)/images/root.img -no-progress
+	mksquashfs $(INSTALLER_DIR)/mnt $(INSTALLER_DIR)/images/root-$(VERSION).img -no-progress
 
 	# 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-*.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.img; \
+			echo $$dir >> $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root-$(VERSION).img; \
 			ls -s1 $$dir/* >> $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root.img 2>/dev/null; \
 		done
 	rm $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root.list


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