[Glibc-bsd-commits] r3046 - trunk/kfreebsd-7/debian

[Aurelien Jarno]

Author: aurel32
Date: 2010-06-14 20:39:09 +0000 (Mon, 14 Jun 2010)
New Revision: 3046

Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/rules
Log:
  * Set the default modules path to /lib/modules/$(version) as doing so
    in userland doesn't always work now that init scripts are reordered.
    Closes: #585633.



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2010-06-14 20:37:30 UTC (rev 3045)
+++ trunk/kfreebsd-7/debian/changelog	2010-06-14 20:39:09 UTC (rev 3046)
@@ -1,3 +1,12 @@
+kfreebsd-7 (7.3-3) unstable; urgency=low
+
+  [ Aurelien Jarno ]
+  * Set the default modules path to /lib/modules/$(version) as doing so
+    in userland doesn't always work now that init scripts are reordered.
+    Closes: #585633.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 14 Jun 2010 22:37:43 +0200
+
 kfreebsd-7 (7.3-2) unstable; urgency=high
 
   * Fix unvalidated input in NFS client subsystem

Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules	2010-06-14 20:37:30 UTC (rev 3045)
+++ trunk/kfreebsd-7/debian/rules	2010-06-14 20:39:09 UTC (rev 3046)
@@ -133,6 +133,7 @@
 
 	# Set /lib/modules/${RELEASE} as module dir
 	sed -i -e 's,^KODIR?=.*,KODIR="/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/conf/kern.pre.mk
+	sed -i -e '/^static char linker_path/s,".*","/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/kern/kern_linker.c 
 
 	# Configure the kernel
 	cp debian/arch/$(cpu)/$*.config $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/