[Glibc-bsd-commits] r3869 - trunk/kfreebsd-kernel-headers/debian

[Robert Millan]

Author: rmh
Date: 2011-11-16 21:22:04 +0000 (Wed, 16 Nov 2011)
New Revision: 3869

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Propagate __FreeBSD_version from sys/param.h to the rest of kernel headers.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2011-11-16 21:13:33 UTC (rev 3868)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2011-11-16 21:22:04 UTC (rev 3869)
@@ -3,8 +3,10 @@
   * Remove dev/bktr/*.h, it isn't installed on FreeBSD.
   * Drop conflict on kfreebsd-headers (now a virtual package provided by
     kfreebsd-headers-*).
+  * Propagate __FreeBSD_version from sys/param.h to the rest of kernel
+    headers.
 
- -- Robert Millan <rmh at debian.org>  Mon, 14 Nov 2011 18:53:05 +0100
+ -- Robert Millan <rmh at debian.org>  Wed, 16 Nov 2011 22:21:50 +0100
 
 kfreebsd-kernel-headers (0.60) unstable; urgency=low
 

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2011-11-16 21:13:33 UTC (rev 3868)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2011-11-16 21:22:04 UTC (rev 3869)
@@ -37,12 +37,16 @@
 
 	tar xfJ $(SRC_TAR) --wildcards --strip-components=1 "*.h"
 
-	set -e ; find sys -type f | (while read i ; do \
+	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' \
 		-e 's/#\s*ifdef\s*__FreeBSD__\(\s\|$$\)/#if 1/g' \
 		-e 's/#\s*ifndef\s*__FreeBSD__\(\s\|$$\)/#if 0/g' \
 		-e 's/__FreeBSD__/$(major)/g' \
+		\
+		-e "s/__FreeBSD_version/$$fbsd_version/g" \
 	; done)
 
 	QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a || test $$? = 2