Move __FreeBSD_version from src/sys/conf/newvers.sh to

src/sys/sys/param.h, to facilitate access from the kernel.  This make
it possible to do outside kernel development and have it actually work
properly.

6 files changed, 22 insertions, 11 deletions

diff --git a/include/Makefile b/include/Makefile
index 63021b6..cca7b0b 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 1/4/94
-#	$Id: Makefile,v 1.75 1998/03/08 21:35:29 jb Exp $
+#	$Id: Makefile,v 1.76 1998/03/28 11:48:14 dufault Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -58,8 +58,10 @@ SHARED?=	copies
 .if exists (${.CURDIR}/../sys/conf/newvers.sh)
 all:	osreldate.h
 
-osreldate.h:	${.CURDIR}/../sys/conf/newvers.sh
+osreldate.h:	${.CURDIR}/../sys/conf/newvers.sh \
+		${.CURDIR}/../sys/sys/param.h
 	@${ECHO} creating osreldate.h from newvers.sh
+	setvar PARAMFILE ${.CURDIR}/../sys/sys/param.h; \
 	. ${.CURDIR}/../sys/conf/newvers.sh;			\
 	echo "$$COPYRIGHT" > osreldate.h;			\
 	echo \#'undef __FreeBSD_version' >> osreldate.h;	\
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index bd0d627..ad46416 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.111 1998/05/20 20:35:35 eivind Exp $
+#	$Id: Makefile.i386,v 1.112 1998/05/20 20:54:04 eivind Exp $
 #
 # Makefile for FreeBSD
 #
@@ -226,7 +226,7 @@ param.c: $S/conf/param.c
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
+vers.o: $S/sys/param.h ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.c
 
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index bd0d627..ad46416 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.111 1998/05/20 20:35:35 eivind Exp $
+#	$Id: Makefile.i386,v 1.112 1998/05/20 20:54:04 eivind Exp $
 #
 # Makefile for FreeBSD
 #
@@ -226,7 +226,7 @@ param.c: $S/conf/param.c
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
+vers.o: $S/sys/param.h ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.c
 
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 689b1a9..6595cb7 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-#	$Id: newvers.sh,v 1.35 1998/05/20 20:35:39 eivind Exp $
+#	$Id: newvers.sh,v 1.36 1998/05/20 20:54:07 eivind Exp $
 
 TYPE="FreeBSD"
 REVISION="3.0"
@@ -44,7 +44,14 @@ if [ "X${SNAPDATE}" != "X" ]; then
 fi
 VERSION="${TYPE} ${RELEASE}"
 
-RELDATE="300001"
+if [ "X${PARAMFILE}" != "X" ]; then
+	RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \
+		${PARAMFILE})
+else
+	RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \
+		$(dirname $0)/../sys/param.h)
+fi
+
 
 b=share/examples/etc/bsd-style-copyright
 year=`date '+%Y'`
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index bd0d627..ad46416 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.111 1998/05/20 20:35:35 eivind Exp $
+#	$Id: Makefile.i386,v 1.112 1998/05/20 20:54:04 eivind Exp $
 #
 # Makefile for FreeBSD
 #
@@ -226,7 +226,7 @@ param.c: $S/conf/param.c
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
+vers.o: $S/sys/param.h ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.c
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 37e372d..9642efc 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $Id: param.h,v 1.29 1998/05/20 20:35:42 eivind Exp $
+ * $Id: param.h,v 1.30 1998/05/20 20:54:10 eivind Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -45,6 +45,8 @@
 #define	BSD	199506		/* System version (year & month). */
 #define BSD4_3	1
 #define BSD4_4	1
+#undef __FreeBSD_version
+#define __FreeBSD_version 300001	/* Master version, propagated to newvers */
 
 #ifndef NULL
 #define	NULL	0