public inbox for linux-8086@vger.kernel.org
 help / color / mirror / Atom feed
* Cleanup patch
@ 2004-06-05  1:56 Tommy McCabe
  2004-06-05 13:06 ` claudio
  0 siblings, 1 reply; 3+ messages in thread
From: Tommy McCabe @ 2004-06-05  1:56 UTC (permalink / raw)
  To: linux-8086

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

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 

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: otherpatch.diff --]
[-- Type: text/x-diff; name="otherpatch.diff", Size: 3614 bytes --]

--- ./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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Cleanup patch
  2004-06-05  1:56 Cleanup patch Tommy McCabe
@ 2004-06-05 13:06 ` claudio
  2004-06-05 17:16   ` Tommy McCabe
  0 siblings, 1 reply; 3+ messages in thread
From: claudio @ 2004-06-05 13:06 UTC (permalink / raw)
  To: Tommy McCabe; +Cc: linux-8086

On Fri, 4 Jun 2004, Tommy McCabe wrote:

> This patch cleans up the routines for copying
> rootfs_template into /mnt/test, removing mention of rootfs_template.tar.
>
>  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
>

Copying with tar and excluding CVS is probably a better idea than using cp,
so you won't have problem with symlinks or special files, and won't copy CVS
metadata.

Also the sudo won't help here if used only for mounting the device, it's
a better idea to run the entire make with sudo otherwise you won't be able
to create the device nodes and set the correct permissions on files.

Perhaps we could write a single disk image building target and pass parameters
to it from the image specific targets.


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Cleanup patch
  2004-06-05 13:06 ` claudio
@ 2004-06-05 17:16   ` Tommy McCabe
  0 siblings, 0 replies; 3+ messages in thread
From: Tommy McCabe @ 2004-06-05 17:16 UTC (permalink / raw)
  To: linux-8086

--- claudio@conectiva.com wrote:
> On Fri, 4 Jun 2004, Tommy McCabe wrote:
> 
> > This patch cleans up the routines for copying
> > rootfs_template into /mnt/test, removing mention
> of rootfs_template.tar.
> >
> >  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
> >
> 
> Copying with tar and excluding CVS is probably a
> better idea than using cp,
> so you won't have problem with symlinks or special
> files, and won't copy CVS
> metadata.

Symlinks and special file can be taken care of with
-a, or -dpR.

> Also the sudo won't help here if used only for
> mounting the device, it's
> a better idea to run the entire make with sudo
> otherwise you won't be able
> to create the device nodes and set the correct
> permissions on files.

Good point. Feel free to add sudo wherever necessary.

> Perhaps we could write a single disk image building
> target and pass parameters
> to it from the image specific targets.
> 
> -
> To unsubscribe from this list: send the line
> "unsubscribe linux-8086" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at 
http://vger.kernel.org/majordomo-info.html



	
		
__________________________________
Do you Yahoo!?
Friends.  Fun.  Try the all-new Yahoo! Messenger.
http://messenger.yahoo.com/ 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2004-06-05 17:16 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-06-05  1:56 Cleanup patch Tommy McCabe
2004-06-05 13:06 ` claudio
2004-06-05 17:16   ` Tommy McCabe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox