[Glibc-bsd-commits] r4120 - in trunk/kfreebsd-10/debian: . arch/amd64 arch/i386 patches

Robert Millan rmh at alioth.debian.org
Sat Feb 25 16:28:04 UTC 2012 

Author: rmh
Date: 2012-02-25 16:28:04 +0000 (Sat, 25 Feb 2012)
New Revision: 4120

Modified:
   trunk/kfreebsd-10/debian/arch/amd64/amd64.config
   trunk/kfreebsd-10/debian/arch/i386/486.config
   trunk/kfreebsd-10/debian/arch/i386/686.config
   trunk/kfreebsd-10/debian/arch/i386/xen.config
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/001_misc.diff
   trunk/kfreebsd-10/debian/patches/004_xargs.diff
   trunk/kfreebsd-10/debian/patches/902_version.diff
   trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff
   trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
New upstream snapshot

Modified: trunk/kfreebsd-10/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/amd64/amd64.config	2012-02-25 15:33:37 UTC (rev 4119)
+++ trunk/kfreebsd-10/debian/arch/amd64/amd64.config	2012-02-25 16:28:04 UTC (rev 4120)
@@ -30,4 +30,4 @@
 include         GENERIC
 
 # Disable binary blobs
-include		WITHOUT_SOURCELESS
+include		../../conf/WITHOUT_SOURCELESS

Modified: trunk/kfreebsd-10/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/486.config	2012-02-25 15:33:37 UTC (rev 4119)
+++ trunk/kfreebsd-10/debian/arch/i386/486.config	2012-02-25 16:28:04 UTC (rev 4120)
@@ -33,4 +33,4 @@
 include		GENERIC
 
 # Disable binary blobs
-include		WITHOUT_SOURCELESS
+include		../../conf/WITHOUT_SOURCELESS

Modified: trunk/kfreebsd-10/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/686.config	2012-02-25 15:33:37 UTC (rev 4119)
+++ trunk/kfreebsd-10/debian/arch/i386/686.config	2012-02-25 16:28:04 UTC (rev 4120)
@@ -34,4 +34,4 @@
 include		GENERIC
 
 # Disable binary blobs
-include		WITHOUT_SOURCELESS
+include		../../conf/WITHOUT_SOURCELESS

Modified: trunk/kfreebsd-10/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/xen.config	2012-02-25 15:33:37 UTC (rev 4119)
+++ trunk/kfreebsd-10/debian/arch/i386/xen.config	2012-02-25 16:28:04 UTC (rev 4120)
@@ -42,4 +42,4 @@
 device		pflog
 
 # Disable binary blobs
-include		WITHOUT_SOURCELESS
+include		../../conf/WITHOUT_SOURCELESS

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2012-02-25 15:33:37 UTC (rev 4119)
+++ trunk/kfreebsd-10/debian/changelog	2012-02-25 16:28:04 UTC (rev 4120)
@@ -1,11 +1,14 @@
-kfreebsd-10 (10.0~svn230972-2) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn232158-1) UNRELEASED; urgency=low
 
-  * Disable adw via in WITHOUT_SOURCELESS_UCODE rather than in GENERIC.
+  * New upstream snapshot.
+    - Disable adw via in WITHOUT_SOURCELESS_UCODE rather than in GENERIC.
+
+  [ Robert Millan ]
   * Build by GCC 4.6.
   * Lower libc0.1 requirement to 2.11.3-1.
   * Enable pflog.  (Closes: #658677)
 
- -- Robert Millan <rmh at debian.org>  Fri, 10 Feb 2012 23:40:16 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 25 Feb 2012 16:55:15 +0100
 
 kfreebsd-10 (10.0~svn230972-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/001_misc.diff	2012-02-25 15:33:37 UTC (rev 4119)
+++ trunk/kfreebsd-10/debian/patches/001_misc.diff	2012-02-25 16:28:04 UTC (rev 4120)
@@ -25,7 +25,7 @@
  		-Wmissing-include-dirs -fdiagnostics-show-option \
  		${CWARNEXTRA}
  #
-@@ -50,7 +59,7 @@
+@@ -51,7 +60,7 @@
  #
  .if ${MACHINE_CPUARCH} == "i386"
  .if ${CC:T:Mclang} != "clang"

Modified: trunk/kfreebsd-10/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/004_xargs.diff	2012-02-25 15:33:37 UTC (rev 4119)
+++ trunk/kfreebsd-10/debian/patches/004_xargs.diff	2012-02-25 16:28:04 UTC (rev 4120)
@@ -17,7 +17,7 @@
  .if !defined(DEBUG_FLAGS) && ${__KLD_SHARED} == no
 --- a/sys/contrib/dev/acpica/acpica_prep.sh
 +++ b/sys/contrib/dev/acpica/acpica_prep.sh
-@@ -58,10 +58,10 @@
+@@ -56,10 +56,10 @@
  # copy files
  echo copying full dirs
  for i in ${fulldirs}; do

Modified: trunk/kfreebsd-10/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/902_version.diff	2012-02-25 15:33:37 UTC (rev 4119)
+++ trunk/kfreebsd-10/debian/patches/902_version.diff	2012-02-25 16:28:04 UTC (rev 4120)
@@ -1,6 +1,6 @@
 --- a/sys/conf/newvers.sh
 +++ b/sys/conf/newvers.sh
-@@ -131,7 +131,7 @@
+@@ -135,7 +135,7 @@
  cat << EOF > vers.c
  $COPYRIGHT
  #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"

Modified: trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff	2012-02-25 15:33:37 UTC (rev 4119)
+++ trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff	2012-02-25 16:28:04 UTC (rev 4120)
@@ -8,7 +8,7 @@
 
 --- a/sys/conf/kern.mk
 +++ b/sys/conf/kern.mk
-@@ -150,6 +150,8 @@
+@@ -151,6 +151,8 @@
  #
  # GCC SSP support
  #

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2012-02-25 15:33:37 UTC (rev 4119)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2012-02-25 16:28:04 UTC (rev 4120)
@@ -277,23 +277,3 @@
 +options		ALTQ_RIO	# RED In/Out
 +options		ALTQ_HFSC	# Hierarchical Packet Scheduler (HFSC)
 +options		ALTQ_PRIQ	# Priority Queuing (PRIQ)
---- a/sys/amd64/conf/WITHOUT_SOURCELESS_UCODE
-+++ b/sys/amd64/conf/WITHOUT_SOURCELESS_UCODE
-@@ -4,6 +4,7 @@
- #
- # $FreeBSD$
- 
-+nodevice	adw
- nodevice	bce
- nodevice	fatm
- nodevice	fxp
---- a/sys/i386/conf/WITHOUT_SOURCELESS_UCODE
-+++ b/sys/i386/conf/WITHOUT_SOURCELESS_UCODE
-@@ -4,6 +4,7 @@
- #
- # $FreeBSD$
- 
-+nodevice	adw
- nodevice	bce
- nodevice	fatm
- nodevice	fxp

More information about the Glibc-bsd-commits mailing list