[Glibc-bsd-commits] r2407 - in trunk/freebsd-libs/debian: . patches
Aurelien Jarno
aurel32 at alioth.debian.org
Tue Apr 7 09:53:29 UTC 2009
Author: aurel32
Date: 2009-04-07 09:53:29 +0000 (Tue, 07 Apr 2009)
New Revision: 2407
Added:
trunk/freebsd-libs/debian/patches/00_fbsdid.diff
trunk/freebsd-libs/debian/patches/09_libusbhid.diff
trunk/freebsd-libs/debian/patches/series
Removed:
trunk/freebsd-libs/debian/patches/02_glibc_libsbuf.diff
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/patches/00_kernel.diff
trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff
trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff
trunk/freebsd-libs/debian/patches/06_libgeom.diff
trunk/freebsd-libs/debian/patches/07_libkiconv.diff
trunk/freebsd-libs/debian/patches/08_devstat.diff
trunk/freebsd-libs/debian/rules
Log:
* Don't use a tar in tar build system:
- Remove fetch
- Add a get-orig-source target.
- Use quilt to manage patches.
- Remove build-depends on kfreebsd-source-7.1.
- Update patches accordingly.
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2009-04-07 08:27:15 UTC (rev 2406)
+++ trunk/freebsd-libs/debian/changelog 2009-04-07 09:53:29 UTC (rev 2407)
@@ -1,3 +1,15 @@
+freebsd-libs (7.1-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * Don't use a tar in tar build system:
+ - Remove fetch
+ - Add a get-orig-source target.
+ - Use quilt to manage patches.
+ - Remove build-depends on kfreebsd-source-7.1.
+ - Update patches accordingly.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 05 Apr 2009 15:45:14 +0200
+
freebsd-libs (7.1-1) unreleased; urgency=low
[ Petr Salinger ]
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2009-04-07 08:27:15 UTC (rev 2406)
+++ trunk/freebsd-libs/debian/control 2009-04-07 09:53:29 UTC (rev 2407)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>
-Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-7.1, freebsd-buildutils, libbsd-dev, libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.31), libexpat-dev
+Build-Depends: debhelper (>= 4.1.0), freebsd-buildutils, libbsd-dev, libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.31), libexpat-dev, quilt
# libexpat-dev: aka bsdxml. needed by libgeom
Standards-Version: 3.8.0
Added: trunk/freebsd-libs/debian/patches/00_fbsdid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_fbsdid.diff (rev 0)
+++ trunk/freebsd-libs/debian/patches/00_fbsdid.diff 2009-04-07 09:53:29 UTC (rev 2407)
@@ -0,0 +1,484 @@
+diff -Nurd freebsd-libs-7.1.orig/lib/libcam/camlib.c freebsd-libs-7.1/lib/libcam/camlib.c
+--- freebsd-libs-7.1.orig/lib/libcam/camlib.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libcam/camlib.c 2009-04-07 11:07:26 +0200
+@@ -24,7 +24,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.16.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/types.h>
+ #include <sys/param.h>
+diff -Nurd freebsd-libs-7.1.orig/lib/libcam/scsi_cmdparse.c freebsd-libs-7.1/lib/libcam/scsi_cmdparse.c
+--- freebsd-libs-7.1.orig/lib/libcam/scsi_cmdparse.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libcam/scsi_cmdparse.c 2009-04-07 11:07:26 +0200
+@@ -35,7 +35,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libcam/scsi_cmdparse.c,v 1.7.32.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/types.h>
+
+diff -Nurd freebsd-libs-7.1.orig/lib/libdevstat/devstat.c freebsd-libs-7.1/lib/libdevstat/devstat.c
+--- freebsd-libs-7.1.orig/lib/libdevstat/devstat.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libdevstat/devstat.c 2009-04-07 11:07:26 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.29.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+diff -Nurd freebsd-libs-7.1.orig/lib/libgeom/geom_util.c freebsd-libs-7.1/lib/libgeom/geom_util.c
+--- freebsd-libs-7.1.orig/lib/libgeom/geom_util.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libgeom/geom_util.c 2009-04-07 11:07:26 +0200
+@@ -25,7 +25,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/disk.h>
+diff -Nurd freebsd-libs-7.1.orig/lib/libipx/ipx_addr.c freebsd-libs-7.1/lib/libipx/ipx_addr.c
+--- freebsd-libs-7.1.orig/lib/libipx/ipx_addr.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libipx/ipx_addr.c 2009-04-07 11:07:26 +0200
+@@ -31,7 +31,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libipx/ipx_addr.c,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ static char sccsid[] = "@(#)ipx_addr.c";
+diff -Nurd freebsd-libs-7.1.orig/lib/libipx/ipx_ntoa.c freebsd-libs-7.1/lib/libipx/ipx_ntoa.c
+--- freebsd-libs-7.1.orig/lib/libipx/ipx_ntoa.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libipx/ipx_ntoa.c 2009-04-07 11:07:26 +0200
+@@ -28,7 +28,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libipx/ipx_ntoa.c,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ static char sccsid[] = "@(#)ipx_ntoa.c";
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_amd64.c freebsd-libs-7.1/lib/libkvm/kvm_amd64.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_amd64.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_amd64.c 2009-04-07 11:07:26 +0200
+@@ -32,7 +32,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.22.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ #if 0
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_arm.c freebsd-libs-7.1/lib/libkvm/kvm_arm.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_arm.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_arm.c 2009-04-07 11:07:26 +0200
+@@ -36,7 +36,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_arm.c,v 1.4.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/elf32.h>
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm.c freebsd-libs-7.1/lib/libkvm/kvm.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm.c 2009-04-07 11:07:26 +0200
+@@ -32,7 +32,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.31.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ #if 0
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_cptime.c freebsd-libs-7.1/lib/libkvm/kvm_cptime.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_cptime.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_cptime.c 2009-04-07 11:07:26 +0200
+@@ -29,7 +29,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_cptime.c,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/pcpu.h>
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_file.c freebsd-libs-7.1/lib/libkvm/kvm_file.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_file.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_file.c 2009-04-07 11:07:26 +0200
+@@ -28,7 +28,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_file.c,v 1.18.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ #if 0
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_getloadavg.c freebsd-libs-7.1/lib/libkvm/kvm_getloadavg.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_getloadavg.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_getloadavg.c 2009-04-07 11:07:26 +0200
+@@ -28,7 +28,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getloadavg.c,v 1.10.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ #if 0
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_getswapinfo.c freebsd-libs-7.1/lib/libkvm/kvm_getswapinfo.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_getswapinfo.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_getswapinfo.c 2009-04-07 11:07:26 +0200
+@@ -25,7 +25,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_getswapinfo.c,v 1.27.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/time.h>
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_i386.c freebsd-libs-7.1/lib/libkvm/kvm_i386.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_i386.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_i386.c 2009-04-07 11:07:26 +0200
+@@ -32,7 +32,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.21.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ #if 0
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_minidump_amd64.c freebsd-libs-7.1/lib/libkvm/kvm_minidump_amd64.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_minidump_amd64.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_minidump_amd64.c 2009-04-07 11:07:26 +0200
+@@ -24,7 +24,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_amd64.c,v 1.2.8.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ /*
+ * AMD64 machine dependent routines for kvm and minidumps.
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_minidump_i386.c freebsd-libs-7.1/lib/libkvm/kvm_minidump_i386.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_minidump_i386.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_minidump_i386.c 2009-04-07 11:07:26 +0200
+@@ -24,7 +24,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_i386.c,v 1.2.8.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ /*
+ * AMD64 machine dependent routines for kvm and minidumps.
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_pcpu.c freebsd-libs-7.1/lib/libkvm/kvm_pcpu.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_pcpu.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_pcpu.c 2009-04-07 11:07:26 +0200
+@@ -29,7 +29,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_pcpu.c,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/pcpu.h>
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_powerpc.c freebsd-libs-7.1/lib/libkvm/kvm_powerpc.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_powerpc.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_powerpc.c 2009-04-07 11:07:26 +0200
+@@ -36,7 +36,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_powerpc.c,v 1.3.18.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_proc.c freebsd-libs-7.1/lib/libkvm/kvm_proc.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_proc.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_proc.c 2009-04-07 11:07:26 +0200
+@@ -38,7 +38,6 @@
+ #endif
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.94.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ /*
+ * Proc traversal interface for kvm. ps and w are (probably) the exclusive
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_sparc64.c freebsd-libs-7.1/lib/libkvm/kvm_sparc64.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_sparc64.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_sparc64.c 2009-04-07 11:07:26 +0200
+@@ -34,7 +34,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc64.c,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ #if 0
+diff -Nurd freebsd-libs-7.1.orig/lib/libkvm/kvm_sparc.c freebsd-libs-7.1/lib/libkvm/kvm_sparc.c
+--- freebsd-libs-7.1.orig/lib/libkvm/kvm_sparc.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libkvm/kvm_sparc.c 2009-04-07 11:07:26 +0200
+@@ -32,7 +32,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc.c,v 1.7.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #if defined(LIBC_SCCS) && !defined(lint)
+ #if 0
+diff -Nurd freebsd-libs-7.1.orig/lib/libusbhid/data.c freebsd-libs-7.1/lib/libusbhid/data.c
+--- freebsd-libs-7.1.orig/lib/libusbhid/data.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libusbhid/data.c 2009-04-07 11:07:26 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.6.30.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <assert.h>
+ #include <stdlib.h>
+diff -Nurd freebsd-libs-7.1.orig/lib/libusbhid/descr.c freebsd-libs-7.1/lib/libusbhid/descr.c
+--- freebsd-libs-7.1.orig/lib/libusbhid/descr.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libusbhid/descr.c 2009-04-07 11:07:26 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.8.30.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/types.h>
+
+diff -Nurd freebsd-libs-7.1.orig/lib/libusbhid/parse.c freebsd-libs-7.1/lib/libusbhid/parse.c
+--- freebsd-libs-7.1.orig/lib/libusbhid/parse.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libusbhid/parse.c 2009-04-07 11:07:26 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libusbhid/parse.c,v 1.10.26.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <assert.h>
+ #include <stdlib.h>
+diff -Nurd freebsd-libs-7.1.orig/lib/libusbhid/usage.c freebsd-libs-7.1/lib/libusbhid/usage.c
+--- freebsd-libs-7.1.orig/lib/libusbhid/usage.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/lib/libusbhid/usage.c 2009-04-07 11:07:26 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/lib/libusbhid/usage.c,v 1.8.30.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <assert.h>
+ #include <ctype.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/cam.c freebsd-libs-7.1/sys/cam/cam.c
+--- freebsd-libs-7.1.orig/sys/cam/cam.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/cam.c 2009-04-07 11:07:27 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.11.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #ifdef _KERNEL
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/cam_periph.c freebsd-libs-7.1/sys/cam/cam_periph.c
+--- freebsd-libs-7.1.orig/sys/cam/cam_periph.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/cam_periph.c 2009-04-07 11:07:27 +0200
+@@ -28,7 +28,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.69.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/systm.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/cam_queue.c freebsd-libs-7.1/sys/cam/cam_queue.c
+--- freebsd-libs-7.1.orig/sys/cam/cam_queue.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/cam_queue.c 2009-04-07 11:07:27 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.9.18.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/systm.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/cam_sim.c freebsd-libs-7.1/sys/cam/cam_sim.c
+--- freebsd-libs-7.1.orig/sys/cam/cam_sim.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/cam_sim.c 2009-04-07 11:07:27 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.11.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/systm.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/cam_xpt.c freebsd-libs-7.1/sys/cam/cam_xpt.c
+--- freebsd-libs-7.1.orig/sys/cam/cam_xpt.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/cam_xpt.c 2009-04-07 11:07:27 +0200
+@@ -28,7 +28,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.190.2.6.2.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/bus.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_all.c freebsd-libs-7.1/sys/cam/scsi/scsi_all.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_all.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_all.c 2009-04-07 11:07:26 +0200
+@@ -28,7 +28,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.51.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_cd.c freebsd-libs-7.1/sys/cam/scsi/scsi_cd.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_cd.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_cd.c 2009-04-07 11:07:26 +0200
+@@ -46,7 +46,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.102.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include "opt_cd.h"
+
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_ch.c freebsd-libs-7.1/sys/cam/scsi/scsi_ch.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_ch.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_ch.c 2009-04-07 11:07:26 +0200
+@@ -68,7 +68,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.46.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/queue.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_da.c freebsd-libs-7.1/sys/cam/scsi/scsi_da.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_da.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_da.c 2009-04-07 11:07:26 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.224.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_low.c freebsd-libs-7.1/sys/cam/scsi/scsi_low.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_low.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_low.c 2009-04-07 11:07:26 +0200
+@@ -2,7 +2,6 @@
+ /* $NetBSD$ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.29.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #define SCSI_LOW_STATICS
+ #define SCSI_LOW_DEBUG
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_low_pisa.c freebsd-libs-7.1/sys/cam/scsi/scsi_low_pisa.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_low_pisa.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_low_pisa.c 2009-04-07 11:07:26 +0200
+@@ -32,7 +32,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.c,v 1.8.18.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #ifdef __NetBSD__
+ #include <sys/param.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_pass.c freebsd-libs-7.1/sys/cam/scsi/scsi_pass.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_pass.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_pass.c 2009-04-07 11:07:26 +0200
+@@ -26,7 +26,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.48.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/systm.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_pt.c freebsd-libs-7.1/sys/cam/scsi/scsi_pt.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_pt.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_pt.c 2009-04-07 11:07:26 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.47.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/queue.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_sa.c freebsd-libs-7.1/sys/cam/scsi/scsi_sa.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_sa.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_sa.c 2009-04-07 11:07:27 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.113.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/queue.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_ses.c freebsd-libs-7.1/sys/cam/scsi/scsi_ses.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_ses.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_ses.c 2009-04-07 11:07:27 +0200
+@@ -25,7 +25,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.35.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/queue.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_sg.c freebsd-libs-7.1/sys/cam/scsi/scsi_sg.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_sg.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_sg.c 2009-04-07 11:07:27 +0200
+@@ -30,7 +30,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.9.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/systm.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_targ_bh.c freebsd-libs-7.1/sys/cam/scsi/scsi_targ_bh.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_targ_bh.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_targ_bh.c 2009-04-07 11:07:27 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.25.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+ #include <sys/queue.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/cam/scsi/scsi_target.c freebsd-libs-7.1/sys/cam/scsi/scsi_target.c
+--- freebsd-libs-7.1.orig/sys/cam/scsi/scsi_target.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/cam/scsi/scsi_target.c 2009-04-07 11:07:27 +0200
+@@ -28,7 +28,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.73.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+
+ #include <sys/param.h>
+diff -Nurd freebsd-libs-7.1.orig/sys/kern/subr_sbuf.c freebsd-libs-7.1/sys/kern/subr_sbuf.c
+--- freebsd-libs-7.1.orig/sys/kern/subr_sbuf.c 2008-11-25 03:59:29 +0100
++++ freebsd-libs-7.1/sys/kern/subr_sbuf.c 2009-04-07 11:07:27 +0200
+@@ -27,7 +27,6 @@
+ */
+
+ #include <sys/cdefs.h>
+-__FBSDID("$FreeBSD: src/sys/kern/subr_sbuf.c,v 1.30.6.1 2008/11/25 02:59:29 kensmith Exp $");
+
+ #include <sys/param.h>
+
Modified: trunk/freebsd-libs/debian/patches/00_kernel.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_kernel.diff 2009-04-07 08:27:15 UTC (rev 2406)
+++ trunk/freebsd-libs/debian/patches/00_kernel.diff 2009-04-07 09:53:29 UTC (rev 2407)
@@ -1,6 +1,5 @@
-diff -ur lib.old/kernel/sys/cam/cam.c lib/kernel/sys/cam/cam.c
---- lib.old/kernel/sys/cam/cam.c 2003-06-15 00:17:38.000000000 +0200
-+++ lib/kernel/sys/cam/cam.c 2005-08-15 08:18:42.000000000 +0200
+--- a/sys/cam/cam.c 2003-06-15 00:17:38.000000000 +0200
++++ b/sys/cam/cam.c 2005-08-15 08:18:42.000000000 +0200
@@ -37,6 +37,7 @@
#include <sys/sysctl.h>
#else /* _KERNEL */
@@ -9,9 +8,8 @@
#include <stdio.h>
#endif /* _KERNEL */
-diff -ur lib.old/kernel/sys/cam/scsi/scsi_all.c lib/kernel/sys/cam/scsi/scsi_all.c
---- lib.old/kernel/sys/cam/scsi/scsi_all.c 2004-08-13 20:45:04.000000000 +0200
-+++ lib/kernel/sys/cam/scsi/scsi_all.c 2005-08-15 08:21:32.000000000 +0200
+--- a/sys/cam/scsi/scsi_all.c 2004-08-13 20:45:04.000000000 +0200
++++ b/sys/cam/scsi/scsi_all.c 2005-08-15 08:21:32.000000000 +0200
@@ -41,6 +41,7 @@
#include <sys/sysctl.h>
#else
@@ -20,9 +18,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-diff -ur lib.old/kernel/sys/cam/scsi/scsi_all.h lib/kernel/sys/cam/scsi/scsi_all.h
---- lib.old/kernel/sys/cam/scsi/scsi_all.h 2003-04-30 02:35:22.000000000 +0200
-+++ lib/kernel/sys/cam/scsi/scsi_all.h 2005-08-15 08:22:30.000000000 +0200
+--- a/sys/cam/scsi/scsi_all.h 2003-04-30 02:35:22.000000000 +0200
++++ b/sys/cam/scsi/scsi_all.h 2005-08-15 08:22:30.000000000 +0200
@@ -32,6 +32,8 @@
* bus reset.
*/
@@ -32,3 +29,14 @@
#endif /* _KERNEL */
/*
+--- a/sys/cam/cam_xpt.c.orig 2009-04-07 11:48:37 +0200
++++ b/sys/cam/cam_xpt.c 2009-04-07 11:48:51 +0200
+@@ -779,7 +779,7 @@
+ static void xpt_run_dev_allocq(struct cam_eb *bus);
+ static void xpt_run_dev_sendq(struct cam_eb *bus);
+ static timeout_t xpt_release_devq_timeout;
+-static void xpt_release_simq_timeout(void *arg) __unused;
++static void xpt_release_simq_timeout(void *arg);
+ static void xpt_release_bus(struct cam_eb *bus);
+ static void xpt_release_devq_device(struct cam_ed *dev, u_int count,
+ int run_queue);
Modified: trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff 2009-04-07 08:27:15 UTC (rev 2406)
+++ trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff 2009-04-07 09:53:29 UTC (rev 2407)
@@ -6,25 +6,11 @@
INCS= camlib.h
-DPADD= ${LIBSBUF}
--LDADD+= -lsbuf
-+LDADD+= -L../libsbuf/ -lsbuf
+-LDADD= -lsbuf
++LDADD= -L../libsbuf/ -lsbuf -lbsd
MAN= cam.3 cam_cdbparse.3
-@@ -34,9 +33,11 @@
- cam_cdbparse.3 csio_encode_visit.3 \
- cam_cdbparse.3 buff_encode_visit.3
-
--.PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam
-+KERNEL= ${.CURDIR}/../kernel
-
--SDIR= ${.CURDIR}/../../sys
-+.PATH: ${KERNEL}/sys/cam/scsi ${KERNEL}/sys/cam
-+
-+SDIR= ${KERNEL}/sys
- CFLAGS+= -I${.CURDIR} -I${SDIR}
-
- .include <bsd.lib.mk>
diff -ur lib.old/libcam/camlib.h lib/libcam/camlib.h
--- lib.old/libcam/camlib.h 2006-04-19 09:40:00.000000000 +0200
+++ lib/libcam/camlib.h 2006-04-19 09:38:34.000000000 +0200
@@ -54,3 +40,4 @@
int buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
int (*arg_get)(void *hook, char *field_name),
void *gethook);
+
Deleted: trunk/freebsd-libs/debian/patches/02_glibc_libsbuf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/02_glibc_libsbuf.diff 2009-04-07 08:27:15 UTC (rev 2406)
+++ trunk/freebsd-libs/debian/patches/02_glibc_libsbuf.diff 2009-04-07 09:53:29 UTC (rev 2407)
@@ -1,17 +0,0 @@
-diff -ur lib.old/libsbuf/Makefile lib/libsbuf/Makefile
---- lib.old/libsbuf/Makefile 2003-08-18 17:25:39.000000000 +0200
-+++ lib/libsbuf/Makefile 2005-08-13 11:06:10.000000000 +0200
-@@ -1,10 +1,11 @@
- # $FreeBSD: src/lib/libsbuf/Makefile,v 1.5 2003/08/18 15:25:39 obrien Exp $
-
- LIB= sbuf
--SHLIBDIR?= /lib
-+SHLIBDIR?= /lib
-+
- SRCS= subr_sbuf.c
- WARNS?= 2
-
--.PATH: ${.CURDIR}/../../sys/kern
-+.PATH: ${.CURDIR}/../kernel/sys/kern
-
- .include <bsd.lib.mk>
Modified: trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff 2009-04-07 08:27:15 UTC (rev 2406)
+++ trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff 2009-04-07 09:53:29 UTC (rev 2407)
@@ -196,3 +196,33 @@
}
/*
+--- lib/libkvm/kvm.c.orig 2009-04-07 11:40:09 +0200
++++ lib/libkvm/kvm.c 2009-04-07 11:40:32 +0200
+@@ -243,7 +243,7 @@
+ kvm_openfiles(uf, mf, sf, flag, errout)
+ const char *uf;
+ const char *mf;
+- const char *sf __unused;
++ const char *sf;
+ int flag;
+ char *errout;
+ {
+@@ -262,7 +262,7 @@
+ kvm_open(uf, mf, sf, flag, errstr)
+ const char *uf;
+ const char *mf;
+- const char *sf __unused;
++ const char *sf;
+ int flag;
+ const char *errstr;
+ {
+--- lib/libkvm/Makefile.orig 2009-04-07 11:42:07 +0200
++++ lib/libkvm/Makefile 2009-04-07 11:42:27 +0200
+@@ -2,6 +2,7 @@
+ # $FreeBSD: src/lib/libkvm/Makefile,v 1.17.2.2.2.1 2008/11/25 02:59:29 kensmith Exp $
+
+ LIB= kvm
++LDADD= -lbsd -lfreebsd
+ SHLIBDIR?= /lib
+
+ .if ${MACHINE} == "sun4v"
Modified: trunk/freebsd-libs/debian/patches/06_libgeom.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/06_libgeom.diff 2009-04-07 08:27:15 UTC (rev 2406)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff 2009-04-07 09:53:29 UTC (rev 2407)
@@ -5,8 +5,8 @@
WARNS?= 3
DPADD= ${LIBBSDXML} ${LIBSBUF}
--LDADD+= -lbsdxml -lsbuf
-+LDADD+= -lexpat -L../libsbuf/ -lsbuf -lrt
+-LDADD= -lbsdxml -lsbuf
++LDADD= -lexpat -L../libsbuf/ -lsbuf -lrt -lbsd -lfreebsd
MAN= libgeom.3
Modified: trunk/freebsd-libs/debian/patches/07_libkiconv.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/07_libkiconv.diff 2009-04-07 08:27:15 UTC (rev 2406)
+++ trunk/freebsd-libs/debian/patches/07_libkiconv.diff 2009-04-07 09:53:29 UTC (rev 2407)
@@ -14,6 +14,6 @@
kiconv.3 kiconv_add_xlat16_table.3
CFLAGS+= -I${.CURDIR}/../../sys
-+LDADD+= -ldl
++LDADD= -ldl -lfreebsd
.include <bsd.lib.mk>
Modified: trunk/freebsd-libs/debian/patches/08_devstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_devstat.diff 2009-04-07 08:27:15 UTC (rev 2406)
+++ trunk/freebsd-libs/debian/patches/08_devstat.diff 2009-04-07 09:53:29 UTC (rev 2407)
@@ -5,8 +5,8 @@
INCS= devstat.h
DPADD= ${LIBKVM}
--LDADD+= -lkvm
-+LDADD+= -lrt ../libkvm/libkvm.so.0
+-LDADD= -lkvm
++LDADD= -lfreebsd -lrt ../libkvm/libkvm.so.0
MAN= devstat.3
Added: trunk/freebsd-libs/debian/patches/09_libusbhid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/09_libusbhid.diff (rev 0)
+++ trunk/freebsd-libs/debian/patches/09_libusbhid.diff 2009-04-07 09:53:29 UTC (rev 2407)
@@ -0,0 +1,10 @@
+--- lib/libusbhid/Makefile.orig 2009-04-07 11:33:47 +0200
++++ lib/libusbhid/Makefile 2009-04-07 11:35:09 +0200
+@@ -4,6 +4,7 @@
+ LIB= usbhid
+ MAN= usbhid.3
+
++LDADD= -lbsd
+ SHLIB_MAJOR= 3
+
+ MLINKS= usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
Added: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series (rev 0)
+++ trunk/freebsd-libs/debian/patches/series 2009-04-07 09:53:29 UTC (rev 2407)
@@ -0,0 +1,9 @@
+00_fbsdid.diff
+00_kernel.diff
+01_glibc_libcam.diff -p0
+04_glibc_libkvm.diff -p0
+05_glibc_libipx.diff -p0
+06_libgeom.diff -p0
+07_libkiconv.diff -p0
+08_devstat.diff -p0
+09_libusbhid.diff -p0
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2009-04-07 08:27:15 UTC (rev 2406)
+++ trunk/freebsd-libs/debian/rules 2009-04-07 09:53:29 UTC (rev 2407)
@@ -17,61 +17,60 @@
CFLAGS += -O2
endif
-SRC_DIR=src
-KERNEL_SRC=kfreebsd-source-7.1
+ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
+RELENG=RELENG_7_1_0_RELEASE
+VERSION=7.1
PATH:=/usr/lib/freebsd:$(PATH)
DESTDIR=$(CURDIR)/debian/tmp
PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
export SHLIB_MAJOR=0
export SHLIBDIR=/usr/lib
-$(SRC_DIR):
- tar -xzf $(CURDIR)/src.tar.gz
- tar -C $(SRC_DIR)/lib -xjf /usr/src/$(KERNEL_SRC).tar.bz2 $(KERNEL_SRC)/sys/kern/subr_sbuf.c $(KERNEL_SRC)/sys/cam
- mv $(SRC_DIR)/lib/$(KERNEL_SRC) $(SRC_DIR)/lib/kernel
+build: build-arch build-indep
- find $(SRC_DIR) -type f | (set -e ; while read i ; do sed -i $$i \
- -e "/^__FBSDID/d" \
- -e "s/[ \t]*__\(dead2\|unused\|result\\)[ \t]*//g" \
- -e "s,<sys/queue\.h>,<bsd/queue.h>,g" \
- -e "s/^LDADD=/LDADD+=/g" \
- -e "s/getline/bsd_&/g" \
- ; done)
-
- set -e ; for i in $(CURDIR)/debian/patches/*.diff ; do \
- echo "--- Patch $$i ---" ; \
- patch -p1 -d $(SRC_DIR)/lib < $$i ; \
+get-orig-source:
+ rm -rf freebsd-libs-$(VERSION)
+ for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx lib/libkiconv \
+ lib/libkvm lib/libsbuf lib/libusbhid sys/cam sys/kern/subr_sbuf.c ; do \
+ cvs -d $(ANONCVS) export -r $(RELENG) -N -d freebsd-libs-$(VERSION) src/$$i ; \
done
+ mv freebsd-libs-$(VERSION)/src/* freebsd-libs-$(VERSION)
+ rmdir freebsd-libs-$(VERSION)/src
+ tar -czf ../freebsd-libs_$(VERSION).orig.tar.gz freebsd-libs-$(VERSION)
+ rm -rf freebsd-libs-$(VERSION)
-build: build-arch build-indep
+patch: patch-stamp
+patch-stamp:
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ touch patch-stamp
build-arch: build-arch-stamp
build-arch-stamp: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-devstat
touch build-arch-stamp
-build-cam: build-sbuf $(SRC_DIR)
- LDADD="-lbsd" $(PMAKE) -C $(SRC_DIR)/lib/libcam
+build-cam: build-sbuf patch
+ $(PMAKE) -C $(CURDIR)/lib/libcam
-build-geom: build-sbuf $(SRC_DIR)
- LDADD="-lbsd -lfreebsd" $(PMAKE) -C $(SRC_DIR)/lib/libgeom
+build-geom: build-sbuf patch
+ $(PMAKE) -C $(CURDIR)/lib/libgeom
-build-ipx: $(SRC_DIR)
- $(PMAKE) -C $(SRC_DIR)/lib/libipx
+build-ipx: patch
+ $(PMAKE) -C $(CURDIR)/lib/libipx
-build-kiconv: $(SRC_DIR)
- LDADD="-lfreebsd" $(PMAKE) -C $(SRC_DIR)/lib/libkiconv
+build-kiconv: patch
+ $(PMAKE) -C $(CURDIR)/lib/libkiconv
-build-kvm: $(SRC_DIR)
- LDADD="-lbsd -lfreebsd" $(PMAKE) -C $(SRC_DIR)/lib/libkvm
+build-kvm: patch
+ $(PMAKE) -C $(CURDIR)/lib/libkvm
-build-devstat: $(SRC_DIR) build-kvm
- LDADD="-lfreebsd" $(PMAKE) -C $(SRC_DIR)/lib/libdevstat
+build-devstat: patch build-kvm
+ $(PMAKE) -C $(CURDIR)/lib/libdevstat
-build-sbuf: $(SRC_DIR)
- $(PMAKE) -C $(SRC_DIR)/lib/libsbuf
+build-sbuf: patch
+ $(PMAKE) -C $(CURDIR)/lib/libsbuf
-build-usbhid: $(SRC_DIR)
- LDADD="-lbsd" $(PMAKE) -C $(SRC_DIR)/lib/libusbhid
+build-usbhid: patch
+ $(PMAKE) -C $(CURDIR)/lib/libusbhid
build-indep: build-indep-stamp
build-indep-stamp:
@@ -80,10 +79,10 @@
clean:
dh_testdir
dh_testroot
- rm -f build-arch-stamp build-indep-stamp
+ rm -f *stamp
# Add here commands to clean up after the build process.
- rm -rf $(SRC_DIR) $(KERN_DIR)
+ rm -rf patch $(KERN_DIR)
dh_clean
@@ -97,14 +96,14 @@
dh_installdirs -s
mkdir -p $(DESTDIR)/usr/{lib,include,share/man/man3}
- $(PMAKE) -C $(SRC_DIR)/lib/libsbuf install
- $(PMAKE) -C $(SRC_DIR)/lib/libcam install
- $(PMAKE) -C $(SRC_DIR)/lib/libgeom install
- $(PMAKE) -C $(SRC_DIR)/lib/libipx install
- $(PMAKE) -C $(SRC_DIR)/lib/libkiconv install
- $(PMAKE) -C $(SRC_DIR)/lib/libkvm install
- $(PMAKE) -C $(SRC_DIR)/lib/libdevstat install
- $(PMAKE) -C $(SRC_DIR)/lib/libusbhid install
+ $(PMAKE) -C $(CURDIR)/lib/libsbuf install
+ $(PMAKE) -C $(CURDIR)/lib/libcam install
+ $(PMAKE) -C $(CURDIR)/lib/libgeom install
+ $(PMAKE) -C $(CURDIR)/lib/libipx install
+ $(PMAKE) -C $(CURDIR)/lib/libkiconv install
+ $(PMAKE) -C $(CURDIR)/lib/libkvm install
+ $(PMAKE) -C $(CURDIR)/lib/libdevstat install
+ $(PMAKE) -C $(CURDIR)/lib/libusbhid install
dh_install -s --list-missing --sourcedir=debian/tmp
More information about the Glibc-bsd-commits
mailing list