[Glibc-bsd-commits] r1828 - in trunk: kfreebsd-6/debian kfreebsd-6/debian/patches kfreebsd-7/debian kfreebsd-7/debian/patches

[Aurelien Jarno]

Author: aurel32
Date: 2007-01-02 00:43:24 +0100 (Tue, 02 Jan 2007)
New Revision: 1828

Added:
   trunk/kfreebsd-6/debian/patches/912_binutils.diff
   trunk/kfreebsd-7/debian/patches/912_binutils.diff
Modified:
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/rules
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/rules
Log:
* Remove the CVS/ directory from kfreebsd-source-6.
* Change the linker script from from elf64-x86-64 to elf64-x86-64-freebsd.



Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2006-12-27 13:10:36 UTC (rev 1827)
+++ trunk/kfreebsd-6/debian/changelog	2007-01-01 23:43:24 UTC (rev 1828)
@@ -1,3 +1,10 @@
+kfreebsd-6 (6.1-3) UNRELEASED; urgency=low
+
+  * Remove the CVS/ directory from kfreebsd-source-6.
+  * Change the linker script from from elf64-x86-64 to elf64-x86-64-freebsd.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue,  2 Jan 2007 00:37:24 +0100
+
 kfreebsd-6 (6.1-2) UNRELEASED; urgency=low
 
   * Remove kldutils from the dependencies alternatives.
@@ -5,7 +12,7 @@
     does the job, and bump the dependency on module-init-tools to (>= 6.1-6).
   * Create a /boot/kernel/ directory.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 12 Dec 2006 15:43:24 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon,  1 Jan 2007 23:15:59 +0100
 
 kfreebsd-6 (6.1-1) unreleased; urgency=low
 

Added: trunk/kfreebsd-6/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/912_binutils.diff	2006-12-27 13:10:36 UTC (rev 1827)
+++ trunk/kfreebsd-6/debian/patches/912_binutils.diff	2007-01-01 23:43:24 UTC (rev 1828)
@@ -0,0 +1,9 @@
+--- sys/conf/ldscript.amd64.orig	2007-01-01 23:54:36.000000000 +0100
++++ sys/conf/ldscript.amd64	2007-01-01 23:55:05.000000000 +0100
+@@ -1,5 +1,5 @@
+ /* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ */
+-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
++OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
+ OUTPUT_ARCH(i386:x86-64)
+ ENTRY(btext)
+ SEARCH_DIR("/usr/lib");

Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules	2006-12-27 13:10:36 UTC (rev 1827)
+++ trunk/kfreebsd-6/debian/rules	2007-01-01 23:43:24 UTC (rev 1828)
@@ -60,6 +60,8 @@
 src-stamp:
 	tar xfj $(CURDIR)/src.tar.bz2
 	
+	set -e ; find src -type d -name CVS | xargs rm -rf
+
 	set -e ; find src -type f | (while read i ; do \
 		sed -i $$i \
 		-e 's/defined\( \|\t\)*(\( \|\t\)*__FreeBSD__\( \|\t\)*)/defined(__FreeBSD_kernel__)/g' \

Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2006-12-27 13:10:36 UTC (rev 1827)
+++ trunk/kfreebsd-7/debian/changelog	2007-01-01 23:43:24 UTC (rev 1828)
@@ -4,8 +4,10 @@
   * Remove kfreebsd-common from the dependencies now that module-init-tools
     does the job, and bump the dependency on module-init-tools to (>= 6.1-6).
   * Create a /boot/kernel/ directory.
+  * Remove the CVS/ directory from kfreebsd-source-7.
+  * Change the linker script from from elf64-x86-64 to elf64-x86-64-freebsd.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 12 Dec 2006 15:44:22 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon,  1 Jan 2007 23:17:38 +0100
 
 kfreebsd-7 (6.99+20060506-0.1) unreleased; urgency=low
 

Added: trunk/kfreebsd-7/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/912_binutils.diff	2006-12-27 13:10:36 UTC (rev 1827)
+++ trunk/kfreebsd-7/debian/patches/912_binutils.diff	2007-01-01 23:43:24 UTC (rev 1828)
@@ -0,0 +1,9 @@
+--- sys/conf/ldscript.amd64.orig	2007-01-01 23:54:36.000000000 +0100
++++ sys/conf/ldscript.amd64	2007-01-01 23:55:05.000000000 +0100
+@@ -1,5 +1,5 @@
+ /* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ */
+-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
++OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
+ OUTPUT_ARCH(i386:x86-64)
+ ENTRY(btext)
+ SEARCH_DIR("/usr/lib");

Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules	2006-12-27 13:10:36 UTC (rev 1827)
+++ trunk/kfreebsd-7/debian/rules	2007-01-01 23:43:24 UTC (rev 1828)
@@ -60,6 +60,8 @@
 src-stamp:
 	tar xfj $(CURDIR)/src.tar.bz2
 	
+	set -e ; find src -type d -name CVS -exec rm -rf {} \;
+
 	set -e ; find src -type f -name "*.[ch]" | (while read i ; do \
 		sed -i $$i \
 		-e 's/defined\( \|\t\)*(\( \|\t\)*__FreeBSD__\( \|\t\)*)/defined(__FreeBSD_kernel__)/g' \