Broken-up patch #9

Broken-up patch #9

[Tommy McCabe]

Removes references to nonexistent programs.

diff -ruN ./elks-stuff/elkscmd/sys_utils/Makefile
./elks/elkscmd/sys_utils/Makefile
--- ./elks-stuff/elkscmd/sys_utils/Makefile	2004-05-28
16:02:01.000000000 -0400
+++ ./elks/elkscmd/sys_utils/Makefile	2004-04-21
17:38:24.000000000 -0400
@@ -6,7 +6,7 @@
 #
 # Include standard packaging commands.
 
-MIN_BIN 	= getty init kill login mount passwd ps
swapon meminfo reboot umount
+MIN_BIN 	= getty init kill login mount passwd ps
meminfo reboot umount
 MIN_LIB 	= 
 MIN_SBIN	= clock exitemu getty init reboot
 MIN_USR_BIN	= meminfo passwd
@@ -36,26 +36,29 @@

###############################################################################
 
 PRGS		= getty kill man mount reboot umount clock
exitemu who ps \
-		  init login passwd knl
+		  init login passwd knl meminfo
 
-NETPRGS=init getty login kill mount umount passwd
reboot ps swapon meminfo who
+NETPRGS=init getty login kill mount umount passwd
reboot ps meminfo who
 
-MIN_PRGS=init getty login kill mount reboot umount
clock exitemu ps swapon meminfo
+MIN_PRGS=init getty login kill mount reboot umount
clock exitemu ps meminfo
 
 SMIN_PRGS	= init mount umount
 
 all: $(PRGS)
 
 rfs: all
+	mkdir $(TARGET_MNT)/bin
 	cp -p $(PRGS) $(TARGET_MNT)/bin
 	
 net_rfs: all
 	cp -p $(NETPRGS) $(TARGET_MNT)/bin
 
 min_rfs: all
+	mkdir $(TARGET_MNT)/bin
 	cp -p $(MIN_PRGS) $(TARGET_MNT)/bin
 
 smin_rfs: all
+	mkdir $(TARGET_MNT)/bin
 	cp -p $(SMIN_PRGS) $(TARGET_MNT)/bin
 
 clean:
@@ -80,9 +83,6 @@
 meminfo: meminfo.c
 	$(CC) $(CFLAGS) $(LDFLAGS) meminfo.c -o meminfo -H
100
 
-swapon: swapon.c
-	$(CC) $(CFLAGS) $(LDFLAGS) swapon.c -o swapon -H 100
-
 new_init: init.c utent.o
 	$(CC) $(CFLAGS) $(LDFLAGS) init.c utent.o -o init
 


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

Re: Broken-up patch #9

[Miguel Bolanos]

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

Greetings.

OK i also cleaned up a little bit this patch.

First of all, i did not yet remove the swapon, ... yes indeed there is
no swapon.c or similar.. Paul do u have any clue of what happened with
this file? 

I did include ur fix to add meminfo to the PRGS.

Fixed your mkdir stuff to use -p and added one of this lines for net_rfs
as well, now this looks like a dirty hack to me.. and I don't quite like
it, but we will use this for now.. at least while we get a cleaner
solution ready.
see my attached file.

best wishes

Mike

On Fri, 2004-05-28 at 17:17, Tommy McCabe wrote:
> Removes references to nonexistent programs.
> 
> diff -ruN ./elks-stuff/elkscmd/sys_utils/Makefile
> ./elks/elkscmd/sys_utils/Makefile
> --- ./elks-stuff/elkscmd/sys_utils/Makefile	2004-05-28
> 16:02:01.000000000 -0400
> +++ ./elks/elkscmd/sys_utils/Makefile	2004-04-21
> 17:38:24.000000000 -0400
> @@ -6,7 +6,7 @@
>  #
>  # Include standard packaging commands.
>  
> -MIN_BIN 	= getty init kill login mount passwd ps
> swapon meminfo reboot umount
> +MIN_BIN 	= getty init kill login mount passwd ps
> meminfo reboot umount
>  MIN_LIB 	= 
>  MIN_SBIN	= clock exitemu getty init reboot
>  MIN_USR_BIN	= meminfo passwd
> @@ -36,26 +36,29 @@
> 
> ###############################################################################
>  
>  PRGS		= getty kill man mount reboot umount clock
> exitemu who ps \
> -		  init login passwd knl
> +		  init login passwd knl meminfo
>  
> -NETPRGS=init getty login kill mount umount passwd
> reboot ps swapon meminfo who
> +NETPRGS=init getty login kill mount umount passwd
> reboot ps meminfo who
>  
> -MIN_PRGS=init getty login kill mount reboot umount
> clock exitemu ps swapon meminfo
> +MIN_PRGS=init getty login kill mount reboot umount
> clock exitemu ps meminfo
>  
>  SMIN_PRGS	= init mount umount
>  
>  all: $(PRGS)
>  
>  rfs: all
> +	mkdir $(TARGET_MNT)/bin
>  	cp -p $(PRGS) $(TARGET_MNT)/bin
>  	
>  net_rfs: all
>  	cp -p $(NETPRGS) $(TARGET_MNT)/bin
>  
>  min_rfs: all
> +	mkdir $(TARGET_MNT)/bin
>  	cp -p $(MIN_PRGS) $(TARGET_MNT)/bin
>  
>  smin_rfs: all
> +	mkdir $(TARGET_MNT)/bin
>  	cp -p $(SMIN_PRGS) $(TARGET_MNT)/bin
>  
>  clean:
> @@ -80,9 +83,6 @@
>  meminfo: meminfo.c
>  	$(CC) $(CFLAGS) $(LDFLAGS) meminfo.c -o meminfo -H
> 100
>  
> -swapon: swapon.c
> -	$(CC) $(CFLAGS) $(LDFLAGS) swapon.c -o swapon -H 100
> -
>  new_init: init.c utent.o
>  	$(CC) $(CFLAGS) $(LDFLAGS) init.c utent.o -o init
>  
> 
> 
> 	
> 		
> __________________________________
> Do you Yahoo!?
> Friends.  Fun.  Try the all-new Yahoo! Messenger.
> http://messenger.yahoo.com/
> -
> 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
> 

[-- Attachment #2: elkscmd-sysfiles.patch --]
[-- Type: text/x-patch, Size: 823 bytes --]

--- elkscmd.orig/sys_utils/Makefile	2004-05-31 23:08:16.000000000 -0600
+++ elkscmd/sys_utils/Makefile	2004-05-31 23:45:23.000000000 -0600
@@ -36,7 +36,7 @@
 ###############################################################################
 
 PRGS		= getty kill man mount reboot umount clock exitemu who ps \
-		  init login passwd knl
+		  init login passwd knl meminfo
 
 NETPRGS=init getty login kill mount umount passwd reboot ps swapon meminfo who
 
@@ -47,15 +47,19 @@
 all: $(PRGS)
 
 rfs: all
+	mkdir -p $(TARGET_MNT)/bin
 	cp -p $(PRGS) $(TARGET_MNT)/bin
 	
 net_rfs: all
+	mkdir -p $(TARGET_MNT)/bin
 	cp -p $(NETPRGS) $(TARGET_MNT)/bin
 
 min_rfs: all
+	mkdir -p $(TARGET_MNT)/bin
 	cp -p $(MIN_PRGS) $(TARGET_MNT)/bin
 
 smin_rfs: all
+	mkdir -p $(TARGET_MNT)/bin
 	cp -p $(SMIN_PRGS) $(TARGET_MNT)/bin
 
 clean: