[Glibc-bsd-commits] r4661 - trunk/kfreebsd-10/debian/patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-07-01 22:24:27 +0000 (Mon, 01 Jul 2013)
New Revision: 4661

Modified:
   trunk/kfreebsd-10/debian/patches/000_cxgbe.diff
   trunk/kfreebsd-10/debian/patches/series
Log:
Rewrite 000_cxgbe.diff using version from upstream HEAD

Modified: trunk/kfreebsd-10/debian/patches/000_cxgbe.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/000_cxgbe.diff	2013-07-01 22:08:05 UTC (rev 4660)
+++ trunk/kfreebsd-10/debian/patches/000_cxgbe.diff	2013-07-01 22:24:27 UTC (rev 4661)
@@ -1,18 +1,22 @@
---- a/sys/modules/cxgbe/Makefile
-+++ b/sys/modules/cxgbe/Makefile
-@@ -2,9 +2,15 @@
- # $FreeBSD$
- #
+--- a/sys/modules/Makefile
++++ b/sys/modules/Makefile
+@@ -80,7 +80,7 @@
+ 	${_ctau} \
+ 	ctl \
+ 	${_cxgb} \
+-	cxgbe \
++	${_cxgbe} \
+ 	${_cyclic} \
+ 	dc \
+ 	dcons \
+@@ -383,6 +383,10 @@
+ .endif
+ .endif
  
-+.include <bsd.own.mk>
-+
- SUBDIR = if_cxgbe
-+
 +.if ${MK_SOURCELESS_UCODE} != "no"
- SUBDIR+= t4_firmware
- #SUBDIR+= t5_firmware
++_cxgbe=		cxgbe
 +.endif
 +
- SUBDIR+= ${_tom}
- 
- .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+ .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
+ .if exists(${.CURDIR}/../opencrypto)
+ _crypto=	crypto

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2013-07-01 22:08:05 UTC (rev 4660)
+++ trunk/kfreebsd-10/debian/patches/series	2013-07-01 22:24:27 UTC (rev 4661)
@@ -1,7 +1,7 @@
 # Patches from (or merged in) upstream
+000_cxgbe.diff
 
 # Other patches that might or might not be mergeable
-000_cxgbe.diff
 001_misc.diff
 002_maxpathlen.diff
 003_glibc_dev_aicasm.diff