[Glibc-bsd-commits] r3718 - branches/squeeze/kfreebsd-8/debian

[Robert Millan]

Author: rmh
Date: 2011-10-01 09:45:43 +0000 (Sat, 01 Oct 2011)
New Revision: 3718

Modified:
   branches/squeeze/kfreebsd-8/debian/changelog
   branches/squeeze/kfreebsd-8/debian/rules
Log:
  * Add a few missing files in header package to make it possible to
    build external modules.  (Closes: #630509)

Modified: branches/squeeze/kfreebsd-8/debian/changelog
===================================================================
--- branches/squeeze/kfreebsd-8/debian/changelog	2011-09-30 21:46:40 UTC (rev 3717)
+++ branches/squeeze/kfreebsd-8/debian/changelog	2011-10-01 09:45:43 UTC (rev 3718)
@@ -1,4 +1,4 @@
-kfreebsd-8 (8.1+dfsg-9) UNRELEASED; urgency=low
+kfreebsd-8 (8.1+dfsg-8+squeeze1) UNRELEASED; urgency=low
 
   * Fix net802.11 stack kernel memory disclosure (CVE-2011-2480).
     (Closes: #631160)
@@ -7,8 +7,10 @@
     - 000_msk_backport.diff
   * Disable buggy 009_disable_duped_modules.diff.  It was disabling many
     more modules than built into kernel (e.g. all USB modules).
+  * Add a few missing files in header package to make it possible to
+    build external modules.  (Closes: #630509)
 
- -- Robert Millan <rmh at debian.org>  Mon, 11 Jul 2011 17:32:30 +0200
+ -- Robert Millan <rmh at debian.org>  Fri, 30 Sep 2011 23:09:42 +0200
 
 kfreebsd-8 (8.1+dfsg-8) stable-proposed-updates; urgency=low
 

Modified: branches/squeeze/kfreebsd-8/debian/rules
===================================================================
--- branches/squeeze/kfreebsd-8/debian/rules	2011-09-30 21:46:40 UTC (rev 3717)
+++ branches/squeeze/kfreebsd-8/debian/rules	2011-10-01 09:45:43 UTC (rev 3718)
@@ -157,7 +157,22 @@
 	mkdir -p $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)
 	cd src \
 		&& find . -type f -name "*.h" -not -regex ".*modules.*" -not -regex ".*sys/$(cpu)/.*" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) \;
+
+	mkdir -p $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)/conf 
+	cd src && cp --parents \
+		sys/conf/kern.mk \
+		sys/conf/kmod.mk \
+		sys/conf/kmod_syms.awk \
+		sys/kern/bus_if.m \
+		sys/dev/pci/pci_if.m \
+		sys/kern/device_if.m \
+		sys/kern/vnode_if.src \
+		sys/tools/vnode_if.awk \
+		sys/tools/makeobjops.awk \
+		$(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)
+
 	find $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) -type f -exec chmod 644 {} \;
+	find $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) -type f -name "*.awk" -exec chmod 755 {} \;
 
 	touch install-common-stamp
 
@@ -232,6 +247,7 @@
 	for dir in `ls $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)/sys` ; do \
 		ln -s ../../$(HEADERS_DIR)/sys/$$dir $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$$dir ; \
 	done
+	ln -s $(cpu)/include $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/machine
 
 	touch install-flavor-$*-stamp