[Glibc-bsd-commits] r3482 - in trunk/freebsd-buildutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-06-25 18:36:05 +0000 (Sat, 25 Jun 2011)
New Revision: 3482

Added:
   trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
Log:
  * 18_fix_sysdir.diff: Fix SYSDIR path to make kernel modules buildable.
    (Closes: #594183).

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-06-25 11:59:06 UTC (rev 3481)
+++ trunk/freebsd-buildutils/debian/changelog	2011-06-25 18:36:05 UTC (rev 3482)
@@ -1,3 +1,10 @@
+freebsd-buildutils (8.2-2) UNRELEASED; urgency=low
+
+  * 18_fix_sysdir.diff: Fix SYSDIR path to make kernel modules buildable.
+    (Closes: #594183).
+
+ -- Robert Millan <rmh at debian.org>  Sat, 25 Jun 2011 20:34:47 +0200
+
 freebsd-buildutils (8.2-1) unstable; urgency=low
 
   [ Robert Millan ]
@@ -2,3 +9,3 @@
   * 10_non_kfreebsd.diff: Make freebsd-make usable on non-kFreeBSD
-    systems.  (Closes: #594183, #602768)
+    systems.  (Closes: #602768)
 

Added: trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff	2011-06-25 18:36:05 UTC (rev 3482)
@@ -0,0 +1,23 @@
+--- a/src/share/mk/bsd.kmod.mk
++++ b/src/share/mk/bsd.kmod.mk
+@@ -1,15 +1,10 @@
+ # $FreeBSD$
+ 
+-# Search for kernel source tree in standard places.
+-.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
+-    ${.CURDIR}/../../../../.. /sys /usr/src/sys
+-.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
+-SYSDIR=	${_dir}
+-.endif
+-.endfor
+-.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
+-    !exists(${SYSDIR}/conf/kmod.mk)
+-.error "can't find kernel source tree"
++KVER!=	uname -r
++SYSDIR=	/usr/src/kfreebsd-headers-${KVER}/sys
++
++.if !exists(${SYSDIR}/kern/) || !exists(${SYSDIR}/conf/kmod.mk)
++.error "can't find kernel headers, install kfreebsd-headers-${KVER} package"
+ .endif
+ 
+ .include "${SYSDIR}/conf/kmod.mk"

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2011-06-25 11:59:06 UTC (rev 3481)
+++ trunk/freebsd-buildutils/debian/patches/series	2011-06-25 18:36:05 UTC (rev 3482)
@@ -13,3 +13,4 @@
 15_manpages_gzip.diff
 16_bootstrap_pmake.diff
 17_multiarch.diff
+18_fix_sysdir.diff