[Glibc-bsd-commits] r5731 - in trunk/kfreebsd-11/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-07-09 10:18:06 +0000 (Thu, 09 Jul 2015)
New Revision: 5731

Added:
   trunk/kfreebsd-11/debian/patches/924_module_objdir.diff
Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/patches/series
   trunk/kfreebsd-11/debian/rules
Log:
Compile objects with relative, not absolute paths, to avoid embedding
full build tree paths into modules. (Closes: #757629)
Build modules in-place instead of creating a deep nested hierarchy
- 924_module_objdir.diff (Closes: #757632)


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2015-07-09 10:16:34 UTC (rev 5730)
+++ trunk/kfreebsd-11/debian/changelog	2015-07-09 10:18:06 UTC (rev 5731)
@@ -42,6 +42,10 @@
   * DEB_HOST_ARCH_CPU on armel is arm;  update debian/rules detection
     and thereby correctly specify any-arm in debian/control too.
   * Merge changes from kfreebsd-10:
+    - Compile objects with relative, not absolute paths, to avoid embedding
+      full build tree paths into modules. (Closes: #757629)
+    - Build modules in-place instead of creating a deep nested hierarchy
+      - 924_module_objdir.diff (Closes: #757632)
     - Build kernel images only on kfreebsd-any arches.
     - Create tarballs of upstream source, and of the kfreebsd-source
       binary-indep package, using a reproducible stable file order.

Added: trunk/kfreebsd-11/debian/patches/924_module_objdir.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/924_module_objdir.diff	                        (rev 0)
+++ trunk/kfreebsd-11/debian/patches/924_module_objdir.diff	2015-07-09 10:18:06 UTC (rev 5731)
@@ -0,0 +1,11 @@
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -203,7 +203,7 @@
+ # MKMODULESENV is set here so that port makefiles can augment
+ # them.
+ 
+-MKMODULESENV+=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
++MKMODULESENV+=	MAKEOBJDIRPREFIX=/ KMODDIR=${KODIR}
+ MKMODULESENV+=	MACHINE_CPUARCH=${MACHINE_CPUARCH}
+ MKMODULESENV+=	MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH}
+ MKMODULESENV+=	MODULES_EXTRA="${MODULES_EXTRA}" WITHOUT_MODULES="${WITHOUT_MODULES}"

Modified: trunk/kfreebsd-11/debian/patches/series
===================================================================
--- trunk/kfreebsd-11/debian/patches/series	2015-07-09 10:16:34 UTC (rev 5730)
+++ trunk/kfreebsd-11/debian/patches/series	2015-07-09 10:18:06 UTC (rev 5731)
@@ -29,6 +29,7 @@
 920_linux_cflags.diff
 921_signal_watchdog.diff
 923_newvers_timestamp.diff
+924_module_objdir.diff
 930_freebsd_cc.diff
 940_ld_verbose.diff
 999_config.diff

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2015-07-09 10:16:34 UTC (rev 5730)
+++ trunk/kfreebsd-11/debian/rules	2015-07-09 10:18:06 UTC (rev 5731)
@@ -157,6 +157,12 @@
 build-indep-stamp:
 	dh_testdir
 
+	# Compile objects with relative, not absolute paths, to avoid embedding
+	# full build tree paths into modules (Bug #757629)
+	find sys/modules/ \
+	 \( -name Makefile -o -name Makefile.inc \) \
+	 -exec sed -i 's@$${.CURDIR}/@@g' \{\} \;
+
 	mkdir -p $(SRC_DIR)
 	cp -af sys $(SRC_DIR)/