[Glibc-bsd-commits] r3100 - trunk/zfsutils/debian
Aurelien Jarno
aurel32 at alioth.debian.org
Thu Jul 29 02:18:42 UTC 2010
Author: aurel32
Date: 2010-07-29 02:18:41 +0000 (Thu, 29 Jul 2010)
New Revision: 3100
Added:
trunk/zfsutils/debian/libnvpair-dev.links
trunk/zfsutils/debian/libuutil-dev.links
trunk/zfsutils/debian/libzfs-dev.links
Modified:
trunk/zfsutils/debian/compat
trunk/zfsutils/debian/control
trunk/zfsutils/debian/libnvpair-dev.install
trunk/zfsutils/debian/libnvpair0.install
trunk/zfsutils/debian/libuutil-dev.install
trunk/zfsutils/debian/libuutil0.install
trunk/zfsutils/debian/libzfs-dev.install
trunk/zfsutils/debian/libzfs0.install
trunk/zfsutils/debian/rules
trunk/zfsutils/debian/zfsutils.install
Log:
Rework build system
Modified: trunk/zfsutils/debian/compat
===================================================================
--- trunk/zfsutils/debian/compat 2010-07-29 01:56:57 UTC (rev 3099)
+++ trunk/zfsutils/debian/compat 2010-07-29 02:18:41 UTC (rev 3100)
@@ -1 +1 @@
-5
+7
Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control 2010-07-29 01:56:57 UTC (rev 3099)
+++ trunk/zfsutils/debian/control 2010-07-29 02:18:41 UTC (rev 3100)
@@ -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 (>= 5.0.0), quilt, freebsd-buildutils, libbsd-dev (>= 0.1.4),
+Build-Depends: debhelper (>= 7), quilt, freebsd-buildutils, libbsd-dev (>= 0.1.4),
libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51), libexpat-dev,
libavl-dev, libgeom-dev, libsbuf-dev
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/zfsutils/
Modified: trunk/zfsutils/debian/libnvpair-dev.install
===================================================================
--- trunk/zfsutils/debian/libnvpair-dev.install 2010-07-29 01:56:57 UTC (rev 3099)
+++ trunk/zfsutils/debian/libnvpair-dev.install 2010-07-29 02:18:41 UTC (rev 3100)
@@ -1,2 +1 @@
-usr/lib/libnvpair.a
-usr/lib/libnvpair.so
+cddl/lib/libnvpair/libnvpair.a usr/lib
Added: trunk/zfsutils/debian/libnvpair-dev.links
===================================================================
--- trunk/zfsutils/debian/libnvpair-dev.links (rev 0)
+++ trunk/zfsutils/debian/libnvpair-dev.links 2010-07-29 02:18:41 UTC (rev 3100)
@@ -0,0 +1 @@
+lib/libnvpair.so.0 usr/lib/libnvpair.so
Modified: trunk/zfsutils/debian/libnvpair0.install
===================================================================
--- trunk/zfsutils/debian/libnvpair0.install 2010-07-29 01:56:57 UTC (rev 3099)
+++ trunk/zfsutils/debian/libnvpair0.install 2010-07-29 02:18:41 UTC (rev 3100)
@@ -1 +1 @@
-usr/lib/libnvpair*.so.* lib
+cddl/lib/libnvpair/libnvpair.so.0 lib
Modified: trunk/zfsutils/debian/libuutil-dev.install
===================================================================
--- trunk/zfsutils/debian/libuutil-dev.install 2010-07-29 01:56:57 UTC (rev 3099)
+++ trunk/zfsutils/debian/libuutil-dev.install 2010-07-29 02:18:41 UTC (rev 3100)
@@ -1,2 +1 @@
-usr/lib/libuutil.a
-usr/lib/libuutil.so
+cddl/lib/libuutil/libuutil.a usr/lib
Added: trunk/zfsutils/debian/libuutil-dev.links
===================================================================
--- trunk/zfsutils/debian/libuutil-dev.links (rev 0)
+++ trunk/zfsutils/debian/libuutil-dev.links 2010-07-29 02:18:41 UTC (rev 3100)
@@ -0,0 +1 @@
+lib/libuutil.so.0 usr/lib/libuutil.so
Modified: trunk/zfsutils/debian/libuutil0.install
===================================================================
--- trunk/zfsutils/debian/libuutil0.install 2010-07-29 01:56:57 UTC (rev 3099)
+++ trunk/zfsutils/debian/libuutil0.install 2010-07-29 02:18:41 UTC (rev 3100)
@@ -1 +1 @@
-usr/lib/libuutil*.so.* lib
+cddl/lib/libuutil/libuutil.so.0 lib
Modified: trunk/zfsutils/debian/libzfs-dev.install
===================================================================
--- trunk/zfsutils/debian/libzfs-dev.install 2010-07-29 01:56:57 UTC (rev 3099)
+++ trunk/zfsutils/debian/libzfs-dev.install 2010-07-29 02:18:41 UTC (rev 3100)
@@ -1,2 +1 @@
-usr/lib/libzfs.a
-usr/lib/libzfs.so
+cddl/lib/libzfs/libzfs.a usr/lib
Added: trunk/zfsutils/debian/libzfs-dev.links
===================================================================
--- trunk/zfsutils/debian/libzfs-dev.links (rev 0)
+++ trunk/zfsutils/debian/libzfs-dev.links 2010-07-29 02:18:41 UTC (rev 3100)
@@ -0,0 +1 @@
+lib/libzfs.so.0 usr/lib/libzfs.so
Modified: trunk/zfsutils/debian/libzfs0.install
===================================================================
--- trunk/zfsutils/debian/libzfs0.install 2010-07-29 01:56:57 UTC (rev 3099)
+++ trunk/zfsutils/debian/libzfs0.install 2010-07-29 02:18:41 UTC (rev 3100)
@@ -1 +1 @@
-usr/lib/libzfs*.so.* lib
+cddl/lib/libzfs/libzfs.so.0 lib
Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules 2010-07-29 01:56:57 UTC (rev 3099)
+++ trunk/zfsutils/debian/rules 2010-07-29 02:18:41 UTC (rev 3100)
@@ -24,6 +24,7 @@
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=./
get-orig-source:
rm -rf $(ORIGDIR)
@@ -48,13 +49,25 @@
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
touch $@
-build: build-zfs
+build: build-libuutil build-libnvpair build-libzfs build-zfsutils
-build-zfs: build-zfs-stamp
-build-zfs-stamp: patch
- $(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair SHLIBDIR=./
- $(PMAKE) -C $(CURDIR)/cddl/lib/libuutil SHLIBDIR=./
- $(PMAKE) -C $(CURDIR)/cddl/lib/libzfs SHLIBDIR=./
+build-libuutil: build-libuutil-stamp
+build-libuutil-stamp: patch
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libuutil
+ touch $@
+
+build-libnvpair: build-libnvpair-stamp
+build-libnvpair-stamp: patch
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair
+ touch $@
+
+build-libzfs: build-libzfs-stamp
+build-libzfs-stamp: patch build-libnvpair-stamp build-libuutil-stamp
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libzfs
+ touch $@
+
+build-zfsutils: build-zfsutils-stamp
+build-zfsutils-stamp: patch build-libzfs-stamp build-libnvpair-stamp build-libuutil-stamp
$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool
$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs
touch $@
@@ -63,10 +76,14 @@
dh_testdir
dh_testroot
$(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair clean
+
$(PMAKE) -C $(CURDIR)/cddl/lib/libuutil clean
+
$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs clean
+
$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool clean
$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs clean
+
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
rm -rf .pc
rm -f *stamp
@@ -75,18 +92,10 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k -s
+ dh_prep -s
dh_installdirs -s
+ dh_install -s
- mkdir -p $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man8
- $(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair install
- $(PMAKE) -C $(CURDIR)/cddl/lib/libuutil install
- $(PMAKE) -C $(CURDIR)/cddl/lib/libzfs install
- $(PMAKE) -C $(CURDIR)/cddl/sbin/zpool install
- $(PMAKE) -C $(CURDIR)/cddl/sbin/zfs install
-
- dh_install -s --list-missing --sourcedir=debian/tmp
-
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
Modified: trunk/zfsutils/debian/zfsutils.install
===================================================================
--- trunk/zfsutils/debian/zfsutils.install 2010-07-29 01:56:57 UTC (rev 3099)
+++ trunk/zfsutils/debian/zfsutils.install 2010-07-29 02:18:41 UTC (rev 3100)
@@ -1,2 +1,2 @@
-zpool /sbin
-zfs /sbin
+cddl/sbin/zpool/zpool /sbin
+cddl/sbin/zfs/zfs /sbin
More information about the Glibc-bsd-commits
mailing list