From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tommy McCabe <rocketjet314@yahoo.com>
Subject: Cleanup patch
Date: Fri, 4 Jun 2004 18:56:55 -0700 (PDT)
Sender: linux-8086-owner@vger.kernel.org
Message-ID: <20040605015655.38924.qmail@web51301.mail.yahoo.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="0-623827809-1086400615=:38875"
Return-path: <linux-8086-owner@vger.kernel.org>
List-Id: <linux-8086.vger.kernel.org>
To: linux-8086@vger.kernel.org

--0-623827809-1086400615=:38875
Content-Type: text/plain; charset=us-ascii
Content-Id: 
Content-Disposition: inline

This patch cleans up the routines for copying
rootfs_template into /mnt/test, removing mention of rootfs_template.tar.

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 
--0-623827809-1086400615=:38875
Content-Type: text/x-diff; name="otherpatch.diff"
Content-Description: otherpatch.diff
Content-Disposition: inline; filename="otherpatch.diff"

--- ./elkscurr/elkscmd/Makefile	2004-06-04 21:51:55.000000000 -0400
+++ ./elks/elkscmd/Makefile	2004-06-04 21:49:50.000000000 -0400
@@ -156,46 +156,39 @@
 mount_combfs: $(COMB_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
 	$(MKFS) $(MKFS_OPTS) $(COMB_TARGET_FS) $(COMB_TARGET_BLKS)
 	sudo -u root mount $(COMB_TARGET_FS) $(TARGET_MNT) $(LOOP)
-	(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
-		(cd $(TARGET_MNT) ; tar xpvf -)
-	(cd $(TARGET_MNT)/dev ; ./MAKEDEV)
+	cd $(TARGET_MNT); cp -r $(ELKSCMD_DIR)/rootfs_template ./
+	./dev/MAKEDEV
 
 mount_full3fs: $(FULL3_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
 	$(MKFS) $(MKFS_OPTS) $(FULL3_TARGET_FS) $(FULL3_TARGET_BLKS)
 	sudo -u root mount $(FULL3_TARGET_FS) $(TARGET_MNT) $(LOOP)
-	(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
-		(cd $(TARGET_MNT) ; tar xpvf -)
-	(cd $(TARGET_MNT)/dev ; ./MAKEDEV)
+	cd $(TARGET_MNT); cp -r $(ELKSCMD_DIR)/rootfs_template ./
+	./dev/MAKEDEV
 
 mount_full5fs: $(FULL5_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
 	$(MKFS) $(MKFS_OPTS) $(FULL5_TARGET_FS) $(FULL5_TARGET_BLKS)
 	sudo -u root mount $(FULL5_TARGET_FS) $(TARGET_MNT) $(LOOP)
-	(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
-		(cd $(TARGET_MNT) ; tar xpvf -)
-	(cd $(TARGET_MNT)/dev ; ./MAKEDEV)
+	cd $(TARGET_MNT); cp -r $(ELKSCMD_DIR)/rootfs_template ./
+	./dev/MAKEDEV
 
 mount_rootfs: $(ROOT_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
 	$(MKFS) $(MKFS_OPTS) $(ROOT_TARGET_FS) $(ROOT_TARGET_BLKS)
 	sudo -u root mount $(ROOT_TARGET_FS) $(TARGET_MNT) $(LOOP)
-	(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
-		(cd $(TARGET_MNT) ; tar xpvf -)
-	(cd $(TARGET_MNT)/dev ; ./MAKEDEV)
+	cd $(TARGET_MNT); cp -r $(ELKSCMD_DIR)/rootfs_template ./
+	./dev/MAKEDEV
 
 mount_rootnetfs: $(ROOT_NET_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
 	$(MKFS) $(MKFS_OPTS) $(ROOT_NET_TARGET_FS) $(ROOT_NET_TARGET_BLKS)
 	sudo -u root mount $(ROOT_NET_TARGET_FS) $(TARGET_MNT) $(LOOP)
-	(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
-		(cd $(TARGET_MNT) ; tar xpvf -)
-	(cd $(TARGET_MNT)/dev ; ./MAKEDEV)
+	cd $(TARGET_MNT); cp -r $(ELKSCMD_DIR)/rootfs_template ./
+	./dev/MAKEDEV
 	
 mount_sibofs: $(SIBO_TARGET_FS) $(ELKSCMD_DIR)/rootfs_template/etc/issue
 	$(MKFS) $(MKFS_OPTS) $(SIBO_TARGET_FS) $(SIBO_TARGET_BLKS)
 	sudo -u root mount $(SIBO_TARGET_FS) $(TARGET_MNT) $(LOOP)
-	(cd $(ELKSCMD_DIR)/rootfs_template ; tar cf - --exclude CVS *) | \
-		(cd $(TARGET_MNT) ; tar xpvf -)
-	(cd $(TARGET_MNT) ; rm -rf home boot root var)
-	cp SIBODEV $(TARGET_MNT)/dev/SIBODEV
-	(cd $(TARGET_MNT)/dev ; ./SIBODEV ; rm -f MAKEDEV SIBODEV )
+	cd $(TARGET_MNT); cp -r $(ELKSCMD_DIR)/rootfs_template ./
+	rm -rf home boot root var; cp $(ELKSCMD_DIR)/SIBODEV ./dev
+	cd ./dev; ./SIBODEV
 	
 
 #rfs: mount_rfs
@@ -225,6 +218,10 @@
 	dd if=$(FD_BSECT) of=$(FULL3_TARGET_FS) bs=512 count=2 conv=notrunc
 
 full5: mount_full3fs $(ELKS_DIR)/arch/i86/boot/Image $(FD_BSECT) $(KHELPER)
+	cd $(ELKSNET_DIR)/ktcp ; \
+	make ; \
+	mkdir -p $(TARGET_MNT)/bin
+	cp -p -f ktcp $(TARGET_MNT)/bin
 	@for i in $(DIRS); do make -C $$i rfs ; done
 	cp $(ELKS_DIR)/arch/i86/boot/Image $(TARGET_MNT)/boot/linux
 	cp $(KHELPER) $(TARGET_MNT)/boot/boot
@@ -238,6 +235,7 @@
 comb_net: mount_rootnetfs $(ELKS_DIR)/arch/i86/boot/Image $(FD_BSECT) $(KHELPER)
 	cd $(ELKSNET_DIR)/ktcp ; \
 	make ; \
+	mkdir -p $(TARGET_MNT)/bin
 	cp -p -f ktcp $(TARGET_MNT)/bin
 	@for i in $(DIRS); do make -C $$i net_rfs ; done
 	cp $(ELKS_DIR)/arch/i86/boot/Image $(TARGET_MNT)/boot/linux

--0-623827809-1086400615=:38875--