Re: cvs commit: src Makefile.inc1 src/lib/libc/gen uname.c src/usr.bin/uname uname.c src/sys/sys sysctl.h src/sys/cpu/i386/include param.h src/sys/kern kern_mib.c

["Sepherosa Ziehau" <sepherosa@xxxxxxxxx>]

On 1/4/07, YONETANI Tomokazu <qhwt+dfly@les.ath.cx> wrote:
> On Tue, Dec 26, 2006 at 03:27:44AM -0800, Sepherosa Ziehau wrote:
> >   - Unhook usr.bin/uname from boot strap tools building, because it is not
> >     used as boot strap tool at all.
>
> Although it doesn't appear to be a serious problem, it seems that uname
> command from the boot strap tool IS used in a few places (or uname command
> from the world_${TARGET_ARCH} gets built too late?), and now I'm seeing
> `uname: not found' messages in the build log.
>
> secure/lib/libcrypto/Makefile.inc
>   secure/lib/libcrypto
>   secure/lib/libssl
>   secure/usr.bin/openssl
>
> usr.sbin/amd/include/newvers.sh
>   usr.sbin/amd/include

grrr, please review/test the attached patch.  If it is ok, please
commit it (my internet connection is still half broken)

Best Regards,
sephe

--
Live Free or Die

Index: Makefile.inc1
===================================================================
RCS file: /opt/df_cvs/src/Makefile.inc1,v
retrieving revision 1.97
diff -u -r1.97 Makefile.inc1
--- Makefile.inc1	1 Jan 2007 19:59:25 -0000	1.97
+++ Makefile.inc1	4 Jan 2007 12:57:36 -0000
@@ -769,7 +769,7 @@
     bin/hostname bin/kill \
     usr.bin/yacc usr.bin/colldef usr.bin/uudecode usr.bin/xinstall \
     usr.bin/m4 usr.bin/rpcgen usr.bin/make usr.bin/awk usr.bin/stat \
-    usr.bin/find usr.bin/lex usr.bin/sed usr.bin/touch \
+    usr.bin/find usr.bin/lex usr.bin/sed usr.bin/uname usr.bin/touch \
     usr.bin/mkdep usr.bin/mktemp usr.bin/lorder usr.bin/file2c \
     usr.bin/tsort usr.bin/tr usr.bin/join usr.bin/wc usr.bin/basename \
     usr.bin/gencat usr.bin/chflags usr.bin/expand usr.bin/paste \
Index: usr.bin/uname/uname.c
===================================================================
RCS file: /opt/df_cvs/src/usr.bin/uname/uname.c,v
retrieving revision 1.4
diff -u -r1.4 uname.c
--- usr.bin/uname/uname.c	26 Dec 2006 11:27:44 -0000	1.4
+++ usr.bin/uname/uname.c	4 Jan 2007 12:57:36 -0000
@@ -45,6 +45,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#ifndef HW_MACHINE_UNAME
+#define HW_MACHINE_UANME	HW_MACHINE
+#endif
+
 #define	MFLAG	0x01
 #define	NFLAG	0x02
 #define	PFLAG	0x04