[Glibc-bsd-commits] r2054 - in trunk/kfreebsd-kernel-headers/debian: . patches

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Mon Dec 3 20:24:14 UTC 2007 

Author: ps-guest
Date: 2007-12-03 20:24:13 +0000 (Mon, 03 Dec 2007)
New Revision: 2054

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/series
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/control
   trunk/kfreebsd-kernel-headers/debian/includes.list
   trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff
   trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
* start preparing for upcoming FreeBSD 6.3 (kfreebsd-kernel-headers)



Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2007-12-03 13:27:49 UTC (rev 2053)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2007-12-03 20:24:13 UTC (rev 2054)
@@ -1,3 +1,12 @@
+kfreebsd-kernel-headers (0.27) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * Add build-dependency on quilt, and use quilt in debian/rules
+  * Based on kfreebsd-source-6.3
+  * Export <sys/lock_profile.h> and <sys/_sx.h>, needed by newer kvm
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 03 Dec 2007 21:19:42 +0100
+
 kfreebsd-kernel-headers (0.26) unreleased; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control	2007-12-03 13:27:49 UTC (rev 2053)
+++ trunk/kfreebsd-kernel-headers/debian/control	2007-12-03 20:24:13 UTC (rev 2054)
@@ -3,7 +3,7 @@
 Priority: standard
 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), kfreebsd-source-6.2
+Build-Depends: debhelper (>= 4.1.0), quilt, kfreebsd-source-6.3
 Standards-Version: 3.7.2
 
 Package: kfreebsd-kernel-headers

Modified: trunk/kfreebsd-kernel-headers/debian/includes.list
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/includes.list	2007-12-03 13:27:49 UTC (rev 2053)
+++ trunk/kfreebsd-kernel-headers/debian/includes.list	2007-12-03 20:24:13 UTC (rev 2054)
@@ -175,6 +175,7 @@
 sys/_lock.h
 sys/lock.h
 sys/lockmgr.h
+sys/lock_profile.h
 sys/malloc.h
 sys/mbuf.h
 sys/mchain.h
@@ -216,6 +217,7 @@
 sys/sysproto.h
 sys/systm.h
 sys/sx.h
+sys/_sx.h
 sys/_task.h
 sys/taskqueue.h
 sys/timepps.h

Modified: trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff	2007-12-03 13:27:49 UTC (rev 2053)
+++ trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff	2007-12-03 20:24:13 UTC (rev 2054)
@@ -17,3 +17,15 @@
  	dev_t	xsw_dev;
  	int	xsw_flags;
  	int	xsw_nblks;
+--- sys/vm/swap_pager.h
++++ sys/vm/swap_pager.h
+@@ -38,6 +38,9 @@
+ #ifndef	_VM_SWAP_PAGER_H_
+ #define	_VM_SWAP_PAGER_H_ 1
+ 
++
++#include <sys/queue.h>
++
+ typedef	int32_t	swblk_t;	/*
+ 				 * swap offset.  This is the type used to
+ 				 * address the "virtual swap device" and

Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff	2007-12-03 13:27:49 UTC (rev 2053)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff	2007-12-03 20:24:13 UTC (rev 2054)
@@ -1,15 +1,15 @@
 diff -ur sys.orig/dev/usb/usb.h sys/dev/usb/usb.h
 --- sys.orig/dev/usb/usb.h	2005-03-02 21:21:45.000000000 +0100
 +++ sys/dev/usb/usb.h	2005-03-02 21:26:56.000000000 +0100
-@@ -101,7 +101,7 @@
- #if defined(__FreeBSD_kernel__) && (__FreeBSD_version <= 500014)
- #define UPACKED __attribute__ ((packed))
- #else
+@@ -98,7 +98,7 @@
+ #define USETDW(w,v) (*(u_int32_t *)(w) = (v))
+ #endif
+ 
 -#define UPACKED __packed
 +#define UPACKED __attribute__ ((__packed__))
- #endif
  
  typedef struct {
+ 	uByte		bmRequestType;
 diff -ur sys.orig/i386/include/cpufunc.h sys/i386/include/cpufunc.h
 --- sys.orig/i386/include/cpufunc.h	2004-04-07 22:46:05.000000000 +0200
 +++ sys/i386/include/cpufunc.h	2005-03-02 21:28:56.000000000 +0100

Added: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2007-12-03 20:24:13 UTC (rev 2054)
@@ -0,0 +1,27 @@
+000_bruno_haible.diff -p0
+001_sys_soundcard.diff -p0
+002_gdb.diff -p0
+003_osreldate.diff -p0
+004_stdint_h.diff -p0
+006_sys_tty_h.diff -p0
+007_kvm.diff -p0
+008_vm_vm_param_h.diff -p0
+009_inetutils.diff -p0
+010_glibc.diff -p0
+011_wine.diff -p0
+012_strace.diff -p0
+014_misc.diff -p0
+015_cam.diff -p0
+018_sys__types.diff -p0
+019_exec_pagesize.diff -p0
+020_concat_elf_generic.diff -p0
+021_machine__types.diff -p0
+022_sys_buf_h.diff -p0
+023_packed.diff -p0
+024_ioccom.diff -p0
+025_iconv.diff -p0
+026_acpiio.diff -p0
+027_ktrace.diff -p0
+028_fbio.diff -p0
+029_conf.diff -p0
+030_pfvar.diff -p0

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2007-12-03 13:27:49 UTC (rev 2053)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2007-12-03 20:24:13 UTC (rev 2054)
@@ -8,8 +8,8 @@
 kfreebsd_cpu	:= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-kernel-headers
-SRC_TAR		:= /usr/src/kfreebsd-source-6.2.tar.bz2
-SRC_DIR		:= kfreebsd-source-6.2
+SRC_TAR		:= /usr/src/kfreebsd-source-6.3.tar.bz2
+SRC_DIR		:= kfreebsd-source-6.3
 
 clean:
 	dh_testdir
@@ -24,11 +24,7 @@
 	
 	tar xfj $(SRC_TAR)
 
-	set -e ; for i in $(CURDIR)/debian/patches/*.diff ; do \
-		echo "--- Patch $$i ---" ; \
-		patch -p0 -d $(SRC_DIR) --dry-run < $$i ; \
-		patch -p0 -d $(SRC_DIR) < $$i >/dev/null ; \
-	done
+	set -e ; cd $(SRC_DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a ; cd $(CURDIR)
 
 	touch build-stamp

More information about the Glibc-bsd-commits mailing list