[Glibc-bsd-commits] r4217 - in trunk/kfreebsd-kernel-headers: debian debian/patches test

[Robert Millan]

Author: rmh
Date: 2012-04-21 13:18:28 +0000 (Sat, 21 Apr 2012)
New Revision: 4217

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
   trunk/kfreebsd-kernel-headers/test/param_collision.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/patches/series
   trunk/kfreebsd-kernel-headers/debian/rules
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Likewise for <sys/param.h>.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-21 13:10:37 UTC (rev 4216)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-21 13:18:28 UTC (rev 4217)
@@ -6,7 +6,7 @@
     - type_collision.c: Verify there is no collision with the GNU version
       of <sys/types.h>.
     - uintXX_t.c: Check for uintXX_t type availability (for kernel users).
-  * Likewise for <sys/time.h>.
+  * Likewise for <sys/time.h> and <sys/param.h>.
 
  -- Robert Millan <rmh at debian.org>  Sat, 21 Apr 2012 15:10:17 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2012-04-21 13:10:37 UTC (rev 4216)
+++ trunk/kfreebsd-kernel-headers/debian/install	2012-04-21 13:18:28 UTC (rev 4217)
@@ -268,6 +268,7 @@
 sys/sys/namei.h                         usr/include/sys
 sys/sys/nlist_aout.h                    usr/include/sys
 sys/sys/osd.h                           usr/include/sys
+sys/sys/param.h                         usr/include/sys/kern
 sys/sys/pciio.h                         usr/include/sys
 sys/sys/pcpu.h                          usr/include/sys
 sys/sys/pioctl.h                        usr/include/sys

Added: trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff	2012-04-21 13:18:28 UTC (rev 4217)
@@ -0,0 +1,14 @@
+--- a/sys/sys/param.h
++++ b/sys/sys/param.h
+@@ -39,10 +39,7 @@
+ #define _SYS_PARAM_H_
+ 
+ #include <sys/_null.h>
+-
+-#define	BSD	199506		/* System version (year & month). */
+-#define BSD4_3	1
+-#define BSD4_4	1
++#include <sys/param.h>
+ 
+ /* 
+  * __FreeBSD_kernel_version numbers are documented in the Porter's Handbook.

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2012-04-21 13:10:37 UTC (rev 4216)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2012-04-21 13:18:28 UTC (rev 4217)
@@ -33,3 +33,4 @@
 ctltype_quad.diff
 endian_collision.diff
 type_collision.diff
+param_collision.diff

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-04-21 13:10:37 UTC (rev 4216)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-04-21 13:18:28 UTC (rev 4217)
@@ -42,7 +42,6 @@
 	mkdir -p misc
 
 	set -e ; \
-	fbsd_version=$$(sed sys/sys/param.h -ne "s/^#\s*define\s\+__FreeBSD_version\s\+\([0-9]*\)\s.*/\1/p") ; \
 	find sys -type f | (while read i ; do \
 	sed -i $$i \
 		-e 's/defined\s*(\s*__FreeBSD__\s*)/1/g' \
@@ -50,7 +49,7 @@
 		-e 's/#\s*ifndef\s*__FreeBSD__\(\s\|$$\)/#if 0/g' \
 		-e 's/__FreeBSD__/$(major)/g' \
 		\
-		-e "s/__FreeBSD_version/$$fbsd_version/g" \
+		-e "s/__FreeBSD_version/__FreeBSD_kernel_version/g" \
 		\
 		-e 's/defined\s*(\s*__GNUCLIKE_[A-Z_]\+\s*)/1/g' \
 		-e 's/#\s*ifdef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if 1/g' \
@@ -74,10 +73,11 @@
 		\
 		-e 's/#\s*include\s\+<sys\/types\.h>\s*/#include <sys\/kern\/types.h>/g' \
 		-e 's/#\s*include\s\+<sys\/time\.h>\s*/#include <sys\/kern\/time.h>/g' \
+		-e 's/#\s*include\s\+<sys\/param\.h>\s*/#include <sys\/kern\/param.h>/g' \
 		\
 		-e 's/__size_t/size_t/g' \
 	; done) ; \
-	echo "#define __FreeBSD_kernel_version $$fbsd_version" > misc/osreldate.h
+	echo "#include <sys/kern/param.h>" > misc/osreldate.h
 
 	QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a || test $$? = 2
 

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2012-04-21 13:10:37 UTC (rev 4216)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2012-04-21 13:18:28 UTC (rev 4217)
@@ -1,6 +1,7 @@
 TESTS = \
 	type_collision.o \
 	time_collision.o \
+	param_collision.o \
 	uintXX_t.o \
 	\
 	bus.o \

Added: trunk/kfreebsd-kernel-headers/test/param_collision.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/param_collision.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/param_collision.c	2012-04-21 13:18:28 UTC (rev 4217)
@@ -0,0 +1,2 @@
+#include <sys/param.h>
+#include <sys/kern/param.h>