[Glibc-bsd-commits] r3289 - in trunk/zfsutils/debian: . patches
Aurelien Jarno
aurel32 at alioth.debian.org
Fri Apr 22 15:49:11 UTC 2011
Author: aurel32
Date: 2011-04-22 15:49:10 +0000 (Fri, 22 Apr 2011)
New Revision: 3289
Added:
trunk/zfsutils/debian/libumem-dev.install
trunk/zfsutils/debian/libumem-dev.links
trunk/zfsutils/debian/libumem0-udeb.install
trunk/zfsutils/debian/libumem0.install
trunk/zfsutils/debian/libzpool-dev.install
trunk/zfsutils/debian/libzpool-dev.links
trunk/zfsutils/debian/libzpool0-udeb.install
trunk/zfsutils/debian/libzpool0.install
trunk/zfsutils/debian/patches/15_zpool.diff
trunk/zfsutils/debian/patches/16_ztest.fix
Modified:
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/control
trunk/zfsutils/debian/patches/series
trunk/zfsutils/debian/rules
trunk/zfsutils/debian/zfsutils.install
Log:
* Add zdb, zinject and ztest, based on a patch from Arno T?\195?\182ll.
Closes: #618592.
Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog 2011-04-22 15:32:33 UTC (rev 3288)
+++ trunk/zfsutils/debian/changelog 2011-04-22 15:49:10 UTC (rev 3289)
@@ -8,6 +8,8 @@
[ Aurelien Jarno ]
* Fix build with recent binutils versions.
+ * Add zdb, zinject and ztest, based on a patch from Arno Töll.
+ Closes: #618592.
-- Aurelien Jarno <aurel32 at debian.org> Fri, 22 Apr 2011 17:29:09 +0200
Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control 2011-04-22 15:32:33 UTC (rev 3288)
+++ trunk/zfsutils/debian/control 2011-04-22 15:49:10 UTC (rev 3289)
@@ -4,7 +4,8 @@
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>
Build-Depends: debhelper (>= 7), quilt, freebsd-buildutils, libbsd-dev (>= 0.1.4),
- libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51), libgeom-dev, libsbuf-dev
+ libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51), libgeom-dev, libsbuf-dev,
+ zlib1g-dev
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/zfsutils/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/zfsutils/
Standards-Version: 3.9.1
@@ -116,3 +117,58 @@
ZFS filesystems.
.
This is a minimal package for use in debian-installer.
+
+
+Package: libumem0
+Section: libs
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenSolaris name-value pair library
+ This package contains the OpenSolaris libumem library, to detect
+ memory management bugs in applications
+
+Package: libumem-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libumem0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Description: Development files for libnvpair
+ This package contains the header files and static library needed to
+ compile applications that use libumem.
+
+Package: libumem0-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenSolaris name-value pair library
+ This package contains the OpenSolaris libumem library, to detect
+ memory management bugs in applications
+
+
+Package: libzpool0
+Section: libs
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenSolaris name-value pair library
+ This package contains the OpenSolaris libzpool library.
+ .
+ This is a minimal package for use in debian-installer.
+
+Package: libzpool-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libzpool0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Description: Development files for libnvpair
+ This package contains the header files and static library needed to
+ compile applications that use libzpool.
+
+Package: libzpool0-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenSolaris name-value pair library
+ This package contains the OpenSolaris libzpool library.
+ .
+ This is a minimal package for use in debian-installer.
+
Added: trunk/zfsutils/debian/libumem-dev.install
===================================================================
--- trunk/zfsutils/debian/libumem-dev.install (rev 0)
+++ trunk/zfsutils/debian/libumem-dev.install 2011-04-22 15:49:10 UTC (rev 3289)
@@ -0,0 +1 @@
+cddl/lib/libumem/libumem.a usr/lib
Added: trunk/zfsutils/debian/libumem-dev.links
===================================================================
--- trunk/zfsutils/debian/libumem-dev.links (rev 0)
+++ trunk/zfsutils/debian/libumem-dev.links 2011-04-22 15:49:10 UTC (rev 3289)
@@ -0,0 +1 @@
+lib/libumem.so.0 usr/lib/libumem.so
Added: trunk/zfsutils/debian/libumem0-udeb.install
===================================================================
--- trunk/zfsutils/debian/libumem0-udeb.install (rev 0)
+++ trunk/zfsutils/debian/libumem0-udeb.install 2011-04-22 15:49:10 UTC (rev 3289)
@@ -0,0 +1 @@
+cddl/lib/libumem/libumem.so.0 lib
Added: trunk/zfsutils/debian/libumem0.install
===================================================================
--- trunk/zfsutils/debian/libumem0.install (rev 0)
+++ trunk/zfsutils/debian/libumem0.install 2011-04-22 15:49:10 UTC (rev 3289)
@@ -0,0 +1 @@
+cddl/lib/libumem/libumem.so.0 lib
Added: trunk/zfsutils/debian/libzpool-dev.install
===================================================================
--- trunk/zfsutils/debian/libzpool-dev.install (rev 0)
+++ trunk/zfsutils/debian/libzpool-dev.install 2011-04-22 15:49:10 UTC (rev 3289)
@@ -0,0 +1 @@
+cddl/lib/libzpool/libzpool.a usr/lib
Added: trunk/zfsutils/debian/libzpool-dev.links
===================================================================
--- trunk/zfsutils/debian/libzpool-dev.links (rev 0)
+++ trunk/zfsutils/debian/libzpool-dev.links 2011-04-22 15:49:10 UTC (rev 3289)
@@ -0,0 +1 @@
+lib/libzpool.so.0 usr/lib/libzpool.so
Added: trunk/zfsutils/debian/libzpool0-udeb.install
===================================================================
--- trunk/zfsutils/debian/libzpool0-udeb.install (rev 0)
+++ trunk/zfsutils/debian/libzpool0-udeb.install 2011-04-22 15:49:10 UTC (rev 3289)
@@ -0,0 +1 @@
+cddl/lib/libzpool/libzpool.so.0 lib
Added: trunk/zfsutils/debian/libzpool0.install
===================================================================
--- trunk/zfsutils/debian/libzpool0.install (rev 0)
+++ trunk/zfsutils/debian/libzpool0.install 2011-04-22 15:49:10 UTC (rev 3289)
@@ -0,0 +1 @@
+cddl/lib/libzpool/libzpool.so.0 lib
Added: trunk/zfsutils/debian/patches/15_zpool.diff
===================================================================
--- trunk/zfsutils/debian/patches/15_zpool.diff (rev 0)
+++ trunk/zfsutils/debian/patches/15_zpool.diff 2011-04-22 15:49:10 UTC (rev 3289)
@@ -0,0 +1,94 @@
+Index: zfsutils-8.1-patch/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
+===================================================================
+--- zfsutils-8.1-patch.orig/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c 2011-04-06 17:17:31.000000000 -0400
++++ zfsutils-8.1-patch/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c 2011-04-06 17:17:47.000000000 -0400
+@@ -141,6 +141,9 @@
+ extern uint64_t zfs_write_limit_max;
+ extern kmutex_t zfs_write_limit_lock;
+
++
++#define __unused __attribute__((unused))
++
+ #define ARC_REDUCE_DNLC_PERCENT 3
+ uint_t arc_reduce_dnlc_percent = ARC_REDUCE_DNLC_PERCENT;
+
+Index: zfsutils-8.1-patch/cddl/usr.sbin/zdb/Makefile
+===================================================================
+--- zfsutils-8.1-patch.orig/cddl/usr.sbin/zdb/Makefile 2011-04-06 17:17:31.000000000 -0400
++++ zfsutils-8.1-patch/cddl/usr.sbin/zdb/Makefile 2011-04-06 17:17:47.000000000 -0400
+@@ -18,10 +18,19 @@
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+ CFLAGS+= -I${.CURDIR}/../../lib/libumem
++CFLAGS+= -D'alloca(x)=__builtin_alloca(x)'
++
+
+ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
+ ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
+-LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
++
++LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzpool
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
+
+ CSTD= c99
+
+Index: zfsutils-8.1-patch/cddl/usr.bin/zinject/Makefile
+===================================================================
+--- zfsutils-8.1-patch.orig/cddl/usr.bin/zinject/Makefile 2011-04-06 17:17:31.000000000 -0400
++++ zfsutils-8.1-patch/cddl/usr.bin/zinject/Makefile 2011-04-06 17:17:47.000000000 -0400
+@@ -17,9 +17,16 @@
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
+ CFLAGS+= -I${.CURDIR}/../../lib/libumem
++CFLAGS+= -D'alloca(x)=__builtin_alloca(x)'
+
+ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
+ ${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
+-LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
++LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzpool
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
+
+ .include <bsd.prog.mk>
+Index: zfsutils-8.1-patch/cddl/usr.bin/ztest/Makefile
+===================================================================
+--- zfsutils-8.1-patch.orig/cddl/usr.bin/ztest/Makefile 2011-04-06 17:17:31.000000000 -0400
++++ zfsutils-8.1-patch/cddl/usr.bin/ztest/Makefile 2011-04-06 17:21:32.000000000 -0400
+@@ -14,10 +14,15 @@
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
+ CFLAGS+= -I${.CURDIR}/../../lib/libumem
++CFLAGS+= -D'alloca(x)=__builtin_alloca(x)'
+
+ DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+ ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+-LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
++LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lrt -ldl -lbsd
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzpool
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
+
+ CSTD= c99
+
+Index: zfsutils-8.1-patch/cddl/lib/libzpool/Makefile
+===================================================================
+--- zfsutils-8.1-patch.orig/cddl/lib/libzpool/Makefile 2011-04-06 17:17:31.000000000 -0400
++++ zfsutils-8.1-patch/cddl/lib/libzpool/Makefile 2011-04-06 17:17:47.000000000 -0400
+@@ -51,6 +51,7 @@
+ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread
+ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
+ CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_ARCH}/include
++CFLAGS+= -D'alloca(x)=__builtin_alloca(x)'
+
+ DPADD= ${LIBPTHREAD} ${LIBZ}
+ LDADD= -lpthread -lz
Added: trunk/zfsutils/debian/patches/16_ztest.fix
===================================================================
--- trunk/zfsutils/debian/patches/16_ztest.fix (rev 0)
+++ trunk/zfsutils/debian/patches/16_ztest.fix 2011-04-22 15:49:10 UTC (rev 3289)
@@ -0,0 +1,27 @@
+From: Arno Töll <debian at toell.net>
+Subject: Fix assertion problems for ztest
+
+* cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fix path problems
+
+Origin: upstream,
+ http://freshbsd.org/2010/11/01/10/41/05
+
+Cherry pick patch from upstream to get the `ztest' binary working in the
+ current Debian version of zfsutils. This patch may be removed, as soon
+ as a more recent vesion of zfsutils is shipped with Debian
+
+Last-Update: 2011-04-22
+
+--- a/cddl/contrib/opensolaris/cmd/ztest/ztest.c
++++ b/cddl/contrib/opensolaris/cmd/ztest/ztest.c
+@@ -2907,8 +2907,8 @@
+ int isalen;
+ FILE *fp;
+
+- if (realpath(progname, zdb) == NULL)
+- assert(!"realpath() failed");
++
++ strlcpy(zdb, "/usr/bin/ztest", sizeof(zdb));
+
+ /* zdb lives in /usr/sbin, while ztest lives in /usr/bin */
+ bin = strstr(zdb, "/usr/bin/");
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2011-04-22 15:32:33 UTC (rev 3288)
+++ trunk/zfsutils/debian/patches/series 2011-04-22 15:49:10 UTC (rev 3289)
@@ -12,3 +12,5 @@
12_freebsd.diff
13_mnttab.diff
14_bootloader_advice.diff
+15_zpool.diff
+16_ztest.fix
Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules 2011-04-22 15:32:33 UTC (rev 3288)
+++ trunk/zfsutils/debian/rules 2011-04-22 15:49:10 UTC (rev 3289)
@@ -42,8 +42,11 @@
cddl/contrib/opensolaris/lib/libzpool \
sys/cddl/compat/opensolaris \
sys/cddl/contrib/opensolaris \
+ cddl/lib/libavl \
cddl/lib/libnvpair \
cddl/lib/libuutil \
+ cddl/lib/libzpool \
+ cddl/lib/libumem \
cddl/lib/libzfs \
cddl/sbin/zpool \
cddl/sbin/zfs \
@@ -63,7 +66,7 @@
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
touch $@
-build: build-libuutil build-libnvpair build-libzfs build-zfsutils
+build: build-libuutil build-libnvpair build-libzfs build-libumem build-libzpool build-zfsutils build-libavl
build-libuutil: build-libuutil-stamp
build-libuutil-stamp: patch
@@ -80,10 +83,35 @@
$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs
touch $@
+build-libumem: build-libumem-stamp
+build-libumem-stamp: patch
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libumem
+ touch $@
+
+
+build-libzpool: build-libzpool-stamp
+build-libzpool-stamp: patch
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libzpool
+ touch $@
+
+build-libzfs: build-libzfs-stamp
+build-libzfs-stamp: patch build-libnvpair-stamp build-libuutil-stamp
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libzfs
+ touch $@
+
+build-libavl: build-libavl-stamp
+build-libavl-stamp: patch
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libavl
+ touch $@
+
build-zfsutils: build-zfsutils-stamp
-build-zfsutils-stamp: patch build-libzfs-stamp build-libnvpair-stamp build-libuutil-stamp
+build-zfsutils-stamp: patch build-libzfs-stamp build-libnvpair-stamp build-libuutil-stamp build-libumem build-libzpool build-libavl
$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool
$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs
+
+ $(PMAKE) -C $(CURDIR)/cddl/usr.sbin/zdb
+ $(PMAKE) -C $(CURDIR)/cddl/usr.bin/zinject
+ $(PMAKE) -C $(CURDIR)/cddl/usr.bin/ztest/
touch $@
clean:
@@ -98,6 +126,14 @@
$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool clean
$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs clean
+
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libumem clean
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libzpool clean
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libavl clean
+ $(PMAKE) -C $(CURDIR)/cddl/usr.sbin/zdb clean
+ $(PMAKE) -C $(CURDIR)/cddl/usr.bin/ztest clean
+ $(PMAKE) -C $(CURDIR)/cddl/usr.bin/zinject clean
+
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
rm -rf .pc
rm -f *stamp
@@ -135,6 +171,8 @@
dh_makeshlibs -plibnvpair0 --add-udeb=libnvpair0-udeb
dh_makeshlibs -plibuutil0 --add-udeb=libuutil0-udeb
dh_makeshlibs -plibzfs0 --add-udeb=libzfs0-udeb
+ dh_makeshlibs -pzpool0 --add-udeb=libzpool0-udeb
+ dh_makeshlibs -pumem0 --add-udeb=libumem0-udeb.install
dh_makeshlibs -pzfsutils --add-udeb=zfsutils-udeb
dh_installdeb -a
dh_shlibdeps -a
Modified: trunk/zfsutils/debian/zfsutils.install
===================================================================
--- trunk/zfsutils/debian/zfsutils.install 2011-04-22 15:32:33 UTC (rev 3288)
+++ trunk/zfsutils/debian/zfsutils.install 2011-04-22 15:49:10 UTC (rev 3289)
@@ -1,2 +1,5 @@
-cddl/sbin/zpool/zpool /sbin
-cddl/sbin/zfs/zfs /sbin
+cddl/sbin/zpool/zpool /sbin
+cddl/sbin/zfs/zfs /sbin
+cddl/usr.bin/zinject/zinject /usr/bin
+cddl/usr.bin/ztest/ztest /usr/bin
+cddl/usr.sbin/zdb/zdb /usr/sbin
More information about the Glibc-bsd-commits
mailing list