fixes for building debian (wheezy) packages from recent zfs git source

debian/changelog

@@ -1,3 +1,11 @@
+zfs-linux (0.6.3-20~7b2d78a) unstable; urgency=low
+
+  * Working on some patches to the Debian packaging system so that we can
+    build more recent git versions of ZFS on Linux.
+    See Also: https://github.com/zfsonlinux/zfs/issues/2863
+
+ -- Brian Kroth <bpkroth@gmail.com>  Wed, 19 Nov 2014 15:02:55 -0600
+
 zfs-linux (0.6.1-1~wheezy) wheezy; urgency=low
 
   * Initial release.

debian/control

@@ -71,7 +71,7 @@ Description: Debugging symbols for libuutil1
 Package: libzfs-dev
 Section: libdevel
 Architecture: linux-any
-Depends: ${misc:Depends}, libzfs1 (= ${binary:Version})
+Depends: ${misc:Depends}, libzfs2 (= ${binary:Version})
 Provides: libnvpair-dev, libuutil-dev
 Replaces: libefi1,
  libnvpair1,
@@ -80,47 +80,47 @@ Replaces: libefi1,
  libunicode1,
  libuutil1,
  libzavl1,
- libzfs1,
- libzpool1,
+ libzfs2,
+ libzpool2,
 Description: Native ZFS filesystem development files for Linux
  Header files and static libraries for compiling software
  against libzfs.
 
-Package: libzfs1
+Package: libzfs2
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libzfs0
 Description: Native ZFS filesystem library for Linux
  The zfs management library.
 
-Package: libzfs1-dbg
+Package: libzfs2-dbg
 Section: debug
 Architecture: linux-any
-Depends: ${misc:Depends}, libzfs1 (= ${binary:Version})
+Depends: ${misc:Depends}, libzfs2 (= ${binary:Version})
 Replaces: libzfs0-dbg
-Description: Debugging symbols for libzfs1
+Description: Debugging symbols for libzfs2
  The zfs management library.
  .
- This package contains the debugging symbols for libzfs1.
+ This package contains the debugging symbols for libzfs2.
 
-Package: libzpool1
+Package: libzpool2
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libzpool0
 Description: Native ZFS pool library for Linux
  The zpool management library.
 
-Package: libzpool1-dbg
+Package: libzpool2-dbg
 Section: debug
 Architecture: linux-any
-Depends: ${misc:Depends}, libzpool1 (= ${binary:Version})
+Depends: ${misc:Depends}, libzpool2 (= ${binary:Version})
 Replaces: libzpool0-dbg
-Description: Debugging symbols for libzpool1
+Description: Debugging symbols for libzpool2
  The zpool management library.
  .
- This package contains the debugging symbols for libzpool1.
+ This package contains the debugging symbols for libzpool2.
 
 Package: zfs-dkms
 Section: kernel

debian/gbp.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch=master/debian/wheezy
-debian-tag=master/debian/wheezy/%(version)s
+debian-branch=debian/wheezy
+debian-tag=debian/wheezy/%(version)s
 upstream-branch=upstream
 upstream-tag=zfs-%(version)s

debian/libzfs2.install

@@ -0,0 +1,2 @@
+lib/libzfs.so.*
+lib/libzfs_core.so.*

debian/patches/0001-Revert-Retire-zpool_id-infrastructure.patch

@@ -50,22 +50,10 @@ This reverts commit dbf763b39b232996f0d6bb0022e4446643c18e05.
  create mode 100644 scripts/zpool-layout/dragon.llnl.conf
  create mode 100644 udev/rules.d/60-zpool.rules.in
 
-Index: b/cmd/Makefile.am
-===================================================================
---- a/cmd/Makefile.am
-+++ b/cmd/Makefile.am
-@@ -1,2 +1,2 @@
- SUBDIRS  = zfs zpool zdb zhack zinject zstreamdump ztest zpios
--SUBDIRS += mount_zfs fsck_zfs zvol_id vdev_id
-+SUBDIRS += mount_zfs fsck_zfs zpool_layout zvol_id zpool_id vdev_id
-Index: b/cmd/zpool_id/Makefile.am
-===================================================================
 --- /dev/null
 +++ b/cmd/zpool_id/Makefile.am
 @@ -0,0 +1 @@
 +dist_udev_SCRIPTS = zpool_id
-Index: b/cmd/zpool_id/zpool_id
-===================================================================
 --- /dev/null
 +++ b/cmd/zpool_id/zpool_id
 @@ -0,0 +1,86 @@
@@ -155,14 +143,10 @@ Index: b/cmd/zpool_id/zpool_id
 +fi
 +
 +exit 0
