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

Robert Millan rmh at alioth.debian.org
Sat Feb 4 11:58:27 UTC 2012


Author: rmh
Date: 2012-02-04 11:58:27 +0000 (Sat, 04 Feb 2012)
New Revision: 4069

Removed:
   trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-10/debian/patches/999_firmware.diff
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/control.in
   trunk/kfreebsd-10/debian/patches/107_mount_update.diff
   trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
   trunk/kfreebsd-10/debian/patches/999_config.diff
   trunk/kfreebsd-10/debian/patches/series
   trunk/kfreebsd-10/debian/rules
Log:
  * New upstream snapshot.
    - 903_disable_non-free_drivers.diff: Remove (obsoleted by
      MK_SOURCELESS build option).
    - 999_firmware.diff: Likewise.

Modified: trunk/kfreebsd-10/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/amd64/amd64.config	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/arch/amd64/amd64.config	2012-02-04 11:58:27 UTC (rev 4069)
@@ -27,3 +27,6 @@
 device		pfsync
 
 include         GENERIC
+
+# Disable binary blobs
+include		WITHOUT_SOURCELESS

Modified: trunk/kfreebsd-10/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/486.config	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/arch/i386/486.config	2012-02-04 11:58:27 UTC (rev 4069)
@@ -30,3 +30,6 @@
 
 
 include		GENERIC
+
+# Disable binary blobs
+include		WITHOUT_SOURCELESS

Modified: trunk/kfreebsd-10/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/686.config	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/arch/i386/686.config	2012-02-04 11:58:27 UTC (rev 4069)
@@ -31,3 +31,6 @@
 
 
 include		GENERIC
+
+# Disable binary blobs
+include		WITHOUT_SOURCELESS

Modified: trunk/kfreebsd-10/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/xen.config	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/arch/i386/xen.config	2012-02-04 11:58:27 UTC (rev 4069)
@@ -39,3 +39,6 @@
 device		carp
 device		pf
 device		pfsync
+
+# Disable binary blobs
+include		WITHOUT_SOURCELESS

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/changelog	2012-02-04 11:58:27 UTC (rev 4069)
@@ -1,9 +1,11 @@
-kfreebsd-10 (10.0~svn230109-2) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn230972-1) experimental; urgency=low
 
-  * Remove unneeded bits in 903_disable_non-free_drivers.diff and
-    999_firmware.diff.
+  * New upstream snapshot.
+    - 903_disable_non-free_drivers.diff: Remove (obsoleted by
+      MK_SOURCELESS build option).
+    - 999_firmware.diff: Likewise.
 
