Re: [PATCH] elkscmd: rebuild disk images

[Tommy McCabe <rocketjet314@yahoo.com>]

--- claudio@conectiva.com wrote:
> 
> The attached patch allows one to rebuild the disk
> images provided
> that:
> 
>   1. root runs make full3
>   2. /bin and /boot are added to the rootfs template
> (I also
>      added /lib, /home, /mnt to mine)
>   3. your MAKEDEV script works (Tommy is working on
> that)
>   4. path to dev86 is correctly set in the build
> system
> 
> 
>  Makefile          |    3 ++-
>  bc/Makefile       |   13 +++++++------
>  disk_utils/mkfs.c |    2 +-
>  3 files changed, 10 insertions(+), 8 deletions(-)
> 
> (Miguel prefers attached patches to inline, so I'm
> sending them
> attached. If anybody thinks inline is better for
> reviewing and
> for archival purposes, I can send an inline version
> as well.)
> > Index: Makefile

Hey! I provided a patch to remove the # in
disk_utils/mkfs.c, but it was rejected. I knew this
caused some sort of error!


===================================================================
> RCS file: /cvsroot/elks/elkscmd/Makefile,v
> retrieving revision 1.20
> diff -u -r1.20 Makefile
> --- Makefile	2 Jun 2004 20:38:03 -0000	1.20
> +++ Makefile	3 Jun 2004 21:53:48 -0000
> @@ -119,7 +119,8 @@
>  # Create relevant parts of other packages.
>  
>  $(FD_BSECT):
> -	make -C $(MINIX_BOOT) bin
> +	make -C $(MINIX_BOOT)
> +	make -C $(MINIX_BOOT) minix.bin
>  
>  $(KHELPER):
>  	make -C $(MINIX_BOOT)
> Index: bc/Makefile
>
===================================================================
> RCS file: /cvsroot/elks/elkscmd/bc/Makefile,v
> retrieving revision 1.11
> diff -u -r1.11 Makefile
> --- bc/Makefile	1 Jun 2004 13:30:22 -0000	1.11
> +++ bc/Makefile	3 Jun 2004 21:53:51 -0000
> @@ -2,12 +2,15 @@
>  #
>  # A makefile for bc.  This is part of the bc/sbc
> distribution.
>  #
> +
> +BASEDIR 	= ..
> +
> +include $(BASEDIR)/Make.defs
> +
> 
>
###############################################################################
>  #
>  # Include standard packaging commands.
>  
> -BASEDIR 	= ..
> -
>  MIN_BIN 	= 
>  MIN_LIB 	= 
>  MIN_SBIN	= 
> @@ -27,13 +30,11 @@
>  STD_BIN 	= 
>  STD_LIB 	= 
>  STD_SBIN	= 
> -STD_USR_BIN	= 
> +STD_USR_BIN	=
>  STD_USR_LIB	= 
>  STD_USR_MAN	= 
>  STD_USR_SBIN	= 
>  
> -include $(BASEDIR)/Make.rules
> -
> 
>
###############################################################################
>  #
>  #  Make sure these have the correct directories for
> your machine.
> @@ -72,7 +73,7 @@
>  
>  math.h: libmath.b
>  	$(MAKE) -$(MAKEFLAGS) fbc
> -	/lib/elksemu ./fbc -c libmath.b </dev/null >math.h
> +	elksemu ./fbc -c libmath.b </dev/null >math.h
>  	./fix_math.h
>  	rm -f ./fbc
>  
> Index: disk_utils/mkfs.c
>
===================================================================
> RCS file: /cvsroot/elks/elkscmd/disk_utils/mkfs.c,v
> retrieving revision 1.3
> diff -u -r1.3 mkfs.c
> --- disk_utils/mkfs.c	20 Jul 2002 21:46:15 -0000	1.3
> +++ disk_utils/mkfs.c	3 Jun 2004 21:53:51 -0000
> @@ -162,7 +162,7 @@
>  	exit(status);
>  }
>  
> -#define usage() fatal_error("Usage: mkfs /dev/name
> blocks # Max blocks=65535\n",16)
> +#define usage() fatal_error("Usage: mkfs /dev/name
> blocks (Max blocks=65535)\n",16)
>  #define die(str) fatal_error("mkfs: " str "\n",8)
>  
>  void write_tables(void)
> 


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com