-Index: b/cmd/zpool_layout/Makefile.am
-===================================================================
 --- /dev/null
 +++ b/cmd/zpool_layout/Makefile.am
 @@ -0,0 +1 @@
 +dist_bin_SCRIPTS = zpool_layout
-Index: b/cmd/zpool_layout/zpool_layout
-===================================================================
 --- /dev/null
 +++ b/cmd/zpool_layout/zpool_layout
 @@ -0,0 +1,281 @@
@@ -447,30 +431,26 @@ Index: b/cmd/zpool_layout/zpool_layout
 +fi
 +
 +exit 0
-Index: b/configure.ac
-===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -99,7 +99,9 @@
+@@ -106,7 +106,9 @@
  	cmd/zpios/Makefile
  	cmd/mount_zfs/Makefile
  	cmd/fsck_zfs/Makefile
 +	cmd/zpool_layout/Makefile
  	cmd/zvol_id/Makefile
 +	cmd/zpool_id/Makefile
  	cmd/vdev_id/Makefile
- 	module/Makefile
- 	module/avl/Makefile
-@@ -118,6 +120,7 @@
+ 	cmd/arcstat/Makefile
+ 	cmd/dbufstat/Makefile
+@@ -130,6 +132,7 @@
  	scripts/zpios-profile/Makefile
  	scripts/zpios-test/Makefile
  	scripts/zpool-config/Makefile
 +	scripts/zpool-layout/Makefile
  	scripts/common.sh
  	rpm/Makefile
  	rpm/fedora/Makefile
-Index: b/etc/zfs/Makefile.am
-===================================================================
 --- a/etc/zfs/Makefile.am
 +++ b/etc/zfs/Makefile.am
 @@ -4,6 +4,10 @@
@@ -485,8 +465,6 @@ Index: b/etc/zfs/Makefile.am
 +	zdev.conf.x4550.example
 
  EXTRA_DIST = $(pkgsysconf_DATA)
-Index: b/etc/zfs/zdev.conf
-===================================================================
 --- /dev/null
 +++ b/etc/zfs/zdev.conf
 @@ -0,0 +1,9 @@
@@ -499,8 +477,6 @@ Index: b/etc/zfs/zdev.conf
 +#<ID>	<by-path name>
 +#disk1	pci-0000:61:06.1-scsi-0:0:0:0
 +#disk2	pci-0000:61:06.1-scsi-0:0:0:1
-Index: b/etc/zfs/zdev.conf.dragon.example
-===================================================================
 --- /dev/null
 +++ b/etc/zfs/zdev.conf.dragon.example
 @@ -0,0 +1,176 @@
@@ -680,8 +656,6 @@ Index: b/etc/zfs/zdev.conf.dragon.example
 +j13	pci-0000:83:00.0-sas-0x5000155359dba33f-12
 +j14	pci-0000:83:00.0-sas-0x5000155359dba33f-13
 +j15	pci-0000:83:00.0-sas-0x5000155359dba33f-14
-Index: b/etc/zfs/zdev.conf.supermicro.example
-===================================================================
 --- /dev/null
 +++ b/etc/zfs/zdev.conf.supermicro.example
 @@ -0,0 +1,30 @@
@@ -715,8 +689,6 @@ Index: b/etc/zfs/zdev.conf.supermicro.example
 +d2	pci-0000:07:00.0-sas-0x500304800027367f-13
 +d3	pci-0000:07:00.0-sas-0x500304800027367f-14
 +d4	pci-0000:07:00.0-sas-0x500304800027367f-15
-Index: b/etc/zfs/zdev.conf.x4550.example
-===================================================================
 --- /dev/null
 +++ b/etc/zfs/zdev.conf.x4550.example
 @@ -0,0 +1,66 @@
@@ -786,63 +758,55 @@ Index: b/etc/zfs/zdev.conf.x4550.example
 +f6	pci-0000:43:00.0-sas-0x50062b000000000b:1:5-0xd5885781dee7de92:5
 +f7	pci-0000:43:00.0-sas-0x50062b000000000c:1:6-0xd3827481d804e192:6
 +f8	pci-0000:43:00.0-sas-0x50062b000000000d:1:7-0xd6806863d6f8bf92:7
-Index: b/include/libzfs.h
-===================================================================
 --- a/include/libzfs.h
 +++ b/include/libzfs.h
