[Glibc-bsd-commits] r5590 - in trunk/zfsutils/debian: . patches

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Sat Oct 4 18:40:52 UTC 2014 

Author: ps-guest
Date: 2014-10-04 18:40:52 +0000 (Sat, 04 Oct 2014)
New Revision: 5590

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/14_bootloader_advice.diff
   trunk/zfsutils/debian/patches/15_pthread_compat.diff
   trunk/zfsutils/debian/patches/disable_libjail.diff
   trunk/zfsutils/debian/patches/solaris_rlim64_t.diff
   trunk/zfsutils/debian/rules
Log:
zfsutils is also buildable at 10.1~svn272500-1



Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2014-10-04 18:39:58 UTC (rev 5589)
+++ trunk/zfsutils/debian/changelog	2014-10-04 18:40:52 UTC (rev 5590)
@@ -1,3 +1,9 @@
+zfsutils (10.1~svn272500-1) UNRELEASED; urgency=medium
+
+  *  New upstream snapshot of 10.1 releng
+
+ -- Christoph Egger <christoph at debian.org>  Fri, 19 Sep 2014 15:43:47 -0700
+
 zfsutils (10.1~svn271683-2) experimental; urgency=medium
 
   [ Steven Chamberlain ]

Modified: trunk/zfsutils/debian/patches/14_bootloader_advice.diff
===================================================================
--- trunk/zfsutils/debian/patches/14_bootloader_advice.diff	2014-10-04 18:39:58 UTC (rev 5589)
+++ trunk/zfsutils/debian/patches/14_bootloader_advice.diff	2014-10-04 18:40:52 UTC (rev 5590)
@@ -1,6 +1,6 @@
 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
 +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-@@ -5004,10 +5004,17 @@
