[Glibc-bsd-commits] r5575 - in branches/experimental/kfreebsd-10/debian: . patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2014-10-04 08:24:10 +0000 (Sat, 04 Oct 2014)
New Revision: 5575

Modified:
   branches/experimental/kfreebsd-10/debian/changelog
   branches/experimental/kfreebsd-10/debian/patches/001_misc.diff
   branches/experimental/kfreebsd-10/debian/patches/999_config.diff
   branches/experimental/kfreebsd-10/debian/patches/aicasm-parallel-build-dependencies.diff
   branches/experimental/kfreebsd-10/debian/patches/userland.diff
   branches/experimental/kfreebsd-10/debian/rules
Log:
resync with releng branch


Modified: branches/experimental/kfreebsd-10/debian/changelog
===================================================================
--- branches/experimental/kfreebsd-10/debian/changelog	2014-09-28 23:41:28 UTC (rev 5574)
+++ branches/experimental/kfreebsd-10/debian/changelog	2014-10-04 08:24:10 UTC (rev 5575)
@@ -1,7 +1,7 @@
-kfreebsd-10 (10.1~svn272167-1) UNRELEASED; urgency=medium
+kfreebsd-10 (10.1~svn272500-1) UNRELEASED; urgency=medium
 
   [ Steven Chamberlain ]
-  * New upstream snapshot of 10.1-BETA3
+  * New upstream snapshot of 10.1 releng branch
   * Set a Breaks: on freebsd-net-tools (<< 10.0~) due to an ABI change
     listing or modifying network interfaces
   * Set a Breaks: on freebsd-smbfs (<< 10.0~) due to an ABI change

Modified: branches/experimental/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/001_misc.diff	2014-09-28 23:41:28 UTC (rev 5574)
+++ branches/experimental/kfreebsd-10/debian/patches/001_misc.diff	2014-10-04 08:24:10 UTC (rev 5575)
@@ -4,7 +4,7 @@
 --- a/sys/conf/kern.mk
 +++ b/sys/conf/kern.mk
 @@ -1,5 +1,8 @@
- # $FreeBSD: stable/10/sys/conf/kern.mk 268882 2014-07-19 18:33:09Z dim $
+ # $FreeBSD$
  
 +# Debian compilers do not have this FreeBSD-specific compiler extension
 +MK_FORMAT_EXTENSIONS=no

Modified: branches/experimental/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/999_config.diff	2014-09-28 23:41:28 UTC (rev 5574)
+++ branches/experimental/kfreebsd-10/debian/patches/999_config.diff	2014-10-04 08:24:10 UTC (rev 5575)
@@ -2,7 +2,7 @@
 +++ b/sys/amd64/conf/GENERIC
 @@ -18,8 +18,8 @@
  #
- # $FreeBSD: stable/10/sys/amd64/conf/GENERIC 271234 2014-09-07 18:43:26Z markj $
+ # $FreeBSD$
  
 -cpu		HAMMER
 -ident		GENERIC
@@ -24,7 +24,7 @@
 +++ b/sys/i386/conf/GENERIC
 @@ -18,10 +18,10 @@
  #
- # $FreeBSD: stable/10/sys/i386/conf/GENERIC 271234 2014-09-07 18:43:26Z markj $
+ # $FreeBSD$
  
 -cpu		I486_CPU
 -cpu		I586_CPU

Modified: branches/experimental/kfreebsd-10/debian/patches/aicasm-parallel-build-dependencies.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/aicasm-parallel-build-dependencies.diff	2014-09-28 23:41:28 UTC (rev 5574)
+++ branches/experimental/kfreebsd-10/debian/patches/aicasm-parallel-build-dependencies.diff	2014-10-04 08:24:10 UTC (rev 5575)
@@ -1,7 +1,5 @@
-Index: sys/modules/aic7xxx/Makefile
-===================================================================
---- a/sys/modules/aic7xxx/Makefile	(revision 271306)
-+++ b/sys/modules/aic7xxx/Makefile	(working copy)
+--- a/sys/modules/aic7xxx/Makefile
++++ b/sys/modules/aic7xxx/Makefile
 @@ -8,10 +8,10 @@
  aicasm/aicasm:
  	( cd ${.CURDIR}/aicasm ; ${MAKE} aicasm )

Modified: branches/experimental/kfreebsd-10/debian/patches/userland.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/userland.diff	2014-09-28 23:41:28 UTC (rev 5574)
+++ branches/experimental/kfreebsd-10/debian/patches/userland.diff	2014-10-04 08:24:10 UTC (rev 5575)
@@ -418,7 +418,7 @@
 --- a/sys/sys/queue.h
 +++ b/sys/sys/queue.h
 @@ -30,8 +30,12 @@
-  * $FreeBSD: stable/10/sys/sys/queue.h 251887 2013-06-18 02:57:56Z lstewart $
+  * $FreeBSD$
   */
  
 -#ifndef _SYS_QUEUE_H_

Modified: branches/experimental/kfreebsd-10/debian/rules
===================================================================
--- branches/experimental/kfreebsd-10/debian/rules	2014-09-28 23:41:28 UTC (rev 5574)
+++ branches/experimental/kfreebsd-10/debian/rules	2014-10-04 08:24:10 UTC (rev 5575)
@@ -31,8 +31,8 @@
 endif
 
 #SVN		:= https://svn0.us-west.freebsd.org/base/release/$(version).0
-#SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
-SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
+SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
+#SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
 #SVN		:= https://svn0.us-west.freebsd.org/base/head
 SOURCE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-source-$(version)
 IMAGE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)