-@@ -57,7 +57,7 @@
- #define	DISK_ROOT		"/dev"
- #define	UDISK_ROOT		"/dev/disk"
+@@ -64,7 +64,7 @@
+  */
+ #define	DISK_LABEL_WAIT		(30 * 1000)  /* 30 seconds */
 
 -#define	DEFAULT_IMPORT_PATH_SIZE	7
 +#define	DEFAULT_IMPORT_PATH_SIZE	8
  extern char *zpool_default_import_path[DEFAULT_IMPORT_PATH_SIZE];
 
  /*
-Index: b/lib/libzfs/libzfs_import.c
-===================================================================
 --- a/lib/libzfs/libzfs_import.c
 +++ b/lib/libzfs/libzfs_import.c
-@@ -980,6 +980,7 @@
+@@ -1006,6 +1006,7 @@
  char *
  zpool_default_import_path[DEFAULT_IMPORT_PATH_SIZE] = {
  	"/dev/disk/by-vdev",	/* Custom rules, use first if they exist */
 +	"/dev/disk/zpool",	/* Custom rules, use first if they exist */
  	"/dev/mapper",		/* Use multipath devices before components */
  	"/dev/disk/by-uuid",	/* Single unique entry and persistent */
  	"/dev/disk/by-id",	/* May be multiple entries and persistent */
-Index: b/scripts/Makefile.am
-===================================================================
 --- a/scripts/Makefile.am
 +++ b/scripts/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = zpool-config zpios-test zpios-profile
 +SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
 
- EXTRA_DIST = dkms.mkconf dkms.postinst kmodtool
+ EXTRA_DIST = dkms.mkconf dkms.postbuild kmodtool zfs2zol-patch.sed cstyle.pl
 
-Index: b/scripts/common.sh.in
-===================================================================
 --- a/scripts/common.sh.in
 +++ b/scripts/common.sh.in
-@@ -40,7 +40,7 @@
- sysconfdir=@sysconfdir@
+@@ -41,7 +41,7 @@
+ localstatedir=@localstatedir@
 
  ETCDIR=${ETCDIR:-/etc}
 -DEVDIR=${DEVDIR:-/dev/disk/by-vdev}
 +DEVDIR=${DEVDIR:-/dev/disk/zpool}
  ZPOOLDIR=${ZPOOLDIR:-${pkgdatadir}/zpool-config}
  ZPIOSDIR=${ZPIOSDIR:-${pkgdatadir}/zpios-test}
  ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkgdatadir}/zpios-profile}
-@@ -49,6 +49,7 @@
+@@ -50,6 +50,7 @@
  ZFS=${ZFS:-${sbindir}/zfs}
  ZINJECT=${ZINJECT:-${sbindir}/zinject}
  ZPOOL=${ZPOOL:-${sbindir}/zpool}
 +ZPOOL_ID=${ZPOOL_ID:-${bindir}/zpool_id}
  ZTEST=${ZTEST:-${sbindir}/ztest}
  ZPIOS=${ZPIOS:-${sbindir}/zpios}
 
-@@ -523,7 +524,7 @@
+@@ -558,7 +559,7 @@
 
  #
  # The following udev helper functions assume that the provided
@@ -851,8 +815,6 @@ Index: b/scripts/common.sh.in
  # disk mapping.  In this mapping each CHANNEL is represented by
  # the letters a-z, and the RANK is represented by the numbers
  # 1-n.  A CHANNEL should identify a group of RANKS which are all
-Index: b/scripts/zpool-config/zpool-raid0.sh
-===================================================================
 --- a/scripts/zpool-config/zpool-raid0.sh
 +++ b/scripts/zpool-config/zpool-raid0.sh
 @@ -2,9 +2,10 @@
@@ -869,8 +831,6 @@ Index: b/scripts/zpool-config/zpool-raid0.sh
  #
  # You can then use either the zpool-create.sh or the zpios.sh test script to
  # test various Raid-0 configurations by adjusting the following tunables.
-Index: b/scripts/zpool-config/zpool-raid10.sh
-===================================================================
 --- a/scripts/zpool-config/zpool-raid10.sh
 +++ b/scripts/zpool-config/zpool-raid10.sh
 @@ -2,9 +2,10 @@
@@ -887,8 +847,6 @@ Index: b/scripts/zpool-config/zpool-raid10.sh
  #
  # You can then use either the zpool-create.sh or the zpios.sh test script to
  # test various Raid-10 configurations by adjusting the following tunables.
-Index: b/scripts/zpool-config/zpool-raidz.sh
-===================================================================
 --- a/scripts/zpool-config/zpool-raidz.sh
 +++ b/scripts/zpool-config/zpool-raidz.sh
 @@ -2,9 +2,10 @@
@@ -905,8 +863,6 @@ Index: b/scripts/zpool-config/zpool-raidz.sh
  #
  # You can then use either the zpool-create.sh or the zpios.sh test script to
  # test various Raid-Z configurations by adjusting the following tunables.
