[Glibc-bsd-commits] r2761 - in trunk/kfreebsd-8/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2009-08-30 18:43:11 +0000 (Sun, 30 Aug 2009)
New Revision: 2761

Added:
   trunk/kfreebsd-8/debian/README.source
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/020_linker.diff
Log:
Merge from kfreebsd-7


Added: trunk/kfreebsd-8/debian/README.source
===================================================================
--- trunk/kfreebsd-8/debian/README.source	                        (rev 0)
+++ trunk/kfreebsd-8/debian/README.source	2009-08-30 18:43:11 UTC (rev 2761)
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2009-08-30 14:28:33 UTC (rev 2760)
+++ trunk/kfreebsd-8/debian/changelog	2009-08-30 18:43:11 UTC (rev 2761)
@@ -18,17 +18,19 @@
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 29 Aug 2009 15:18:23 +0200
 
-kfreebsd-7 (7.2-6) UNRELEASED; urgency=low
+kfreebsd-7 (7.2-6) unstable; urgency=low
 
   [ Aurelien Jarno ]
   * Really build the ZFS module.
   * Enable TMPFS, it is need early in the boot process. 
+  * Add debian/README.source.
+  * Align modules load address on pages.
 
   [ Petr Salinger ]
   * Enhance 007_clone_signals.diff
   * Drop .comment section from kernel modules on !amd64
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 22 Aug 2009 13:30:16 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 30 Aug 2009 15:20:36 +0200
 
 kfreebsd-7 (7.2-5) unstable; urgency=low
 

Modified: trunk/kfreebsd-8/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/020_linker.diff	2009-08-30 14:28:33 UTC (rev 2760)
+++ trunk/kfreebsd-8/debian/patches/020_linker.diff	2009-08-30 18:43:11 UTC (rev 2761)
@@ -25,7 +25,7 @@
  ${FULLPROG}: ${KMOD}.kld
 -	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
 +	gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
-+	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
++	${LD} -Bshareable -z common-page-size=8192 ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
 +	${OBJCOPY} --remove-section=.comment ${.TARGET}
  .if !defined(DEBUG_FLAGS)
  	${OBJCOPY} --strip-debug ${.TARGET}