+@@ -5009,10 +5009,17 @@ zpool_do_upgrade(int argc, char **argv)
  	if (cb.cb_poolname[0] != '\0') {
  		(void) printf(
  		    "If you boot from pool '%s', don't forget to update boot code.\n"
@@ -20,7 +20,7 @@
  
 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
 +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-@@ -2718,11 +2718,18 @@
+@@ -2718,11 +2718,18 @@ zpool_vdev_attach(zpool_handle_t *zhp,
  			(void) fprintf(stderr, dgettext(TEXT_DOMAIN, "If "
  			    "you boot from pool '%s', you may need to update\n"
  			    "boot code on newly attached disk '%s'.\n\n"

Modified: trunk/zfsutils/debian/patches/15_pthread_compat.diff
===================================================================
--- trunk/zfsutils/debian/patches/15_pthread_compat.diff	2014-10-04 18:39:58 UTC (rev 5589)
+++ trunk/zfsutils/debian/patches/15_pthread_compat.diff	2014-10-04 18:40:52 UTC (rev 5590)
@@ -1,6 +1,6 @@
 --- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
 +++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-@@ -239,7 +239,28 @@
+@@ -245,7 +245,28 @@ typedef struct kmutex {
  #undef	MUTEX_NOT_HELD
  #define	MUTEX_HELD(m)	((m)->m_owner == curthread)
  #define	MUTEX_NOT_HELD(m) (!MUTEX_HELD(m))

Modified: trunk/zfsutils/debian/patches/disable_libjail.diff
===================================================================
--- trunk/zfsutils/debian/patches/disable_libjail.diff	2014-10-04 18:39:58 UTC (rev 5589)
+++ trunk/zfsutils/debian/patches/disable_libjail.diff	2014-10-04 18:40:52 UTC (rev 5590)
@@ -1,14 +1,14 @@
 --- a/cddl/sbin/zfs/Makefile
 +++ b/cddl/sbin/zfs/Makefile
 @@ -1,5 +1,7 @@
- # $FreeBSD: stable/10/cddl/sbin/zfs/Makefile 248571 2013-03-21 08:38:03Z mm $
+ # $FreeBSD$
  
 +.include <bsd.own.mk>
 +
  .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
  
  PROG=	zfs
-@@ -22,8 +24,14 @@
+@@ -22,8 +24,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
  CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
  CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
  
@@ -37,7 +37,7 @@
  
  #include <libzfs.h>
  #include <libzfs_core.h>
-@@ -105,8 +107,10 @@
+@@ -105,8 +107,10 @@ static int zfs_do_hold(int argc, char **
  static int zfs_do_holds(int argc, char **argv);
  static int zfs_do_release(int argc, char **argv);
  static int zfs_do_diff(int argc, char **argv);
@@ -48,7 +48,7 @@
  static int zfs_do_bookmark(int argc, char **argv);
  
  /*
-@@ -134,8 +138,10 @@
+@@ -134,8 +138,10 @@ typedef enum {
  	HELP_GET,
  	HELP_INHERIT,
  	HELP_UPGRADE,
@@ -59,7 +59,7 @@
  	HELP_LIST,
  	HELP_MOUNT,
  	HELP_PROMOTE,
-@@ -211,8 +217,10 @@
+@@ -211,8 +217,10 @@ static zfs_command_t command_table[] = {
  	{ "release",	zfs_do_release,		HELP_RELEASE		},
  	{ "diff",	zfs_do_diff,		HELP_DIFF		},
  	{ NULL },
@@ -70,7 +70,7 @@
  };
  
  #define	NCOMMAND	(sizeof (command_table) / sizeof (command_table[0]))
-@@ -248,10 +256,12 @@
+@@ -248,10 +256,12 @@ get_usage(zfs_help_t idx)
  	case HELP_UPGRADE:
  		return (gettext("\tupgrade [-v]\n"
  		    "\tupgrade [-r] [-V version] <-a | filesystem ...>\n"));
@@ -83,7 +83,7 @@
  	case HELP_LIST:
  		return (gettext("\tlist [-Hp] [-r|-d max] [-o property[,...]] "
  		    "[-s property]...\n\t    [-S property]... [-t type[,...]] "
-@@ -6480,6 +6490,7 @@
+@@ -6480,6 +6490,7 @@ zfs_do_unshare(int argc, char **argv)
  	return (unshare_unmount(OP_SHARE, argc, argv));
  }
  
@@ -91,7 +91,7 @@
  /*
   * Attach/detach the given dataset to/from the given jail
   */
-@@ -6541,6 +6552,7 @@
+@@ -6541,6 +6552,7 @@ zfs_do_unjail(int argc, char **argv)
  
  	return (do_jail(argc, argv, 0));
  }

Modified: trunk/zfsutils/debian/patches/solaris_rlim64_t.diff
===================================================================
--- trunk/zfsutils/debian/patches/solaris_rlim64_t.diff	2014-10-04 18:39:58 UTC (rev 5589)
+++ trunk/zfsutils/debian/patches/solaris_rlim64_t.diff	2014-10-04 18:40:52 UTC (rev 5590)
@@ -1,6 +1,6 @@
 --- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
 +++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
-@@ -521,7 +521,7 @@
+@@ -521,7 +521,7 @@ vn_openat(char *path, int x1, int flags,
  /*ARGSUSED*/
  int
  vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
@@ -11,7 +11,7 @@
  
 --- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
 +++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-@@ -117,8 +117,8 @@
+@@ -117,8 +117,8 @@ extern "C" {
  
  #define	ZFS_LOG(...)	do {  } while (0)
  
@@ -22,7 +22,7 @@
  
  #ifdef ZFS_DEBUG
  extern void dprintf_setup(int *argc, char **argv);
-@@ -513,7 +513,7 @@
+@@ -513,7 +513,7 @@ extern int vn_open(char *path, int x1, i
  extern int vn_openat(char *path, int x1, int oflags, int mode, vnode_t **vpp,
      int x2, int x3, vnode_t *vp, int fd);
  extern int vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len,
@@ -33,7 +33,7 @@
  #define	vn_remove(path, x1, x2)		remove(path)
 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
 +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
-@@ -798,7 +798,7 @@
+@@ -801,7 +801,7 @@ static int
  zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
  {
  	znode_t		*zp = VTOZ(vp);

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2014-10-04 18:39:58 UTC (rev 5589)
+++ trunk/zfsutils/debian/rules	2014-10-04 18:40:52 UTC (rev 5590)
@@ -36,8 +36,8 @@
 revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
 
 #SVN		:= https://svn0.us-west.freebsd.org/base/release/$(version).0
-#SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
-SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
+SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
+#SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
 #SVN		:= https://svn0.us-west.freebsd.org/base/head
 
 SOURCE = zfsutils

More information about the Glibc-bsd-commits mailing list