- -- Robert Millan <rmh at debian.org>  Sat, 21 Jan 2012 16:31:05 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 04 Feb 2012 12:20:22 +0100
 
 kfreebsd-10 (10.0~svn230109-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-10/debian/control.in
===================================================================
--- trunk/kfreebsd-10/debian/control.in	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/control.in	2012-02-04 11:58:27 UTC (rev 4069)
@@ -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 (>= 9),
+ freebsd-buildutils (>= 9.0-4~),
  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/107_mount_update.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/107_mount_update.diff	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/patches/107_mount_update.diff	2012-02-04 11:58:27 UTC (rev 4069)
@@ -7,7 +7,7 @@
 
 --- a/sys/kern/vfs_mount.c
 +++ b/sys/kern/vfs_mount.c
-@@ -641,6 +641,24 @@
+@@ -649,6 +649,24 @@
  	}
  
  	/*

Deleted: trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff	2012-02-04 11:58:27 UTC (rev 4069)
@@ -1,43 +0,0 @@
---- a/sys/i386/conf/GENERIC
-+++ b/sys/i386/conf/GENERIC
-@@ -147,8 +147,6 @@
- device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
- device		ciss		# Compaq Smart RAID 5*
- device		dpt		# DPT Smartcache III, IV - See NOTES for options
--device		hptmv		# Highpoint RocketRAID 182x
--device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
- device		iir		# Intel Integrated RAID
- device		ips		# IBM (Adaptec) ServeRAID
- device		mly		# Mylex AcceleRAID/eXtremeRAID
---- a/sys/modules/Makefile
-+++ b/sys/modules/Makefile
-@@ -109,10 +109,7 @@
- 	hatm \
- 	hifn \
- 	hme \
--	${_hpt27xx} \
- 	${_hptiop} \
--	${_hptmv} \
--	${_hptrr} \
- 	hwpmc \
- 	${_i2c} \
- 	${_ibcs2} \
-@@ -231,7 +228,6 @@
- 	ntfs \
- 	ntfs_iconv \
- 	nullfs \
--	${_nve} \
- 	${_nvram} \
- 	${_nwfs} \
- 	${_nxge} \
---- a/sys/amd64/conf/GENERIC
-+++ b/sys/amd64/conf/GENERIC
-@@ -141,8 +141,6 @@
- #device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
- device		ciss		# Compaq Smart RAID 5*
- device		dpt		# DPT Smartcache III, IV - See NOTES for options
--device		hptmv		# Highpoint RocketRAID 182x
--device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
- device		iir		# Intel Integrated RAID
- device		ips		# IBM (Adaptec) ServeRAID
- device		mly		# Mylex AcceleRAID/eXtremeRAID

Modified: trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff	2012-02-04 11:58:27 UTC (rev 4069)
@@ -1,6 +1,6 @@
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -154,8 +154,6 @@
+@@ -161,8 +161,6 @@
  	jme \
  	joy \
  	kbdmux \

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2012-02-04 11:58:27 UTC (rev 4069)
@@ -51,8 +51,8 @@
 -device		adw		# Advansys wide SCSI adapters
  device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
  device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
- 
-@@ -182,10 +180,6 @@
+ device		isci		# Intel C600 SAS controller
+@@ -185,10 +183,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -63,58 +63,7 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -196,8 +190,6 @@
- device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
- device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
- device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
--device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
--device		txp		# 3Com 3cR990 (``Typhoon'')
- device		vx		# 3Com 3c590, 3c595 (``Vortex'')
- 
- # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -207,12 +199,10 @@
- device		age		# Attansic/Atheros L1 Gigabit Ethernet
- device		alc		# Atheros AR8131/AR8132 Ethernet
- device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
--device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
- device		bfe		# Broadcom BCM440x 10/100 Ethernet
- device		bge		# Broadcom BCM570xx Gigabit Ethernet
- device		dc		# DEC/Intel 21143 and various workalikes
- device		et		# Agere ET1310 10/100/Gigabit Ethernet
--device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
- device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
- device		lge		# Level 1 LXT1001 gigabit Ethernet
- device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -222,7 +212,6 @@
- device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
- device		re		# RealTek 8139C+/8169/8169S/8110S
- device		rl		# RealTek 8129/8139
--device		sf		# Adaptec AIC-6915 (``Starfire'')
- device		sge		# Silicon Integrated Systems SiS190/191
- device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
- device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -242,7 +231,6 @@
- device		ex		# Intel EtherExpress Pro/10 and Pro/10+
- device		ep		# Etherlink III based cards
- device		fe		# Fujitsu MB8696x based cards
--device		sn		# SMC's 9000 series of Ethernet chips
- device		xe		# Xircom pccard Ethernet
- 
- # Wireless NIC cards
-@@ -262,12 +250,7 @@
- device		ath_rate_sample	# SampleRate tx rate control for ath
- #device		bwi		# Broadcom BCM430x/BCM431x wireless NICs.
- #device		bwn		# Broadcom BCM43xx wireless NICs.
--device		ipw		# Intel 2100 wireless NICs.
--device		iwi		# Intel 2200BG/2225BG/2915ABG wireless NICs.
--device		iwn		# Intel 4965/1000/5000/6000 wireless NICs.
- device		malo		# Marvell Libertas wireless NICs.
--device		mwl		# Marvell 88W8363 802.11n wireless NICs.
--device		ral		# Ralink Technology RT2500 wireless NICs.
- device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
- device		wpi		# Intel 3945ABG wireless NICs.
- 
-@@ -276,11 +259,8 @@
+@@ -279,11 +268,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -126,7 +75,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -295,39 +275,9 @@
+@@ -298,39 +284,9 @@
  device		ehci		# EHCI PCI->USB interface (USB 2.0)
  device		xhci		# XHCI PCI->USB interface (USB 3.0)
  device		usb		# USB Bus (required)
@@ -166,7 +115,7 @@
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -338,15 +288,15 @@
+@@ -341,15 +297,15 @@
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
  
@@ -257,7 +206,7 @@
  device		aha		# Adaptec 154x SCSI adapters
  device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
  device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
-@@ -192,10 +192,6 @@
+@@ -195,10 +195,6 @@
  # Parallel port
  device		ppc
  device		ppbus		# Parallel port bus (required)
@@ -268,58 +217,7 @@
  
  device		puc		# Multi I/O cards and multi-channel UARTs
  
-@@ -206,8 +202,6 @@
- device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
- device		ixgb		# Intel PRO/10GbE Ethernet Card
- device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
--device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
--device		txp		# 3Com 3cR990 (``Typhoon'')
- device		vx		# 3Com 3c590, 3c595 (``Vortex'')
- 
- # PCI Ethernet NICs that use the common MII bus controller code.
-@@ -217,12 +211,10 @@
- device		age		# Attansic/Atheros L1 Gigabit Ethernet
- device		alc		# Atheros AR8131/AR8132 Ethernet
- device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
--device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
- device		bfe		# Broadcom BCM440x 10/100 Ethernet
- device		bge		# Broadcom BCM570xx Gigabit Ethernet
- device		dc		# DEC/Intel 21143 and various workalikes
- device		et		# Agere ET1310 10/100/Gigabit Ethernet
--device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
- device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
- device		lge		# Level 1 LXT1001 gigabit Ethernet
- device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -232,7 +224,6 @@
- device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
- device		re		# RealTek 8139C+/8169/8169S/8110S
- device		rl		# RealTek 8129/8139
--device		sf		# Adaptec AIC-6915 (``Starfire'')
- device		sge		# Silicon Integrated Systems SiS190/191
- device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
- device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -254,7 +245,6 @@
- device		ep		# Etherlink III based cards
- device		fe		# Fujitsu MB8696x based cards
- device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
--device		sn		# SMC's 9000 series of Ethernet chips
- device		xe		# Xircom pccard Ethernet
- 
- # Wireless NIC cards
-@@ -274,12 +264,7 @@
- device		ath_rate_sample	# SampleRate tx rate control for ath
- #device		bwi		# Broadcom BCM430x/BCM431x wireless NICs.
- #device		bwn		# Broadcom BCM43xx wireless NICs.
--device		ipw		# Intel 2100 wireless NICs.
--device		iwi		# Intel 2200BG/2225BG/2915ABG wireless NICs.
--device		iwn		# Intel 4965/1000/5000/6000 wireless NICs.
- device		malo		# Marvell Libertas wireless NICs.
--device		mwl		# Marvell 88W8363 802.11n wireless NICs.
--device		ral		# Ralink Technology RT2500 wireless NICs.
- device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
- #device		wl		# Older non 802.11 Wavelan wireless NIC.
- device		wpi		# Intel 3945ABG wireless NICs.
-@@ -289,11 +274,8 @@
+@@ -292,11 +283,8 @@
  device		random		# Entropy device
  device		ether		# Ethernet support
  device		vlan		# 802.1Q VLAN support
@@ -331,7 +229,7 @@
  device		firmware	# firmware assist module
  
  # The `bpf' device enables the Berkeley Packet Filter.
-@@ -308,39 +290,9 @@
+@@ -311,39 +299,9 @@
  device		ehci		# EHCI PCI->USB interface (USB 2.0)
  device		xhci		# XHCI PCI->USB interface (USB 3.0)
  device		usb		# USB Bus (required)
@@ -371,7 +269,7 @@
  
  # FireWire support
  device		firewire	# FireWire bus code
-@@ -351,15 +303,15 @@
+@@ -354,15 +312,15 @@
  device		dcons		# Dumb console driver
  device		dcons_crom	# Configuration ROM for dcons
  

Deleted: trunk/kfreebsd-10/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_firmware.diff	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/patches/999_firmware.diff	2012-02-04 11:58:27 UTC (rev 4069)
@@ -1,210 +0,0 @@
-
-See #594940  
-
---- a/sys/modules/drm/Makefile
-+++ b/sys/modules/drm/Makefile
-@@ -4,9 +4,6 @@
- 	drm \
- 	i915 \
- 	mach64 \
--	mga \
--	r128 \
--	radeon \
- 	savage \
- 	sis \
- 	tdfx \
---- a/sys/modules/Makefile
-+++ b/sys/modules/Makefile
-@@ -36,7 +36,6 @@
- 	ath \
- 	ath_pci \
- 	${_auxio} \
--	bce \
- 	bfe \
- 	bge \
- 	${_bxe} \
-@@ -65,14 +64,11 @@
- 	coda5 \
- 	${_coff} \
- 	${_coretemp} \
--	${_cp} \
- 	${_cpuctl} \
- 	${_cpufreq} \
- 	${_crypto} \
- 	${_cryptodev} \
- 	${_cs} \
--	${_ctau} \
--	${_cxgb} \
- 	cxgbe \
- 	${_cyclic} \
- 	dc \
-@@ -95,13 +91,11 @@
- 	${_ex} \
- 	${_exca} \
- 	${_ext2fs} \
--	fatm \
- 	fdc \
- 	fdescfs \
- 	${_fe} \
- 	firewire \
- 	firmware \
--	fxp \
- 	gem \
- 	geom \
- 	${_glxiic} \
-@@ -141,14 +135,10 @@
- 	ip_mroute_mod \
- 	${_ips} \
- 	${_ipw} \
--	${_ipwfw} \
- 	iscsi \
- 	isp \
--	ispfw \
- 	${_iwi} \
--	${_iwifw} \
- 	${_iwn} \
--	${_iwnfw} \
- 	${_ixgb} \
- 	${_ixgbe} \
- 	jme \
-@@ -203,7 +193,6 @@
- 	${_mthca} \
- 	mvs \
- 	mwl \
--	mwlfw \
- 	mxge \
- 	my \
- 	${_ncp} \
-@@ -252,14 +241,12 @@
- 	puc \
- 	${_qlxgb} \
- 	ral \
--	ralfw \
- 	${_random} \
- 	rc4 \
- 	${_rdma} \
- 	re \
- 	reiserfs \
- 	rl \
--	runfw \
- 	${_s3} \
- 	${_safe} \
- 	${_sbni} \
-@@ -269,7 +256,6 @@
- 	sdhci \
- 	sem \
- 	send \
--	sf \
- 	${_sfxge} \
- 	sge \
- 	siba_bwn \
-@@ -278,7 +264,6 @@
- 	sis \
- 	sk \
- 	${_smbfs} \
--	sn \
- 	${_snc} \
- 	snp \
- 	${_sound} \
-@@ -293,7 +278,6 @@
- 	${_sym} \
- 	${_syscons} \
- 	sysvipc \
--	ti \
- 	tl \
- 	tmpfs \
- 	${_tpm} \
-@@ -302,7 +286,6 @@
- 	twe \
- 	tws \
- 	tx \
--	txp \
- 	uart \
- 	ubsec \
- 	udf \
-@@ -332,7 +315,6 @@
- 	wlan_wep \
- 	wlan_xauth \
- 	${_wpi} \
--	${_wpifw} \
- 	${_x86bios} \
- 	${_xe} \
- 	xfs \
-@@ -409,9 +391,7 @@
- _bxe=		bxe
- _cardbus=	cardbus
- _cbb=		cbb
--_ce=		ce
- _coff=		coff
--_cp=		cp
- _cpuctl=	cpuctl
- _cpufreq=	cpufreq
- _cs=		cs
-@@ -513,11 +493,8 @@
- _ipmi=		ipmi
- _ips=		ips
- _ipw=		ipw
--_ipwfw=		ipwfw
- _iwi=		iwi
--_iwifw=		iwifw
- _iwn=		iwn
--_iwnfw=		iwnfw
- _ixgb=		ixgb
- _ixgbe=		ixgbe
- _mly=		mly
-@@ -528,7 +505,6 @@
- _tpm=		tpm
- _viawd=		viawd
- _wpi=		wpi
--_wpifw=		wpifw
- .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
- _padlock=	padlock
- .endif
-@@ -593,11 +569,8 @@
- _ipmi=		ipmi
- _ips=		ips
- _ipw=		ipw
--_ipwfw=		ipwfw
- _iwi=		iwi
--_iwifw=		iwifw
- _iwn=		iwn
--_iwnfw=		iwnfw
- _ixgb=		ixgb
- _ixgbe=		ixgbe
- _lindev=	lindev
-@@ -643,7 +616,6 @@
- _x86bios=	x86bios
- _wi=		wi
- _wpi=		wpi
--_wpifw=		wpifw
- .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
- _zfs=		zfs
- .endif
---- a/sys/modules/sound/driver/Makefile
-+++ b/sys/modules/sound/driver/Makefile
-@@ -1,7 +1,7 @@
- # $FreeBSD$
- 
--SUBDIR=		ad1816 als4000 atiixp cs4281 csa ds1 emu10k1 emu10kx
--SUBDIR+=	envy24 envy24ht es137x ess fm801 hda ich maestro maestro3
-+SUBDIR=		ad1816 als4000 atiixp cs4281 emu10k1 emu10kx
-+SUBDIR+=	envy24 envy24ht es137x ess fm801 hda ich maestro
- SUBDIR+=	neomagic sb16 sb8 sbc solo spicds t4dwave via8233
- SUBDIR+=	via82c686 vibes driver uaudio
- 
---- a/sys/modules/usb/Makefile
-+++ b/sys/modules/usb/Makefile
-@@ -27,11 +27,11 @@
- 
- SUBDIR = usb
- SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} ${_avr32dci}
--SUBDIR += rum run uath upgt usie ural zyd ${_urtw}
-+SUBDIR += run upgt usie ural ${_urtw}
- SUBDIR += atp uhid ukbd ums udbp ufm uep
- SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
- 	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom
--SUBDIR += uether aue axe cdce cue kue mos rue udav uhso ipheth
-+SUBDIR += uether aue axe cdce cue mos rue udav uhso ipheth
- SUBDIR += usfs umass urio
- SUBDIR += quirk template
- 

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/patches/series	2012-02-04 11:58:27 UTC (rev 4069)
@@ -11,7 +11,6 @@
 110_disable_trampoline_flavour.diff
 901_disable_optimization_2.diff
 902_version.diff
-903_disable_non-free_drivers.diff 
 904_dev_full.diff
 906_grow_sysv_ipc_limits.diff
 908_linprocfs_is_not_proc.diff
@@ -28,4 +27,3 @@
 951_disable_mk_magic.diff
 952_nodebug.diff
 999_config.diff
-999_firmware.diff

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2012-02-04 00:58:38 UTC (rev 4068)
+++ trunk/kfreebsd-10/debian/rules	2012-02-04 11:58:27 UTC (rev 4069)
@@ -43,7 +43,7 @@
 FLAVOR_DIR	:= flavor-$(version)-$(abiname)
 ORIG_DIR	:= kfreebsd-$(major)-$(tar_version)
 ORIG_TAR	:= kfreebsd-$(major)_$(tar_version).orig.tar.gz
-MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) CC=gcc-$(gcc_version) WERROR=
+MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) CC=gcc-$(gcc_version) WERROR= -DWITHOUT_SOURCELESS
 PATH		:= $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
 
 get-orig-source:




More information about the Glibc-bsd-commits mailing list