Refresh debian/patches after upstream merge.

diff --git a/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch b/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch
index 56c42aa9337c987c0007987be2d1c716aac78cde..c00c8dc69169f599d9d4b9e80611a9abfe6544fd 100644 (file)
--- a/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch
+++ b/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch
@@ -40,7 +40,7 @@ index 0000000..cfa1152
 +        ])
 +])
 diff --git a/config/user.m4 b/config/user.m4
 +        ])
 +])
 diff --git a/config/user.m4 b/config/user.m4

-index 4fcef3d..16b8a76 100644
+index 109ebd5..6409a72 100644

 --- a/config/user.m4
 +++ b/config/user.m4
 @@ -2,6 +2,7 @@ dnl #
 --- a/config/user.m4
 +++ b/config/user.m4
 @@ -2,6 +2,7 @@ dnl #

diff --git a/debian/patches/0003-Remove-all-upstream-init.d-components.patch b/debian/patches/0003-Remove-all-upstream-init.d-components.patch
index 651f13b0a1142b7d6c6f2482366721fa71d2d0f4..31dd7d5bc2c6839ad70db2c873a8a4d3bffb2196 100644 (file)
--- a/debian/patches/0003-Remove-all-upstream-init.d-components.patch
+++ b/debian/patches/0003-Remove-all-upstream-init.d-components.patch
@@ -26,7 +26,7 @@ bundles init files according to Debian packaging policy.
  delete mode 100644 etc/init.d/zfs.redhat.in
 
 diff --git a/configure.ac b/configure.ac
  delete mode 100644 etc/init.d/zfs.redhat.in
 
 diff --git a/configure.ac b/configure.ac

