[Glibc-bsd-commits] r1954 - in trunk/kfreebsd-7: . debian debian/arch/i386

Wed May 30 16:44:39 UTC 2007

Author: ps-guest
Date: 2007-05-30 16:44:39 +0000 (Wed, 30 May 2007)
New Revision: 1954

Modified:
   trunk/kfreebsd-7/debian/arch/i386/486.config
   trunk/kfreebsd-7/debian/arch/i386/686.config
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/control.in
   trunk/kfreebsd-7/debian/copyright
   trunk/kfreebsd-7/debian/rules
   trunk/kfreebsd-7/fetch
Log:
* update building rules



Modified: trunk/kfreebsd-7/debian/arch/i386/486.config
===================================================================

--- trunk/kfreebsd-7/debian/arch/i386/486.config	2007-05-30 16:27:01 UTC (rev 1953)
+++ trunk/kfreebsd-7/debian/arch/i386/486.config	2007-05-30 16:44:39 UTC (rev 1954)
@@ -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

Modified: trunk/kfreebsd-7/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/686.config	2007-05-30 16:27:01 UTC (rev 1953)
+++ trunk/kfreebsd-7/debian/arch/i386/686.config	2007-05-30 16:44:39 UTC (rev 1954)
@@ -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

Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2007-05-30 16:27:01 UTC (rev 1953)
+++ trunk/kfreebsd-7/debian/changelog	2007-05-30 16:44:39 UTC (rev 1954)
@@ -1,3 +1,15 @@
+kfreebsd-7 (6.99+20070530-1) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * New upstream snapshot of HEAD
+     - drop 000_* patches (already in upstream)
+     - drop obsolete 005_grow_arg_max patch
+     - update of some remaining patches
+  * Disable GPL incompatible "zfs"
+  * Build by gcc-4.2 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 03 May 2007 16:05:58 +0200
+
 kfreebsd-6 (6.2-2) unreleased; urgency=low
 
   * Fix a possible DoS using IPv6 Routing Header 0 (FreeBSD-SA-07:03.ipv6

Modified: trunk/kfreebsd-7/debian/control.in
===================================================================
--- trunk/kfreebsd-7/debian/control.in	2007-05-30 16:27:01 UTC (rev 1953)
+++ trunk/kfreebsd-7/debian/control.in	2007-05-30 16:44:39 UTC (rev 1954)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 4.1.0), bzip2, freebsd at major@-buildutils, libdb4.4-dev | libdb-dev, flex-old | flex, libbsd-dev
+Build-Depends: debhelper (>= 4.1.0), bzip2, freebsd at major@-buildutils | freebsd6-buildutils (>=  6.2), libdb4.4-dev | libdb-dev, flex-old | flex, libbsd-dev, gcc-4.2, sharutils
 Standards-Version: 3.7.2
 
 Package: kfreebsd-source- at version@

Modified: trunk/kfreebsd-7/debian/copyright
===================================================================
--- trunk/kfreebsd-7/debian/copyright	2007-05-30 16:27:01 UTC (rev 1953)
+++ trunk/kfreebsd-7/debian/copyright	2007-05-30 16:44:39 UTC (rev 1954)
@@ -36,19 +36,23 @@
   DFSG-incompatible terms and were therefore removed from the package
   (and disabled in the build system):
 
+src/sys/compat/opensolaris
 src/sys/contrib/dev/ath
 src/sys/contrib/dev/nve
 src/sys/contrib/dev/oltr
+src/sys/contrib/opensolaris
 src/sys/dev/hptmv
 src/sys/dev/rr232x
 
   The following directories contained code that is itself free, but depends
   on the above cited non-free sources and was also removed (and disabled):
 
+src/sys/dev/ath
+src/sys/dev/nve
 src/sys/modules/ath
+src/sys/modules/ath_hal
 src/sys/modules/hptmv
-src/sys/modules/rr232x
 src/sys/modules/nve
 src/sys/modules/oltr
-src/sys/dev/ath
-src/sys/dev/nve
+src/sys/modules/rr232x
+src/sys/modules/zfs

Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules	2007-05-30 16:27:01 UTC (rev 1953)
+++ trunk/kfreebsd-7/debian/rules	2007-05-30 16:44:39 UTC (rev 1954)
@@ -21,7 +21,7 @@
 config_files	:= $(wildcard debian/arch/$(cpu)/*.config)
 flavours	:= $(config_files:debian/arch/$(cpu)/%.config=%)
 configfile	:= DEBCUSTOM
-abiname		:= 1
+abiname		:= 0
 
 SOURCE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-source-$(version)
 IMAGE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
@@ -32,7 +32,7 @@
 HEADERS_DIR	:= kfreebsd-headers-$(version)-$(abiname)
 FLAVOR_DIR	:= flavor-$(version)-$(abiname)
 
-MAKE		:= make MACHINE_ARCH=$(cpu) CC=gcc-3.4 WERROR= 
+MAKE		:= make MACHINE_ARCH=$(cpu) CC=gcc-4.2 WERROR= 
 PATH		:= $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
 
 control: clean
@@ -113,6 +113,7 @@
 
 config: src
 	cp -af src/usr.sbin/config config
+	grep -v ^__FBSDID src/sys/kern/subr_sbuf.c > config/sbuf.c
 	$(MAKE) -C config
 
 build-arch: $(foreach flavor,$(flavours),build-flavor-$(flavor)-stamp)

Modified: trunk/kfreebsd-7/fetch
===================================================================
--- trunk/kfreebsd-7/fetch	2007-05-30 16:27:01 UTC (rev 1953)
+++ trunk/kfreebsd-7/fetch	2007-05-30 16:44:39 UTC (rev 1954)
@@ -2,7 +2,7 @@
 set -ex
 
 ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_6_2_0_RELEASE
+RELENG=HEAD
 
 rm -rf src
 


