[Glibc-bsd-commits] r2861 - in trunk/kfreebsd-8: . debian debian/patches

Thu Nov 26 02:58:06 UTC 2009

Author: aurel32
Date: 2009-11-26 02:58:06 +0000 (Thu, 26 Nov 2009)
New Revision: 2861

Removed:
   trunk/kfreebsd-8/fetch
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/912_binutils.diff
   trunk/kfreebsd-8/debian/rules
Log:
  * Add a get-orig-source target to debian/rules and stop using a tar in
    tar system.



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

--- trunk/kfreebsd-8/debian/changelog	2009-11-21 09:53:28 UTC (rev 2860)
+++ trunk/kfreebsd-8/debian/changelog	2009-11-26 02:58:06 UTC (rev 2861)
@@ -20,8 +20,12 @@
   * Partially drop and refresh the rest
      - 001_misc.diff
 
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 25 Nov 2009 12:00:00 +0100
+  [ Aurelien Jarno ]
+  * Add a get-orig-source target to debian/rules and stop using a tar in
+    tar system.
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 26 Nov 2009 03:31:51 +0100
+
 kfreebsd-7 (7.2-9) unstable; urgency=high
 
   [ Petr Salinger ]

Modified: trunk/kfreebsd-8/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/912_binutils.diff	2009-11-21 09:53:28 UTC (rev 2860)
+++ trunk/kfreebsd-8/debian/patches/912_binutils.diff	2009-11-26 02:58:06 UTC (rev 2861)
@@ -1,7 +1,7 @@
 --- src.orig/sys/conf/ldscript.amd64
 +++ src/sys/conf/ldscript.amd64
 @@ -1,12 +1,12 @@
- /* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9.30.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
+ /* $FreeBSD$ */
 -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
 +OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
  OUTPUT_ARCH(i386:x86-64)

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2009-11-21 09:53:28 UTC (rev 2860)
+++ trunk/kfreebsd-8/debian/rules	2009-11-26 02:58:06 UTC (rev 2861)
@@ -7,6 +7,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+SVN=http://svn.freebsd.org/base/release/8.0.0/
+
 full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
 version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
 major           := $(shell echo $(version) | sed -e 's/\..*//g')
@@ -18,6 +20,7 @@
 configfile	:= DEBCUSTOM
 abiname		:= 1
 
+SVN		:= svn://svn.freebsd.org/base/release/$(version).0
 SOURCE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-source-$(version)
 IMAGE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)
@@ -25,10 +28,21 @@
 SRC_DIR		:= kfreebsd-source-$(version)
 HEADERS_DIR	:= kfreebsd-headers-$(version)-$(abiname)
 FLAVOR_DIR	:= flavor-$(version)-$(abiname)
-
+ORIG_DIR	:= kfreebsd-$(major)-$(version)
+ORIG_TAR	:= kfreebsd-$(major)_$(version).orig.tar.gz
 MAKE		:= make MACHINE_ARCH=$(cpu) CC=gcc-4.3 WERROR=
 PATH		:= $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
 
+include /usr/share/quilt/quilt.make
+
+get-orig-source:
+	rm -rf $(ORIG_DIR)
+	for i in sys usr.sbin/config ; do \
+		svn export $(SVN)/$$i $(ORIG_DIR)/$$i ; \
+	done
+	tar --numeric-owner --owner 0 --group 0 -czf ../$(ORIG_TAR) $(ORIG_DIR)
+	rm -rf $(ORIG_DIR)
+
 control: clean
 	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" \
 		$(CURDIR)/debian/control.in > $(CURDIR)/debian/control
@@ -41,10 +55,10 @@
 		done ; \
 	done
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -rf .pc src kfreebsd-source-* flavor-* config
+	rm -rf src kfreebsd-source-* flavor-* config
 	rm -f debian/kfreebsd-image-*.preinst
 	rm -f debian/kfreebsd-image-*.prerm
 	rm -f debian/kfreebsd-image-*.postinst
@@ -55,9 +69,10 @@
 
 src: src-stamp
 src-stamp:
-	tar xfj $(CURDIR)/src.tar.bz2
+	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
 
-	set -e ; find src -type d -name CVS | xargs rm -rf
+	mkdir $(CURDIR)/src
+	cp -af $(CURDIR)/sys $(CURDIR)/usr.sbin $(CURDIR)/src
 
 	set -e ; find src -type f | (while read i ; do \
 		sed -i $$i \
@@ -73,7 +88,6 @@
 		-e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)pflog.h\(>\|"\),,g' \
 	; done)
 
-	set -e ; cd $(CURDIR)/src ; QUILT_PC=$(CURDIR)/.pc QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a ; cd $(CURDIR)
 	install debian/gen-ld-u-options src/usr.sbin/config
 	grep -v ^__FBSDID src/sys/kern/subr_sbuf.c > src/usr.sbin/config/sbuf.c
 

Deleted: trunk/kfreebsd-8/fetch
===================================================================
--- trunk/kfreebsd-8/fetch	2009-11-21 09:53:28 UTC (rev 2860)
+++ trunk/kfreebsd-8/fetch	2009-11-26 02:58:06 UTC (rev 2861)
@@ -1,29 +0,0 @@
-#!/bin/bash
-set -ex
-
-ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_8_0_0_RELEASE
-
-rm -rf src
-
-if test -e src.tar.bz2 ; then
-  tar -xjpf src.tar.bz2
-  action="update"
-else
-  action="checkout"
-fi
-
-for i in src/{sys,usr.sbin/config} ; do
-  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/
-
-rm -rf src


