[Glibc-bsd-commits] r1855 - in trunk: . kfreebsd-6 kfreebsd-6/debian

[Petr Salinger]

Author: ps-guest
Date: 2007-01-08 18:05:30 +0100 (Mon, 08 Jan 2007)
New Revision: 1855

Added:
   trunk/kfreebsd-6/freebsd-7.txt
Removed:
   trunk/kfreebsd-7/
Modified:
   trunk/kfreebsd-6/debian/rules
   trunk/kfreebsd-6/fetch
Log:
* drop (outdated) kfreebsd-7 dir, only write down notes for recreating later



Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules	2007-01-08 10:34:17 UTC (rev 1854)
+++ trunk/kfreebsd-6/debian/rules	2007-01-08 17:05:30 UTC (rev 1855)
@@ -13,7 +13,7 @@
 major		:= $(shell dpkg-parsechangelog | grep ^Source: | sed -e 's/^.*-//g')
 ifeq (, $(findstring :$(major)., :$(version)))
 # Preliminar snapshot (e.g. 6.99+20060217).  Pretend this is the actual release.
-version		:= $(major).1
+version		:= $(major).0
 endif
 
 os		:= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)

Modified: trunk/kfreebsd-6/fetch
===================================================================
--- trunk/kfreebsd-6/fetch	2007-01-08 10:34:17 UTC (rev 1854)
+++ trunk/kfreebsd-6/fetch	2007-01-08 17:05:30 UTC (rev 1855)
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -ex
 
+ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
+RELENG=RELENG_6_1_0_RELEASE
+
 rm -rf src
 
 if test -e src.tar.bz2 ; then
@@ -11,12 +14,15 @@
 fi
 
 for i in src/{sys,usr.sbin/config} ; do
-  cvs -d freebsdanoncvs at anoncvs.freebsd.org:/home/ncvs ${action} -r RELENG_6_1_0_RELEASE $i
+  cvs -d $ANONCVS ${action} -r $RELENG $i
   test -e $i
 done
 
 grep ^src/ debian/copyright | xargs rm -rf
 
+# assert that no non-free objects were left unremoved
+[ "`find src -name \*.o.uu | wc -l`" = "0" ]
+
 rm -f src.tar.bz2
 tar -cjpf src.tar.bz2 src/
 

Added: trunk/kfreebsd-6/freebsd-7.txt
===================================================================
--- trunk/kfreebsd-6/freebsd-7.txt	2007-01-08 10:34:17 UTC (rev 1854)
+++ trunk/kfreebsd-6/freebsd-7.txt	2007-01-08 17:05:30 UTC (rev 1855)
@@ -0,0 +1,55 @@
+
+* 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
+