[Glibc-bsd-commits] r4838 - in trunk/kfreebsd-10/debian: . installer/modules patches

[Robert Millan]

Author: rmh
Date: 2013-08-01 00:23:54 +0000 (Thu, 01 Aug 2013)
New Revision: 4838

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/control.in
   trunk/kfreebsd-10/debian/installer/modules/nic-wireless-modules
   trunk/kfreebsd-10/debian/patches/902_version.diff
   trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
   trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
New upstream snapshot

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-07-31 13:56:38 UTC (rev 4837)
+++ trunk/kfreebsd-10/debian/changelog	2013-08-01 00:23:54 UTC (rev 4838)
@@ -1,7 +1,8 @@
-kfreebsd-10 (10.0~svn253544-1) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn253832-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
     - Implements freebsd32_ktimer_* syscalls. (Closes: #666730)
+    - if_run now disabled due to WITHOUT_SOURCELESS_UCODE.
 
   [ Robert Millan ]
   * Remove 951_disable_mk_magic.diff, use -DWITHOUT_CTF instead.
@@ -18,7 +19,7 @@
   [ Petr Salinger ]    
   * Re-enable 901_disable_optimization_2.diff. See: #718250.
 
- -- Robert Millan <rmh at debian.org>  Mon, 22 Jul 2013 16:53:35 +0200
+ -- Robert Millan <rmh at debian.org>  Wed, 31 Jul 2013 13:54:21 +0200
 
 kfreebsd-10 (10.0~svn252032-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-10/debian/control.in
===================================================================
--- trunk/kfreebsd-10/debian/control.in	2013-07-31 13:56:38 UTC (rev 4837)
+++ trunk/kfreebsd-10/debian/control.in	2013-08-01 00:23:54 UTC (rev 4838)
@@ -6,7 +6,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-@major@/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
- freebsd-buildutils (>= 10~svn241078-3~),
+ freebsd-buildutils (>= 10~svn253832),
  byacc,
  @cc_pkg@, libdb-dev,
  libbsd-dev (>= 0.3.0), pkg-config,

Modified: trunk/kfreebsd-10/debian/installer/modules/nic-wireless-modules
===================================================================
--- trunk/kfreebsd-10/debian/installer/modules/nic-wireless-modules	2013-07-31 13:56:38 UTC (rev 4837)
+++ trunk/kfreebsd-10/debian/installer/modules/nic-wireless-modules	2013-08-01 00:23:54 UTC (rev 4838)
@@ -26,7 +26,7 @@
 
 # USB wireless
 if_rum ?
-if_run
+if_run ?
 if_uath ?
 if_upgt
 if_ural

Modified: trunk/kfreebsd-10/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/902_version.diff	2013-07-31 13:56:38 UTC (rev 4837)
+++ trunk/kfreebsd-10/debian/patches/902_version.diff	2013-08-01 00:23:54 UTC (rev 4838)
@@ -1,6 +1,6 @@
 --- a/sys/conf/newvers.sh
 +++ b/sys/conf/newvers.sh
-@@ -165,7 +165,7 @@
+@@ -170,7 +170,7 @@
  cat << EOF > vers.c
  $COPYRIGHT
  #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${p4version}: ${t}"

Modified: trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff	2013-07-31 13:56:38 UTC (rev 4837)
+++ trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff	2013-08-01 00:23:54 UTC (rev 4838)
@@ -5,7 +5,7 @@
 
 --- a/sys/conf/kern.pre.mk
 +++ b/sys/conf/kern.pre.mk
-@@ -94,6 +94,8 @@
+@@ -97,6 +97,8 @@
  .endif
  WERROR?= -Werror
  
@@ -16,7 +16,7 @@
  
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -92,6 +92,8 @@
+@@ -95,6 +95,8 @@
  CFLAGS+=	-D_KERNEL
  CFLAGS+=	-DKLD_MODULE
  

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2013-07-31 13:56:38 UTC (rev 4837)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2013-08-01 00:23:54 UTC (rev 4838)
@@ -40,8 +40,8 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -302,10 +296,7 @@
- options 	RDRAND_RNG	# Intel Bull Mountain RNG
+@@ -303,10 +297,7 @@
+ options 	YARROW_RNG	# Yarrow software RNG
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
 -device		tun		# Packet tunnel.
@@ -106,8 +106,8 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -316,10 +312,7 @@
- options 	RDRAND_RNG	# Intel Bull Mountain RNG
+@@ -317,10 +313,7 @@
+ options 	YARROW_RNG	# Yarrow software RNG
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
 -device		tun		# Packet tunnel.