[Glibc-bsd-commits] r3965 - in trunk/kfreebsd-10/debian: . patches

Sun Jan 8 01:10:40 UTC 2012

Author: rmh
Date: 2012-01-08 01:10:39 +0000 (Sun, 08 Jan 2012)
New Revision: 3965

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/control.in
   trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
   trunk/kfreebsd-10/debian/patches/999_firmware.diff
Log:
Remove 951_disable_mk_magic.diff (except for MK_CTF bits), build-depend on freebsd-buildutils >= 9 instead.

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================

--- trunk/kfreebsd-10/debian/changelog	2012-01-07 23:46:19 UTC (rev 3964)
+++ trunk/kfreebsd-10/debian/changelog	2012-01-08 01:10:39 UTC (rev 3965)
@@ -1,3 +1,10 @@
+kfreebsd-10 (10.0~svn228940-2) UNRELEASED; urgency=low
+
+  * Remove 951_disable_mk_magic.diff (except for MK_CTF bits), build-depend
+    on freebsd-buildutils >= 9 instead.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 08 Jan 2012 00:46:31 +0100
+
 kfreebsd-10 (10.0~svn228940-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: trunk/kfreebsd-10/debian/control.in
===================================================================
--- trunk/kfreebsd-10/debian/control.in	2012-01-07 23:46:19 UTC (rev 3964)
+++ trunk/kfreebsd-10/debian/control.in	2012-01-08 01:10:39 UTC (rev 3965)
@@ -6,7 +6,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
- freebsd-buildutils (>= 8.2-8) [!kfreebsd-any] | freebsd-buildutils (>= 7) [kfreebsd-any],
+ freebsd-buildutils (>= 9),
  gcc- at gcc_version@, libdb-dev,
  libbsd-dev (>= 0.3.0), pkg-config,
  libsbuf-dev, libsbuf-dev (>= 8.2-2) | kfreebsd-kernel-headers (<< 0.56),

Modified: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2012-01-07 23:46:19 UTC (rev 3964)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2012-01-08 01:10:39 UTC (rev 3965)
@@ -1,119 +1,6 @@
 
-freebsd-buildutils 8.2 doesn't support MK_INET_SUPPORT nor MK_OFED.
+freebsd-buildutils 9.0 doesn't define MK_CTF.
 
---- a/sys/modules/Makefile
-+++ b/sys/modules/Makefile
-@@ -363,12 +363,11 @@
- .endif
- .endif
- 
--.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
-+.if 1
- _if_gre=	if_gre
- .endif
- 
--.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
--	defined(ALL_MODULES)
-+.if 1
- _carp=	carp
- .endif
- 
-@@ -376,7 +375,7 @@
- _ipfilter=	ipfilter
- .endif
- 
--.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
-+.if 1
- _ipfw=		ipfw
- .endif
- 
-@@ -384,11 +383,10 @@
- _netgraph=	netgraph
- .endif
- 
--.if (${MK_PF} != "no" && (${MK_INET_SUPPORT} != "no" || \
--	${MK_INET6_SUPPORT} != "no")) || defined(ALL_MODULES)
-+.if 1
- _pf=		pf
- _pflog=		pflog
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- _pfsync=	pfsync
- .endif
- .endif
-@@ -443,7 +441,7 @@
- _linsysfs=	linsysfs
- _linux=		linux
- _mse=		mse
--.if ${MK_OFED} != "no" || defined(ALL_MODULES)
-+.if 1
- _mlx4=		mlx4
- _mlx4ib=	mlx4ib
- _mlxen=		mlxen
-@@ -604,7 +602,7 @@
- _linsysfs=	linsysfs
- _linux=		linux
- _mly=		mly
--.if ${MK_OFED} != "no" || defined(ALL_MODULES)
-+.if 1
- _mlx4=		mlx4
- _mlx4ib=	mlx4ib
- _mlxen=		mlxen
---- a/sys/modules/ipfw/Makefile
-+++ b/sys/modules/ipfw/Makefile
-@@ -22,7 +22,7 @@
- #
- 
- .if !defined(KERNBUILDDIR)
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	echo "#define INET 1" > ${.TARGET}
- .endif
---- a/sys/modules/netgraph/ipfw/Makefile
-+++ b/sys/modules/netgraph/ipfw/Makefile
-@@ -7,7 +7,7 @@
- 
- .if !defined(KERNBUILDDIR)
- 
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	echo "#define INET 1" > ${.TARGET}
- .endif
---- a/sys/modules/pf/Makefile
-+++ b/sys/modules/pf/Makefile
-@@ -14,7 +14,7 @@
- CFLAGS+= -I${.CURDIR}/../../contrib/pf
- 
- .if !defined(KERNBUILDDIR)
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	echo "#define INET 1" > ${.TARGET}
- .endif
---- a/sys/modules/pflog/Makefile
-+++ b/sys/modules/pflog/Makefile
-@@ -14,7 +14,7 @@
- .if defined(KERNBUILDDIR)
- MKDEP+=		-include ${KERNBUILDDIR}/opt_global.h
- .else
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	echo "#define INET 1" > ${.TARGET}
- .endif
---- a/sys/modules/pfsync/Makefile
-+++ b/sys/modules/pfsync/Makefile
-@@ -14,7 +14,7 @@
- .if defined(KERNBUILDDIR)
- MKDEP+=		-include ${KERNBUILDDIR}/opt_global.h
- .else
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	echo "#define INET 1" > ${.TARGET}
- .endif
 --- a/sys/conf/kern.post.mk
 +++ b/sys/conf/kern.post.mk
 @@ -94,7 +94,7 @@
@@ -136,14 +23,3 @@
  NORMAL_CTFCONVERT=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
  .elif ${MAKE_VERSION} >= 5201111300
  NORMAL_CTFCONVERT=
---- a/sys/modules/carp/Makefile
-+++ b/sys/modules/carp/Makefile
-@@ -11,7 +11,7 @@
- SRCS+=	opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h
- 
- .if !defined(KERNBUILDDIR)
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	@echo "#define INET 1" > ${.TARGET}
- .endif

Modified: trunk/kfreebsd-10/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_firmware.diff	2012-01-07 23:46:19 UTC (rev 3964)
+++ trunk/kfreebsd-10/debian/patches/999_firmware.diff	2012-01-08 01:10:39 UTC (rev 3965)
@@ -652,7 +652,7 @@
  	${_x86bios} \
  	${_xe} \
  	xfs \
-@@ -406,9 +387,7 @@
+@@ -408,9 +389,7 @@
  _bxe=		bxe
  _cardbus=	cardbus
  _cbb=		cbb
@@ -662,7 +662,7 @@
  _cpuctl=	cpuctl
  _cpufreq=	cpufreq
  _cs=		cs
-@@ -510,11 +489,8 @@
+@@ -512,11 +491,8 @@
  _ipmi=		ipmi
  _ips=		ips
  _ipw=		ipw
@@ -674,7 +674,7 @@
  _ixgb=		ixgb
  _ixgbe=		ixgbe
  _mly=		mly
-@@ -525,7 +501,6 @@
+@@ -527,7 +503,6 @@
  _tpm=		tpm
  _viawd=		viawd
  _wpi=		wpi
@@ -682,7 +682,7 @@
  .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
  _padlock=	padlock
  .endif
-@@ -590,11 +565,8 @@
+@@ -592,11 +567,8 @@
  _ipmi=		ipmi
  _ips=		ips
  _ipw=		ipw
@@ -694,7 +694,7 @@
  _ixgb=		ixgb
  _ixgbe=		ixgbe
  _lindev=	lindev
-@@ -640,7 +612,6 @@
+@@ -642,7 +614,6 @@
  _x86bios=	x86bios
  _wi=		wi
  _wpi=		wpi


