[PATCH] elkscmd: sys_utils buildsystem fix

[PATCH] elkscmd: sys_utils buildsystem fix

[claudio]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 483 bytes --]


This patch links the binaries to the libc utent instead of the
local implementation. It seems that it has been added to libc later
and the local definition was not removed.

Also reordered the binary list to use the same order in all lists,
so it's easier to see what goes in each disk image type.

utent.c can be removed from sys/utils if everything goes well with
the libc version.


 Makefile |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

[-- Attachment #2: Type: TEXT/PLAIN, Size: 2493 bytes --]

Index: sys_utils/Makefile
===================================================================
RCS file: /cvsroot/elks/elkscmd/sys_utils/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- sys_utils/Makefile	4 Jun 2004 03:36:42 -0000	1.19
+++ sys_utils/Makefile	9 Jun 2004 19:11:42 -0000
@@ -6,7 +6,8 @@
 #
 # 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 swapon meminfo \
+		  reboot umount
 MIN_LIB 	= 
 MIN_SBIN	= clock exitemu getty init reboot
 MIN_USR_BIN	= meminfo passwd
@@ -28,19 +29,21 @@
 STD_USR_BIN	= man who
 STD_USR_LIB	= 
 STD_USR_MAN	= clock.8 getty.1 kill.1 knl.8 login.1 man.1 mount.8 \
-		  passwd.1 ps.1 reboot.8 umount.8 who.1
+		  passwd.1 ps.1 reboot.8 umount.8 who.1 swapon.1
 STD_USR_SBIN	= 
 
 include $(BASEDIR)/Make.rules
 
 ###############################################################################
 
-PRGS		= getty kill man mount reboot umount clock exitemu who ps \
-		  init login passwd knl meminfo
+PRGS		= init getty login kill mount umount passwd reboot ps \
+		  swapon meminfo who clock exitemu knl man
 
-NETPRGS=init getty login kill mount umount passwd reboot ps swapon meminfo who
+NETPRGS		= init getty login kill mount umount passwd reboot ps \
+		  swapon meminfo who
 
-MIN_PRGS=init getty login kill mount reboot umount clock exitemu ps swapon meminfo
+MIN_PRGS	= init getty login kill mount umount passwd ps clock \
+		  exitemu swapon meminfo
 
 SMIN_PRGS	= init mount umount
 
@@ -64,9 +67,6 @@
 passwd: getpass.o passwd.o putpwent.o
 
 
-utent.o: utent.c
-	$(CC) $(CFLAGS) -c utent.c
-
 # Trim stack space of core programs.
 # The -H option is the maximum size the data segment can be.
 # If the code is modified, this value has to be carefully trimmed
@@ -83,8 +83,8 @@
 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
+new_init: init.c
+	$(CC) $(CFLAGS) $(LDFLAGS) init.c -o init
 
 init: init.c 
 	$(CC) $(CFLAGS) $(LDFLAGS) init.c -o init -H 2000
@@ -92,5 +92,5 @@
 rdev: rdev.c 
 	$(CC) $(CFLAGS) $(LDFLAGS) rdev.c -o rdev
 
-login: getpass.o login.o utent.o
-	$(CC) $(CFLAGS) $(LDFLAGS) getpass.o login.o utent.o -o login -H 2000
+login: getpass.o login.o
+	$(CC) $(CFLAGS) $(LDFLAGS) getpass.o login.o -o login -H 2000

** Applied ** Re: [PATCH] elkscmd: sys_utils buildsystem fix

[Miguel Bolanos]

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

Applied thanks

Mike

On Wed, 2004-06-09 at 13:39, claudio@conectiva.com wrote:
> This patch links the binaries to the libc utent instead of the
> local implementation. It seems that it has been added to libc later
> and the local definition was not removed.
> 
> Also reordered the binary list to use the same order in all lists,
> so it's easier to see what goes in each disk image type.
> 
> utent.c can be removed from sys/utils if everything goes well with
> the libc version.
> 
> 
>  Makefile |   26 +++++++++++++-------------
>  1 files changed, 13 insertions(+), 13 deletions(-)
-- 
--------------------miguel bolanos, systems administrator, linuxlabs
... ........ ..... ....                 230 peachtree st nw ste 2701
the original linux labs                          atlanta.ga.us 30303
       -since 1995                          http://www.linuxlabs.com
                                office 404.577.7747 fax 404.577.7743
--------------------------------------------------------------------

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]