[Glibc-bsd-commits] r2016 - in trunk/kfreebsd-7: . debian debian/patches

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Fri Nov 9 12:36:57 UTC 2007 

Author: ps-guest
Date: 2007-11-09 12:36:57 +0000 (Fri, 09 Nov 2007)
New Revision: 2016

Removed:
   trunk/kfreebsd-7/freebsd-7.txt
Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
Log:
* refresh of some patch(es) for current RELENG_7



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2007-11-06 17:00:49 UTC (rev 2015)
+++ trunk/kfreebsd-7/debian/changelog	2007-11-09 12:36:57 UTC (rev 2016)
@@ -1,6 +1,8 @@
 kfreebsd-7 (7.0~cvs200711xx-1) UNRELEASED; urgency=low
 
   [ Petr Salinger ]
+  * New upstream snapshot of RELENG_7
+     - refresh of some patches
   * reorder freebsd6-buildutils and freebsd7-buildutils in Build-Depends
 
  -- Aurelien Jarno <aurel32 at debian.org>  Tue, 23 Oct 2007 17:20:02 +0200

Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2007-11-06 17:00:49 UTC (rev 2015)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff	2007-11-09 12:36:57 UTC (rev 2016)
@@ -79,11 +79,12 @@
  dev/hwpmc/hwpmc_amd.c		optional hwpmc
  dev/hwpmc/hwpmc_pentium.c	optional hwpmc
  dev/hwpmc/hwpmc_piv.c		optional hwpmc
-@@ -209,12 +168,8 @@
+@@ -209,13 +168,9 @@
  dev/mse/mse.c			optional mse
  dev/mse/mse_isa.c		optional mse isa
  dev/nfe/if_nfe.c		optional nfe pci
 -dev/nve/if_nve.c		optional nve pci
+ dev/nvram/nvram.c		optional nvram isa
  dev/pcf/pcf_isa.c		optional pcf
  dev/random/nehemiah.c		optional random
 -dev/rr232x/os_bsd.c		optional rr232x
@@ -135,7 +136,7 @@
  	aue \
  	${_auxio} \
  	${_awi} \
-@@ -94,7 +89,6 @@
+@@ -95,7 +90,6 @@
  	hifn \
  	hme \
  	${_hptiop} \
@@ -143,17 +144,18 @@
  	hwpmc \
  	${_i2c} \
  	${_ibcs2} \
-@@ -186,9 +180,7 @@
+@@ -188,10 +182,8 @@
  	ntfs_iconv \
  	${_nxge} \
  	nullfs \
 -	${_nve} \
+ 	${_nvram} \
  	${_nwfs} \
 -	${_oltr} \
  	${_padlock} \
  	patm \
  	${_pccard} \
-@@ -218,7 +210,6 @@
+@@ -220,7 +212,6 @@
  	reiserfs \
  	rl \
  	rp \
@@ -161,15 +163,15 @@
  	rue \
  	rum \
  	${_s3} \
-@@ -309,7 +300,6 @@
+@@ -311,7 +302,6 @@
  	${_xe} \
  	xfs \
  	xl \
 -	${_zfs} \
- 	zlib
+ 	zlib \
+ 	zyd
  
- .if ${MACHINE_ARCH} != "powerpc"
-@@ -353,11 +343,6 @@
+@@ -361,11 +351,6 @@
  _apm=		apm
  _ar=		ar
  _arcnet=	arcnet
@@ -181,7 +183,7 @@
  _awi=		awi
  _bktr=		bktr
  _cardbus=	cardbus
-@@ -395,7 +380,6 @@
+@@ -404,7 +389,6 @@
  .if ${MK_NCP} != "no"
  _nwfs=		nwfs
  .endif
@@ -189,7 +191,7 @@
  _pccard=	pccard
  _pcfclock=	pcfclock
  _pecoff=	pecoff
-@@ -416,9 +400,6 @@
+@@ -425,9 +409,6 @@
  _tmpfs= 	tmpfs
  _wi=		wi
  _xe=		xe
@@ -199,22 +201,23 @@
  .if ${MACHINE} == "i386"
  _aac=		aac
  _acpi=		acpi
-@@ -434,7 +415,6 @@
+@@ -444,7 +425,6 @@
  _dpt=		dpt
  _ex=		ex
  _hptiop=	hptiop
 -_hptmv=		hptmv
  _ichwd=		ichwd
  _ida=		ida
- _idt=		idt
-@@ -449,14 +429,12 @@
+ # Disabled due to non-MPSAFEty in 7.0
+@@ -459,7 +439,6 @@
+ _ixgb=   	ixgb
  _mly=		mly
- _mxge=		mxge
  _nfe=		nfe
 -_nve=		nve
+ _nvram=		nvram
  _nxge=		nxge
  .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
- .if exists(${.CURDIR}/../crypto/via)
+@@ -467,7 +446,6 @@
  _padlock=	padlock
  .endif
  .endif
@@ -222,7 +225,7 @@
  _s3=		s3
  _twa=		twa
  _vesa=		vesa
-@@ -474,11 +452,6 @@
+@@ -485,11 +463,6 @@
  _agp=		agp
  _an=		an
  _arcmsr=	arcmsr