-Index: b/scripts/zpool-layout/Makefile.am
-===================================================================
 --- /dev/null
 +++ b/scripts/zpool-layout/Makefile.am
 @@ -0,0 +1,22 @@
@@ -932,8 +888,6 @@ Index: b/scripts/zpool-layout/Makefile.am
 +			$(RM) $$link; \
 +		fi \
 +	done
-Index: b/scripts/zpool-layout/dragon.ddn.conf
-===================================================================
 --- /dev/null
 +++ b/scripts/zpool-layout/dragon.ddn.conf
 @@ -0,0 +1,67 @@
@@ -1004,8 +958,6 @@ Index: b/scripts/zpool-layout/dragon.ddn.conf
 +58	36
 +59	48
 +60	60
-Index: b/scripts/zpool-layout/dragon.llnl.conf
-===================================================================
 --- /dev/null
 +++ b/scripts/zpool-layout/dragon.llnl.conf
 @@ -0,0 +1,67 @@
@@ -1076,8 +1028,6 @@ Index: b/scripts/zpool-layout/dragon.llnl.conf
 +58	43
 +59	37
 +60	31
-Index: b/udev/rules.d/60-zpool.rules.in
-===================================================================
 --- /dev/null
 +++ b/udev/rules.d/60-zpool.rules.in
 @@ -0,0 +1,9 @@
@@ -1090,8 +1040,6 @@ Index: b/udev/rules.d/60-zpool.rules.in
 +KERNEL=="*[!0-9]", ENV{SUBSYSTEM}=="block", ENV{ID_ZPOOL}=="?*", SYMLINK+="$env{ID_ZPOOL_PATH}"
 +KERNEL=="*[0-9]", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="partition", ENV{ID_ZPOOL}=="?*", SYMLINK+="$env{ID_ZPOOL_PATH}-part%n"
 +KERNEL=="dm-[0-9]*", ENV{SUBSYSTEM}=="block", ENV{ID_ZPOOL}=="?*", SYMLINK+="$env{ID_ZPOOL_PATH}"
-Index: b/udev/rules.d/Makefile.am
-===================================================================
 --- a/udev/rules.d/Makefile.am
 +++ b/udev/rules.d/Makefile.am
 @@ -1,10 +1,12 @@
@@ -1107,8 +1055,6 @@ Index: b/udev/rules.d/Makefile.am
  	$(top_srcdir)/udev/rules.d/60-zvol.rules.in \
  	$(top_srcdir)/udev/rules.d/90-zfs.rules.in
 
-Index: b/zfs-script-config.sh.in
-===================================================================
 --- a/zfs-script-config.sh.in
 +++ b/zfs-script-config.sh.in
 @@ -24,6 +24,7 @@
@@ -1119,3 +1065,9 @@ Index: b/zfs-script-config.sh.in
  ZTEST=${CMDDIR}/ztest/ztest
  ZPIOS=${CMDDIR}/zpios/zpios
 
+--- a/cmd/Makefile.am
++++ b/cmd/Makefile.am
+@@ -1,2 +1,2 @@
+ SUBDIRS  = zfs zpool zdb zhack zinject zstreamdump ztest zpios
+-SUBDIRS += mount_zfs fsck_zfs zvol_id vdev_id arcstat dbufstat zed
++SUBDIRS += mount_zfs fsck_zfs zpool_layout zvol_id zpool_id vdev_id arcstat dbufstat zed

debian/patches/0002-Prevent-manual-builds-in-the-DKMS-source.patch

@@ -19,8 +19,6 @@ ZFS has a DKMS registration.
  3 files changed, 18 insertions(+), 3 deletions(-)
  create mode 100644 config/dkms.m4
 
-Index: b/config/dkms.m4
-===================================================================
 --- /dev/null
 +++ b/config/dkms.m4
 @@ -0,0 +1,14 @@
@@ -38,20 +36,16 @@ Index: b/config/dkms.m4
 +		AC_MSG_RESULT([not found])
 +        ])
 +])
-Index: b/config/user.m4
-===================================================================
 --- a/config/user.m4
 +++ b/config/user.m4
 @@ -2,6 +2,7 @@
  dnl # Default ZFS user configuration
  dnl #
  AC_DEFUN([ZFS_AC_CONFIG_USER], [
 +	ZFS_AC_DKMS_INHIBIT
+ 	ZFS_AC_CONFIG_USER_MOUNT_HELPER
  	ZFS_AC_CONFIG_USER_UDEV
- 	ZFS_AC_CONFIG_USER_DRACUT
- 	ZFS_AC_CONFIG_USER_ARCH
-Index: b/config/zfs-build.m4
-===================================================================
+ 	ZFS_AC_CONFIG_USER_SYSTEMD
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
 @@ -86,10 +86,10 @@