-index 2abd05d..da40356 100644
+index 1a18862..0fd8c4b 100644

 --- a/configure.ac
 +++ b/configure.ac
 @@ -61,7 +61,6 @@ AC_CONFIG_FILES([
 --- a/configure.ac
 +++ b/configure.ac
 @@ -61,7 +61,6 @@ AC_CONFIG_FILES([

diff --git a/debian/patches/0004-Remove-the-upstream-dracut-component.patch b/debian/patches/0004-Remove-the-upstream-dracut-component.patch
index 98e7e2a74975dcbb19f07441225af9f69dc0c8c8..f6e5db6e7bbae0b52f47d3ceef5a6513e6391565 100644 (file)
--- a/debian/patches/0004-Remove-the-upstream-dracut-component.patch
+++ b/debian/patches/0004-Remove-the-upstream-dracut-component.patch
@@ -11,12 +11,12 @@ dracut-005 package that is currently published in Debian and Ubuntu.
  configure.ac                    |    2 -
  dracut/90zfs/.gitignore         |    3 -
  dracut/90zfs/Makefile.am        |   21 -----
  configure.ac                    |    2 -
  dracut/90zfs/.gitignore         |    3 -
  dracut/90zfs/Makefile.am        |   21 -----

- dracut/90zfs/module-setup.sh.in |   55 -------------
+ dracut/90zfs/module-setup.sh.in |   53 -------------

  dracut/90zfs/mount-zfs.sh.in    |   71 -----------------
  dracut/90zfs/parse-zfs.sh.in    |   58 --------------
  dracut/Makefile.am              |    3 -
  dracut/README.dracut.markdown   |  166 ---------------------------------------
  dracut/90zfs/mount-zfs.sh.in    |   71 -----------------
  dracut/90zfs/parse-zfs.sh.in    |   58 --------------
  dracut/Makefile.am              |    3 -
  dracut/README.dracut.markdown   |  166 ---------------------------------------

- 9 files changed, 1 insertion(+), 380 deletions(-)
+ 9 files changed, 1 insertion(+), 378 deletions(-)

  delete mode 100644 dracut/90zfs/.gitignore
  delete mode 100644 dracut/90zfs/Makefile.am
  delete mode 100755 dracut/90zfs/module-setup.sh.in
  delete mode 100644 dracut/90zfs/.gitignore
  delete mode 100644 dracut/90zfs/Makefile.am
  delete mode 100755 dracut/90zfs/module-setup.sh.in


@@ -39,7 +39,7 @@ index 833bee6..fac18fd 100644
  if CONFIG_KERNEL
  SUBDIRS += module
 diff --git a/configure.ac b/configure.ac
  if CONFIG_KERNEL
  SUBDIRS += module
 diff --git a/configure.ac b/configure.ac

-index da40356..2e136d3 100644
+index 0fd8c4b..12cc1d0 100644

 --- a/configure.ac
 +++ b/configure.ac
 @@ -56,8 +56,6 @@ ZFS_AC_DEBUG_DMU_TX
 --- a/configure.ac
 +++ b/configure.ac
 @@ -56,8 +56,6 @@ ZFS_AC_DEBUG_DMU_TX


@@ -89,10 +89,10 @@ index 4112061..0000000
 -      -$(RM) $(pkgdracut_SCRIPTS)
 diff --git a/dracut/90zfs/module-setup.sh.in b/dracut/90zfs/module-setup.sh.in
 deleted file mode 100755
 -      -$(RM) $(pkgdracut_SCRIPTS)
 diff --git a/dracut/90zfs/module-setup.sh.in b/dracut/90zfs/module-setup.sh.in
 deleted file mode 100755

-index c01915e..0000000
+index 23ebc36..0000000

 --- a/dracut/90zfs/module-setup.sh.in
 +++ /dev/null
 --- a/dracut/90zfs/module-setup.sh.in
 +++ /dev/null

-@@ -1,55 +0,0 @@
+@@ -1,53 +0,0 @@

 -#!/bin/sh
 -
 -check() {
 -#!/bin/sh
 -
 -check() {


@@ -126,12 +126,10 @@ index c01915e..0000000
 -      inst_rules @udevruledir@/90-zfs.rules
 -      inst_rules @udevruledir@/60-zpool.rules
 -      inst_rules @udevruledir@/60-zvol.rules
 -      inst_rules @udevruledir@/90-zfs.rules
 -      inst_rules @udevruledir@/60-zpool.rules
 -      inst_rules @udevruledir@/60-zvol.rules

--      inst @sysconfdir@/zfs/zdev.conf

 -      inst @sysconfdir@/zfs/zpool.cache
 -      dracut_install @sbindir@/zfs
 -      dracut_install @sbindir@/zpool
 -      inst @sysconfdir@/zfs/zpool.cache
 -      dracut_install @sbindir@/zfs
 -      dracut_install @sbindir@/zpool

--      dracut_install @bindir@/zpool_layout
--      dracut_install @udevdir@/zpool_id
+-      dracut_install @udevdir@/vdev_id

 -      dracut_install @udevdir@/zvol_id
 -      dracut_install mount.zfs
 -      dracut_install hostid
 -      dracut_install @udevdir@/zvol_id
 -      dracut_install mount.zfs
 -      dracut_install hostid

diff --git a/debian/patches/0005-Remove-userland-dist-rules.patch b/debian/patches/0005-Remove-userland-dist-rules.patch
index f776f07603418fab59eaa5bd3d498668b4472bd5..4955830e44daf2c37c5a501cbd3f4fbceaac409a 100644 (file)
--- a/debian/patches/0005-Remove-userland-dist-rules.patch
+++ b/debian/patches/0005-Remove-userland-dist-rules.patch
@@ -10,17 +10,14 @@ instances of EXTRA_DIST and change dist_ to nodist_.
 ---
  Makefile.am                       |    3 +--
  cmd/vdev_id/Makefile.am           |    2 +-
 ---
  Makefile.am                       |    3 +--
  cmd/vdev_id/Makefile.am           |    2 +-

- cmd/zpool_id/Makefile.am          |    2 +-
- cmd/zpool_layout/Makefile.am      |    2 +-

  etc/zfs/Makefile.am               |    2 --
  man/man8/Makefile.am              |    1 -
  scripts/Makefile.am               |    2 +-
  scripts/zpios-profile/Makefile.am |    2 +-
  scripts/zpios-test/Makefile.am    |    2 +-
  scripts/zpool-config/Makefile.am  |    2 +-
  etc/zfs/Makefile.am               |    2 --
  man/man8/Makefile.am              |    1 -
  scripts/Makefile.am               |    2 +-
  scripts/zpios-profile/Makefile.am |    2 +-
  scripts/zpios-test/Makefile.am    |    2 +-
  scripts/zpool-config/Makefile.am  |    2 +-

- scripts/zpool-layout/Makefile.am  |    2 +-
- udev/rules.d/Makefile.am          |    6 ------
- 12 files changed, 9 insertions(+), 19 deletions(-)
+ udev/rules.d/Makefile.am          |    5 -----
+ 9 files changed, 6 insertions(+), 15 deletions(-)

 
 diff --git a/Makefile.am b/Makefile.am
 index fac18fd..7e58b83 100644
 
 diff --git a/Makefile.am b/Makefile.am
 index fac18fd..7e58b83 100644


@@ -43,28 +40,14 @@ index fb815fa..86d91d3 100644
 @@ -1 +1 @@
 -dist_udev_SCRIPTS = vdev_id
 +nodist_udev_SCRIPTS = vdev_id
 @@ -1 +1 @@
 -dist_udev_SCRIPTS = vdev_id
 +nodist_udev_SCRIPTS = vdev_id

-diff --git a/cmd/zpool_id/Makefile.am b/cmd/zpool_id/Makefile.am
-index 5f492cf..f186d78 100644
---- a/cmd/zpool_id/Makefile.am
-+++ b/cmd/zpool_id/Makefile.am
-@@ -1 +1 @@
--dist_udev_SCRIPTS = zpool_id
-+nodist_udev_SCRIPTS = zpool_id
-diff --git a/cmd/zpool_layout/Makefile.am b/cmd/zpool_layout/Makefile.am
-index b17e6a3..f8c61fd 100644
---- a/cmd/zpool_layout/Makefile.am
-+++ b/cmd/zpool_layout/Makefile.am
-@@ -1 +1 @@
--dist_bin_SCRIPTS = zpool_layout
-+nodist_bin_SCRIPTS = zpool_layout

 diff --git a/etc/zfs/Makefile.am b/etc/zfs/Makefile.am
 diff --git a/etc/zfs/Makefile.am b/etc/zfs/Makefile.am

-index dd864f4..09d3e2b 100644
+index ff35469..6fd0d99 100644

 --- a/etc/zfs/Makefile.am
 +++ b/etc/zfs/Makefile.am
 --- a/etc/zfs/Makefile.am
 +++ b/etc/zfs/Makefile.am

-@@ -9,5 +9,3 @@ pkgsysconf_DATA = \
-       zdev.conf.supermicro.example \
-       zdev.conf.dragon.example \
-       zdev.conf.x4550.example
+@@ -5,5 +5,3 @@ pkgsysconf_DATA = \
+       vdev_id.conf.sas_direct.example \
+       vdev_id.conf.sas_switch.example \
+       vdev_id.conf.multipath.example

 -
 -EXTRA_DIST = $(pkgsysconf_DATA)
 diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
 -
 -EXTRA_DIST = $(pkgsysconf_DATA)
 diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am


@@ -78,11 +61,11 @@ index 05ca1ce..951a54c 100644
  install-data-local:
        $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man8"
 diff --git a/scripts/Makefile.am b/scripts/Makefile.am
  install-data-local:
        $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man8"
 diff --git a/scripts/Makefile.am b/scripts/Makefile.am

-index d8cb007..10ac61b 100644
+index a969159..c08ca9d 100644

 --- a/scripts/Makefile.am
 +++ b/scripts/Makefile.am
 @@ -1,7 +1,7 @@
 --- a/scripts/Makefile.am
 +++ b/scripts/Makefile.am
 @@ -1,7 +1,7 @@

- SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
+ SUBDIRS = zpool-config zpios-test zpios-profile

  
  pkglibexecdir = $(libexecdir)/@PACKAGE@
 -dist_pkglibexec_SCRIPTS = \
  
  pkglibexecdir = $(libexecdir)/@PACKAGE@
 -dist_pkglibexec_SCRIPTS = \


@@ -123,28 +106,16 @@ index 87f58bb..7973114 100644
        $(top_srcdir)/scripts/zpool-config/dm0-raid0.sh \
        $(top_srcdir)/scripts/zpool-config/file-raid0.sh \
        $(top_srcdir)/scripts/zpool-config/file-raid10.sh \
        $(top_srcdir)/scripts/zpool-config/dm0-raid0.sh \
        $(top_srcdir)/scripts/zpool-config/file-raid0.sh \
        $(top_srcdir)/scripts/zpool-config/file-raid10.sh \

-diff --git a/scripts/zpool-layout/Makefile.am b/scripts/zpool-layout/Makefile.am
-index 3eef241..ede02d0 100644
---- a/scripts/zpool-layout/Makefile.am
-+++ b/scripts/zpool-layout/Makefile.am
-@@ -1,5 +1,5 @@
- pkglibexecdir = $(libexecdir)/@PACKAGE@/zpool-layout
--dist_pkglibexec_SCRIPTS = \
-+nodist_pkglibexec_SCRIPTS = \
-       $(top_srcdir)/scripts/zpool-layout/dragon.ddn.conf \
-       $(top_srcdir)/scripts/zpool-layout/dragon.llnl.conf
- 

 diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am
 diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am

-index 1ec83ac..fb1aa22 100644
+index 6816add..23dd46c 100644

 --- a/udev/rules.d/Makefile.am
 +++ b/udev/rules.d/Makefile.am
 --- a/udev/rules.d/Makefile.am
 +++ b/udev/rules.d/Makefile.am

-@@ -4,12 +4,6 @@ udevrule_DATA = \
+@@ -3,11 +3,6 @@ udevrule_DATA = \

        $(top_srcdir)/udev/rules.d/60-zvol.rules \
        $(top_srcdir)/udev/rules.d/90-zfs.rules
  
 -EXTRA_DIST = \
 -      $(top_srcdir)/udev/rules.d/69-vdev.rules.in \
        $(top_srcdir)/udev/rules.d/60-zvol.rules \
        $(top_srcdir)/udev/rules.d/90-zfs.rules
  
 -EXTRA_DIST = \
 -      $(top_srcdir)/udev/rules.d/69-vdev.rules.in \

--      $(top_srcdir)/udev/rules.d/60-zpool.rules.in \

 -      $(top_srcdir)/udev/rules.d/60-zvol.rules.in \
 -      $(top_srcdir)/udev/rules.d/90-zfs.rules.in
 -
 -      $(top_srcdir)/udev/rules.d/60-zvol.rules.in \
 -      $(top_srcdir)/udev/rules.d/90-zfs.rules.in
 -

diff --git a/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch b/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch
index 0d2a3c90f624533ce18640ef21348031b5413e7b..aabb03c2b0d9d277fe3f32782a972e1afcd211e4 100644 (file)
--- a/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch
+++ b/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch
@@ -13,10 +13,10 @@ or to bundle SPL into the ZFS package.
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/config/kernel.m4 b/config/kernel.m4
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/config/kernel.m4 b/config/kernel.m4

-index fd6ab1f..53b3077 100644
+index 6d28074..a97473e 100644

 --- a/config/kernel.m4
 +++ b/config/kernel.m4
 --- a/config/kernel.m4
 +++ b/config/kernel.m4

-@@ -328,9 +328,10 @@ AC_DEFUN([ZFS_AC_SPL], [
+@@ -329,9 +329,10 @@ AC_DEFUN([ZFS_AC_SPL], [

                ], [
                        AC_MSG_RESULT([Not found])
                        AC_MSG_ERROR([
                ], [
                        AC_MSG_RESULT([Not found])
                        AC_MSG_ERROR([

diff --git a/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch b/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch
index 371af08caf014ea86345916738e2f19b6cec91cc..b677b6089a3e8d8a81ad102e3e7db6be12a84bf2 100644 (file)
--- a/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch
+++ b/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch
@@ -16,10 +16,10 @@ Closes: dajhorn/pkg-zfs#30
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/config/kernel.m4 b/config/kernel.m4
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/config/kernel.m4 b/config/kernel.m4

-index 53b3077..f0a4609 100644
+index a97473e..d3e132e 100644

 --- a/config/kernel.m4
 +++ b/config/kernel.m4
 --- a/config/kernel.m4
 +++ b/config/kernel.m4

-@@ -361,7 +361,10 @@ AC_DEFUN([ZFS_AC_SPL], [
+@@ -362,7 +362,10 @@ AC_DEFUN([ZFS_AC_SPL], [

                AC_MSG_RESULT([Not found])
                AC_MSG_ERROR([
        *** Cannot determine the version of the spl source.
                AC_MSG_RESULT([Not found])
                AC_MSG_ERROR([
        *** Cannot determine the version of the spl source.