@@ -234,7 +237,7 @@
  _cardbus=	cardbus
  _cbb=		cbb
  _ciss=		ciss
-@@ -490,7 +463,6 @@
+@@ -502,7 +475,6 @@
  _exca=		exca
  _ext2fs=	ext2fs
  _hptiop=	hptiop
@@ -242,18 +245,19 @@
  _i2c=		i2c
  _ichwd=		ichwd
  _ida=		ida
-@@ -509,10 +481,8 @@
- _mxge=		mxge
+@@ -520,11 +492,9 @@
+ _mly=		mly
  _ndis=		ndis
  _nfe=		nfe
 -_nve=		nve
+ _nvram=		nvram
  _nxge=		nxge
  _pccard=	pccard
 -_rr232x=	rr232x
  _safe=		safe
  _scsi_low=	scsi_low
  _smbfs=		smbfs
-@@ -522,9 +492,6 @@
+@@ -534,9 +504,6 @@
  _tmpfs= 	tmpfs
  _twa=		twa
  _wi=		wi
@@ -263,7 +267,7 @@
  .endif
  
  .if ${MACHINE_ARCH} == "ia64"
-@@ -565,21 +532,11 @@
+@@ -577,21 +544,11 @@
  
  .if ${MACHINE_ARCH} == "powerpc"
  _an=		an
@@ -272,7 +276,7 @@
 -_ath_rate_amrr=	ath_rate_amrr
 -_ath_rate_onoe=	ath_rate_onoe
 -_ath_rate_sample=ath_rate_sample
- _powermac_nvram=	powermac_nvram
+ _nvram=		powermac_nvram
  _smbfs=		smbfs
  .endif
  
@@ -338,7 +342,7 @@
  #
  amd64/acpica/OsdEnvironment.c	optional	acpi
  amd64/acpica/acpi_machdep.c	optional	acpi
-@@ -173,21 +144,12 @@
+@@ -173,22 +144,13 @@
  dev/fdc/fdc_acpi.c		optional	fdc
  dev/fdc/fdc_isa.c		optional	fdc isa
  dev/fdc/fdc_pccard.c		optional	fdc pccard
@@ -354,6 +358,7 @@
  dev/mem/memutil.c		optional	mem
  dev/nfe/if_nfe.c		optional	nfe pci
 -dev/nve/if_nve.c		optional	nve pci
+ dev/nvram/nvram.c		optional	nvram isa
 -dev/rr232x/os_bsd.c		optional	rr232x
 -dev/rr232x/osm_bsd.c		optional	rr232x
 -dev/rr232x/rr232x_config.c	optional	rr232x

Deleted: trunk/kfreebsd-7/freebsd-7.txt
===================================================================
--- trunk/kfreebsd-7/freebsd-7.txt	2007-11-06 17:00:49 UTC (rev 2015)
+++ trunk/kfreebsd-7/freebsd-7.txt	2007-11-09 12:36:57 UTC (rev 2016)
@@ -1,55 +0,0 @@
-
-* update fetch to use HEAD
-
-* may be update fetch to use another CVS server
-  see http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/anoncvs.html
-	anoncvs at anoncvs1.freebsd.org:/home/ncvs
-	anoncvs at anoncvs2.de.freebsd.org:/home/ncvs
-	anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-	
-* update version in debian/changelog
-
-* change Build-Depends line in debian/control.in
-  "freebsd at major@-buildutils" -> "freebsd at major@-buildutils | freebsd6-buildutils (>=  6.0-0.2)"
-
-* drop obsolete patches (usually all 000_*.diff)
-
-* update some bits by this file
-	debian/arch/i386/486.config
-	debian/arch/i386/686.config
-
-* try to build it
-	cp debian/control.in debian/control 
-	debian/rules control
-	sh fetch
-	nohup dpkg-buildpackage -b -uc &
-
-* adjust patches ;-)
-
-
-
-diff -urN -x.svn kfreebsd-6/debian/arch/i386/486.config kfreebsd-7/debian/arch/i386/486.config
---- kfreebsd-6/debian/arch/i386/486.config	2006-10-13 13:05:20.000000000 +0200
-+++ kfreebsd-7/debian/arch/i386/486.config	2006-10-13 13:05:21.000000000 +0200
-@@ -6,3 +6,8 @@
- cpu		I686_CPU
- makeoptions	COPTFLAGS="-Os -frename-registers -pipe -march=i486"
- ident		Debian-i486
-+
-+# Xbox support
-+options 	XBOX
-+device		xboxfb
-+device		fb
-diff -urN -x.svn kfreebsd-6/debian/arch/i386/686.config kfreebsd-7/debian/arch/i386/686.config
---- kfreebsd-6/debian/arch/i386/686.config	2006-10-13 13:05:20.000000000 +0200
-+++ kfreebsd-7/debian/arch/i386/686.config	2006-10-13 13:05:21.000000000 +0200
-@@ -4,3 +4,8 @@
- cpu		I686_CPU
- makeoptions	COPTFLAGS="-O2 -frename-registers -pipe -march=i686"
- ident		Debian-i686
-+
-+# Xbox support
-+options 	XBOX
-+device		xboxfb
-+device		fb
-

More information about the Glibc-bsd-commits mailing list