[Glibc-bsd-commits] r4759 - in trunk/zfsutils/debian: . patches
Robert Millan
rmh at alioth.debian.org
Tue Jul 16 11:27:10 UTC 2013
Author: rmh
Date: 2013-07-16 11:27:10 +0000 (Tue, 16 Jul 2013)
New Revision: 4759
Added:
trunk/zfsutils/debian/patches/include_next.diff
Removed:
trunk/zfsutils/debian/patches/04_stdint.diff
trunk/zfsutils/debian/patches/11_endian.diff
Modified:
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/control
trunk/zfsutils/debian/patches/01_glibc_kludge.diff
trunk/zfsutils/debian/patches/02_glibc_misc.diff
trunk/zfsutils/debian/patches/03_glibc_namespace.diff
trunk/zfsutils/debian/patches/06_mountd.diff
trunk/zfsutils/debian/patches/12_freebsd.diff
trunk/zfsutils/debian/patches/14_bootloader_advice.diff
trunk/zfsutils/debian/patches/15_pthread_compat.diff
trunk/zfsutils/debian/patches/fix_realpath_abuse.diff
trunk/zfsutils/debian/patches/series
trunk/zfsutils/debian/rules
Log:
New upstream release
Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/changelog 2013-07-16 11:27:10 UTC (rev 4759)
@@ -1,14 +1,13 @@
-zfsutils (9.0-4) UNRELEASED; urgency=low
+zfsutils (9.1-1) UNRELEASED; urgency=low
[ Guillem Jover ]
* Switch to canonical Vcs URLs.
[ Robert Millan ]
- * Build-depend on freebsd-glue >= 0.0.4 (and remove some of the build
- kludges).
+ * New upstream release.
* control: s/OpenSolaris/illumos/
- -- Guillem Jover <guillem at debian.org> Sat, 18 May 2013 21:37:41 +0200
+ -- Robert Millan <rmh at debian.org> Tue, 09 Jul 2013 23:36:18 +0200
zfsutils (9.0-3) unstable; urgency=low
Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/control 2013-07-16 11:27:10 UTC (rev 4759)
@@ -6,10 +6,11 @@
Build-Depends: debhelper (>= 7.0.50~),
freebsd-buildutils (>= 9.0-5~),
libbsd-dev (>= 0.3.0),
- libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51),
+ libc0.1-dev (>= 2.10),
+ kfreebsd-kernel-headers (>= 9.1-2~),
libgeom-dev,
zlib1g-dev,
- freebsd-glue (>= 0.0.4~),
+ freebsd-glue (>= 0.0.7~),
Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/zfsutils/
Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/zfsutils/
Standards-Version: 3.9.3
Modified: trunk/zfsutils/debian/patches/01_glibc_kludge.diff
===================================================================
--- trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -29,7 +29,7 @@
build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1);
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
-@@ -2327,7 +2327,7 @@
+@@ -2329,7 +2329,7 @@
}
static void
@@ -38,7 +38,7 @@
{
clock_t growtime = 0;
arc_reclaim_strategy_t last_reclaim = ARC_RECLAIM_CONS;
-@@ -3705,7 +3705,7 @@
+@@ -3710,7 +3710,7 @@
static eventhandler_tag arc_event_lowmem = NULL;
static void
@@ -47,7 +47,7 @@
{
/* Serialize access via arc_lowmem_lock. */
-@@ -4767,7 +4767,7 @@
+@@ -4772,7 +4772,7 @@
* heart of the L2ARC.
*/
static void
Modified: trunk/zfsutils/debian/patches/02_glibc_misc.diff
===================================================================
--- trunk/zfsutils/debian/patches/02_glibc_misc.diff 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/02_glibc_misc.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -1,37 +1,3 @@
----
- cddl/contrib/opensolaris/head/thread.h | 3 +++
- sys/cddl/compat/opensolaris/sys/sysmacros.h | 2 +-
- sys/cddl/compat/opensolaris/sys/time.h | 5 +++++
- 3 files changed, 9 insertions(+), 1 deletion(-)
-
---- a/cddl/contrib/opensolaris/head/thread.h
-+++ b/cddl/contrib/opensolaris/head/thread.h
-@@ -30,7 +30,10 @@
- #pragma ident "%Z%%M% %I% %E% SMI"
-
- #include <pthread.h>
-+/* On GNU libc, non-POSIX facilities are in <pthread.h> */
-+#ifndef __GLIBC__
- #include <pthread_np.h>
-+#endif
- #include <assert.h>
-
- /*
---- a/sys/cddl/compat/opensolaris/sys/time.h
-+++ b/sys/cddl/compat/opensolaris/sys/time.h
-@@ -29,7 +29,12 @@
- #ifndef _OPENSOLARIS_SYS_TIME_H_
- #define _OPENSOLARIS_SYS_TIME_H_
-
-+/* GNU libc has <sys/time.h> but no <time.h> */
-+#ifdef __GLIBC__
-+#include_next <time.h>
-+#else
- #include_next <sys/time.h>
-+#endif
-
- #define SEC 1
- #define MILLISEC 1000
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
@@ -380,7 +380,7 @@
Modified: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -1,25 +1,6 @@
----
- cddl/compat/opensolaris/include/solaris.h | 3 +++
- cddl/compat/opensolaris/misc/fsshare.c | 5 +++--
- cddl/compat/opensolaris/misc/mnttab.c | 2 +-
- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c | 4 ++--
- cddl/contrib/opensolaris/lib/libzpool/common/kernel.c | 2 +-
- cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h | 6 +++---
- sys/cddl/compat/opensolaris/sys/dirent.h | 3 +++
- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 2 +-
- 8 files changed, 17 insertions(+), 10 deletions(-)
-
--- a/cddl/compat/opensolaris/misc/fsshare.c
+++ b/cddl/compat/opensolaris/misc/fsshare.c
-@@ -28,6 +28,7 @@
- __FBSDID("$FreeBSD$");
-
- #include <sys/param.h>
-+#include <sys/file.h>
-
- #include <assert.h>
- #include <errno.h>
-@@ -69,7 +70,7 @@
+@@ -69,7 +69,7 @@
* mountpoint specified in the 'skip' argument.
*/
static char *
@@ -28,7 +9,7 @@
{
static char line[MAXLINESIZE];
size_t len, skiplen;
-@@ -200,7 +201,7 @@
+@@ -200,7 +200,7 @@
/* Place big, fat warning at the begining of the file. */
fprintf(newfd, "%s", FILE_HEADER);
@@ -50,7 +31,7 @@
char *f, *opts = tmpopts;
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
-@@ -1735,11 +1735,11 @@
+@@ -1810,11 +1810,11 @@
if (received)
break;
@@ -77,7 +58,7 @@
--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-@@ -107,8 +107,8 @@
+@@ -108,8 +108,8 @@
#define ZFS_LOG(...) do { } while (0)
@@ -88,7 +69,7 @@
#ifdef ZFS_DEBUG
extern void dprintf_setup(int *argc, char **argv);
-@@ -496,7 +496,7 @@
+@@ -499,7 +499,7 @@
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,
@@ -112,7 +93,7 @@
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
-@@ -717,7 +717,7 @@
+@@ -724,7 +724,7 @@
zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
{
znode_t *zp = VTOZ(vp);
Deleted: trunk/zfsutils/debian/patches/04_stdint.diff
===================================================================
--- trunk/zfsutils/debian/patches/04_stdint.diff 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/04_stdint.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -1,51 +0,0 @@
----
- sys/cddl/compat/opensolaris/sys/types.h | 2 +-
- sys/cddl/contrib/opensolaris/common/avl/avl.c | 2 +-
- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/sys/cddl/compat/opensolaris/sys/types.h
-+++ b/sys/cddl/compat/opensolaris/sys/types.h
-@@ -33,7 +33,7 @@
- * This is a bag of dirty hacks to keep things compiling.
- */
-
--#include <sys/stdint.h>
-+#include <stdint.h>
-
- #ifdef _KERNEL
- typedef int64_t clock_t;
---- a/sys/cddl/contrib/opensolaris/common/avl/avl.c
-+++ b/sys/cddl/contrib/opensolaris/common/avl/avl.c
-@@ -89,7 +89,7 @@
-
- #include <sys/types.h>
- #include <sys/param.h>
--#include <sys/stdint.h>
-+#include <stdint.h>
- #include <sys/debug.h>
- #include <sys/avl.h>
-
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
-@@ -31,7 +31,7 @@
- #endif
-
- #include <sys/param.h>
--#include <sys/stdint.h>
-+#include <stdint.h>
- #include <sys/note.h>
- #include <sys/kernel.h>
- #include <sys/debug.h>
---- a/lib/libmd/sha256.h
-+++ b/lib/libmd/sha256.h
-@@ -30,6 +30,9 @@
- #define _SHA256_H_
-
- #include <sys/types.h>
-+#ifdef __GLIBC__
-+#include <stdint.h>
-+#endif
-
- typedef struct SHA256Context {
- uint32_t state[8];
Modified: trunk/zfsutils/debian/patches/06_mountd.diff
===================================================================
--- trunk/zfsutils/debian/patches/06_mountd.diff 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/06_mountd.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -4,7 +4,7 @@
--- a/cddl/compat/opensolaris/misc/fsshare.c
+++ b/cddl/compat/opensolaris/misc/fsshare.c
-@@ -35,7 +35,6 @@
+@@ -34,7 +34,6 @@
#include <fcntl.h>
#include <fsshare.h>
#include <libutil.h>
@@ -12,7 +12,7 @@
#include <signal.h>
#include <stdio.h>
#include <string.h>
-@@ -48,6 +47,9 @@
+@@ -47,6 +46,9 @@
static void
restart_mountd(void)
{
@@ -22,7 +22,7 @@
struct pidfh *pfh;
pid_t mountdpid;
-@@ -63,6 +65,7 @@
+@@ -62,6 +64,7 @@
}
/* We have mountd(8) PID in mountdpid varible. */
kill(mountdpid, SIGHUP);
Deleted: trunk/zfsutils/debian/patches/11_endian.diff
===================================================================
--- trunk/zfsutils/debian/patches/11_endian.diff 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/11_endian.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -1,110 +0,0 @@
----
- sys/cddl/compat/opensolaris/sys/byteorder.h | 4 +++-
- sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c | 5 +++--
- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h | 4 +++-
- sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h | 6 ++++--
- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 6 ++++--
- 5 files changed, 17 insertions(+), 8 deletions(-)
-
---- a/sys/cddl/compat/opensolaris/sys/byteorder.h
-+++ b/sys/cddl/compat/opensolaris/sys/byteorder.h
-@@ -42,6 +42,8 @@
- #ifndef _OPENSOLARIS_SYS_BYTEORDER_H_
- #define _OPENSOLARIS_SYS_BYTEORDER_H_
-
-+#include <endian.h>
-+
- /*
- * Macros to reverse byte order
- */
-@@ -58,7 +60,7 @@
- /*
- * Macros to convert from a specific byte order to/from native byte order
- */
--#if _BYTE_ORDER == _BIG_ENDIAN
-+#if BYTE_ORDER == BIG_ENDIAN
- #define BE_8(x) BMASK_8(x)
- #define BE_16(x) BMASK_16(x)
- #define BE_32(x) BMASK_32(x)
-@@ -78,7 +80,7 @@
- #define BE_64(x) BSWAP_64(x)
- #endif
-
--#if _BYTE_ORDER == _BIG_ENDIAN
-+#if BYTE_ORDER == BIG_ENDIAN
- #define htonll(x) BMASK_64(x)
- #define ntohll(x) BMASK_64(x)
- #else
---- a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
-+++ b/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
-@@ -33,6 +33,7 @@
- #include <sys/varargs.h>
- #include <sys/sunddi.h>
- #else
-+#include <endian.h>
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -2251,11 +2252,11 @@
- int err = 0;
- nvstream_t nvs;
- int nvl_endian;
--#if BYTE_ORDER == _LITTLE_ENDIAN
-+#if BYTE_ORDER == LITTLE_ENDIAN
- int host_endian = 1;
- #else
- int host_endian = 0;
--#endif /* _LITTLE_ENDIAN */
-+#endif /* LITTLE_ENDIAN */
- nvs_header_t *nvh = (void *)buf;
-
- if (buflen == NULL || nvl == NULL ||
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
-@@ -33,6 +33,8 @@
- #include <sys/types.h>
- #include <sys/fs/zfs.h>
-
-+#include <endian.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -329,7 +331,7 @@
- * Note: the byteorder is either 0 or -1, both of which are palindromes.
- * This simplifies the endianness handling a bit.
- */
--#if BYTE_ORDER == _BIG_ENDIAN
-+#if BYTE_ORDER == BIG_ENDIAN
- #define ZFS_HOST_BYTEORDER (0ULL)
- #else
- #define ZFS_HOST_BYTEORDER (-1ULL)
---- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
-+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
-@@ -29,6 +29,8 @@
-
- #pragma ident "%Z%%M% %I% %E% SMI"
-
-+#include <endian.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -517,7 +519,7 @@
- ((((uint64_t)(y)) << 32) | ((x) & UINT32_MAX))
-
- #ifndef _LP64
--#if BYTE_ORDER == _BIG_ENDIAN
-+#if BYTE_ORDER == BIG_ENDIAN
- #define DTRACE_PTR(type, name) uint32_t name##pad; type *name
- #else
- #define DTRACE_PTR(type, name) type *name; uint32_t name##pad
-@@ -627,7 +629,7 @@
- #define DOF_ENCODE_LSB 1
- #define DOF_ENCODE_MSB 2
-
--#if BYTE_ORDER == _BIG_ENDIAN
-+#if BYTE_ORDER == BIG_ENDIAN
- #define DOF_ENCODE_NATIVE DOF_ENCODE_MSB
- #else
- #define DOF_ENCODE_NATIVE DOF_ENCODE_LSB
Modified: trunk/zfsutils/debian/patches/12_freebsd.diff
===================================================================
--- trunk/zfsutils/debian/patches/12_freebsd.diff 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/12_freebsd.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -61,7 +61,7 @@
return (ENOENT);
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
-@@ -1804,7 +1804,7 @@
+@@ -1810,7 +1810,7 @@
rrw_exit(&zfsvfs->z_teardown_lock, FTAG);
rw_exit(&zfsvfs->z_teardown_inactive_lock);
Modified: trunk/zfsutils/debian/patches/14_bootloader_advice.diff
===================================================================
--- trunk/zfsutils/debian/patches/14_bootloader_advice.diff 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/14_bootloader_advice.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -8,7 +8,7 @@
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-@@ -4249,11 +4249,11 @@
+@@ -4524,11 +4524,11 @@
if (cb.cb_poolname[0] != '\0') {
(void) printf(
@@ -25,7 +25,7 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-@@ -2473,11 +2473,11 @@
+@@ -2496,11 +2496,11 @@
(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 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/15_pthread_compat.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -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
-@@ -251,7 +251,28 @@
+@@ -252,7 +252,28 @@
#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/fix_realpath_abuse.diff
===================================================================
--- trunk/zfsutils/debian/patches/fix_realpath_abuse.diff 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/fix_realpath_abuse.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -3,7 +3,7 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
-@@ -1156,7 +1156,7 @@
+@@ -1171,7 +1171,7 @@
int dfd;
/* use realpath to normalize the path */
Added: trunk/zfsutils/debian/patches/include_next.diff
===================================================================
--- trunk/zfsutils/debian/patches/include_next.diff (rev 0)
+++ trunk/zfsutils/debian/patches/include_next.diff 2013-07-16 11:27:10 UTC (rev 4759)
@@ -0,0 +1,61 @@
+--- a/sys/cddl/compat/opensolaris/sys/param.h
++++ b/sys/cddl/compat/opensolaris/sys/param.h
+@@ -27,11 +27,11 @@
+ *
+ */
+
++#include_next <sys/param.h>
++
+ #ifndef _COMPAT_OPENSOLARIS_SYS_PARAM_H_
+ #define _COMPAT_OPENSOLARIS_SYS_PARAM_H_
+
+-#include_next <sys/param.h>
+-
+ #define PAGESIZE PAGE_SIZE
+
+ #ifdef _KERNEL
+--- a/cddl/compat/opensolaris/include/stdio.h
++++ b/cddl/compat/opensolaris/include/stdio.h
+@@ -27,11 +27,11 @@
+ *
+ */
+
++#include_next <stdio.h>
++
+ #ifndef _COMPAT_OPENSOLARIS_STDIO_H_
+ #define _COMPAT_OPENSOLARIS_STDIO_H_
+
+-#include_next <stdio.h>
+-
+ #define ftello64 ftello
+ #define lseek64 lseek
+ #define fseeko64 fseeko
+--- a/cddl/compat/opensolaris/include/stdlib.h
++++ b/cddl/compat/opensolaris/include/stdlib.h
+@@ -27,11 +27,11 @@
+ *
+ */
+
++#include_next <stdlib.h>
++
+ #ifndef _COMPAT_OPENSOLARIS_STDLIB_H_
+ #define _COMPAT_OPENSOLARIS_STDLIB_H_
+
+-#include_next <stdlib.h>
+-
+ #define getexecname getprogname
+
+ #endif
+--- a/cddl/compat/opensolaris/include/alloca.h
++++ b/cddl/compat/opensolaris/include/alloca.h
+@@ -27,6 +27,10 @@
+ *
+ */
+
++#ifdef __GLIBC__
++#include_next <alloca.h>
++#endif
++
+ #ifndef _COMPAT_OPENSOLARIS_ALLOCA_H_
+ #define _COMPAT_OPENSOLARIS_ALLOCA_H_
+
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/patches/series 2013-07-16 11:27:10 UTC (rev 4759)
@@ -4,15 +4,14 @@
# Mergeable material
gratuitous_dependencies.diff
#manpage_hyphens.diff
+include_next.diff
# Other patches that might or might not be mergeable
01_glibc_kludge.diff
02_glibc_misc.diff
03_glibc_namespace.diff
-04_stdint.diff
06_mountd.diff
09_xdr_control.diff
-11_endian.diff
13_mnttab.diff
14_bootloader_advice.diff
15_pthread_compat.diff
Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules 2013-07-16 11:19:27 UTC (rev 4758)
+++ trunk/zfsutils/debian/rules 2013-07-16 11:27:10 UTC (rev 4759)
@@ -75,9 +75,6 @@
; do \
svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
done
- rm -f $(ORIGDIR)/cddl/compat/opensolaris/include/alloca.h
- rm -f $(ORIGDIR)/cddl/compat/opensolaris/include/stdlib.h
- rm -rf $(ORIGDIR)/sys/cddl/contrib/opensolaris/uts/common/zmod
tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
rm -rf $(ORIGDIR)
More information about the Glibc-bsd-commits
mailing list