]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
projects / mirror_zfs-debian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7b11733)
Refresh debian/patches after upstream merge.
authorDarik Horn <dajhorn@vanadac.com>
Sat, 11 Aug 2012 01:20:12 +0000 (20:20 -0500)
committerDarik Horn <dajhorn@vanadac.com>
Sat, 11 Aug 2012 01:20:12 +0000 (20:20 -0500)
debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch patch | blob | blame | history
debian/patches/0002-Remove-the-COPYING-file.patch patch | blob | blame | history
debian/patches/0003-Remove-all-upstream-init.d-components.patch patch | blob | blame | history
debian/patches/0004-Remove-the-upstream-dracut-component.patch patch | blob | blame | history
debian/patches/0005-Remove-userland-dist-rules.patch patch | blob | blame | history
debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch patch | blob | blame | history
debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch patch | blob | blame | history

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 c5e1a27c7a53b2f1029408d31fea26aeddd5afeb..1b48178b061dcd445479bf6e07e0c5842a535a47 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
@@ -1,4 +1,4 @@
-From bbfbca246addb630e2f35cad549e0638ee124f22 Mon Sep 17 00:00:00 2001
+From 4aca35a91198588a99051b39121463f2c630146f Mon Sep 17 00:00:00 2001
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Tue, 17 Jan 2012 19:45:07 -0600
 Subject: [PATCH 1/7] Prevent manual builds in the DKMS source.
diff --git a/debian/patches/0002-Remove-the-COPYING-file.patch b/debian/patches/0002-Remove-the-COPYING-file.patch
index d0ab353527c42ac958247cd7508c9853b4536ab1..8f56f43238b87e5f12f7560910ea660f04d5327c 100644 (file)
--- a/debian/patches/0002-Remove-the-COPYING-file.patch
+++ b/debian/patches/0002-Remove-the-COPYING-file.patch
@@ -1,4 +1,4 @@
-From 0bfd40ed95d5ee8ec96793c1c60ff9729b95da9a Mon Sep 17 00:00:00 2001
+From 37581057f7fd70ff33719a04c642846d0209083e Mon Sep 17 00:00:00 2001
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Tue, 17 Jan 2012 22:18:47 -0600
 Subject: [PATCH 2/7] Remove the COPYING file.
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 c7b85cfc8457835cafc2abdf5884f6a58e1bd303..54c04861e345810a80a7c38dbac79868861c784a 100644 (file)
--- a/debian/patches/0003-Remove-all-upstream-init.d-components.patch
+++ b/debian/patches/0003-Remove-all-upstream-init.d-components.patch
@@ -1,4 +1,4 @@
-From f86c0dc2342981d4708c9548d87c6f7749cfbb79 Mon Sep 17 00:00:00 2001
+From 5ab726b06e04ff8877e200b03db7db996fb08dd4 Mon Sep 17 00:00:00 2001
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Tue, 17 Jan 2012 11:54:21 -0600
 Subject: [PATCH 3/7] Remove all upstream init.d components.
@@ -10,14 +10,14 @@ bundles init files according to Debian packaging policy.
  etc/Makefile.am          |    2 +-
  etc/init.d/.gitignore    |    1 -
  etc/init.d/Makefile.am   |   22 --
- etc/init.d/Makefile.in   |  569 ----------------------------------------------
+ etc/init.d/Makefile.in   |  570 ----------------------------------------------
  etc/init.d/zfs.arch.in   |   62 -----
  etc/init.d/zfs.fedora.in |  244 --------------------
  etc/init.d/zfs.gentoo.in |  111 ---------
  etc/init.d/zfs.lsb.in    |  130 -----------
  etc/init.d/zfs.lunar.in  |   95 --------
  etc/init.d/zfs.redhat.in |  176 --------------
- 11 files changed, 1 insertion(+), 1412 deletions(-)
+ 11 files changed, 1 insertion(+), 1413 deletions(-)
  delete mode 100644 etc/init.d/.gitignore
  delete mode 100644 etc/init.d/Makefile.am
  delete mode 100644 etc/init.d/Makefile.in
@@ -29,7 +29,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
-index 749f378..9fc1ef4 100644
+index 10c2cc0..3b741df 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -61,7 +61,6 @@ AC_CONFIG_FILES([
@@ -84,10 +84,10 @@ index c1b131b..0000000
 -      -$(RM) $(init_SCRIPTS)
 diff --git a/etc/init.d/Makefile.in b/etc/init.d/Makefile.in
 deleted file mode 100644
-index 0ddd918..0000000
+index 5597261..0000000
 --- a/etc/init.d/Makefile.in
 +++ /dev/null
-@@ -1,569 +0,0 @@
+@@ -1,570 +0,0 @@
 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
 -# @configure_input@
 -
@@ -159,6 +159,7 @@ index 0ddd918..0000000
 -      $(top_srcdir)/config/kernel-create-umode-t.m4 \
 -      $(top_srcdir)/config/kernel-d-make-root.m4 \
 -      $(top_srcdir)/config/kernel-d-obtain-alias.m4 \
+-      $(top_srcdir)/config/kernel-discard-granularity.m4 \
 -      $(top_srcdir)/config/kernel-encode-fh-inode.m4 \
 -      $(top_srcdir)/config/kernel-evict-inode.m4 \
 -      $(top_srcdir)/config/kernel-fallocate.m4 \
diff --git a/debian/patches/0004-Remove-the-upstream-dracut-component.patch b/debian/patches/0004-Remove-the-upstream-dracut-component.patch
index 166a00b492504da1e5ee8afed820333d5204538d..ebdb5e1f48fce36cb533d057e77c737f3c199b3d 100644 (file)
--- a/debian/patches/0004-Remove-the-upstream-dracut-component.patch
+++ b/debian/patches/0004-Remove-the-upstream-dracut-component.patch
@@ -1,4 +1,4 @@
-From ed781b959b46d1646918550ecf8aa8affc55fdc7 Mon Sep 17 00:00:00 2001
+From 0acbcec7f9e37a86fea90dfda45092d8d822d061 Mon Sep 17 00:00:00 2001
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Tue, 17 Jan 2012 20:27:32 -0600
 Subject: [PATCH 4/7] Remove the upstream dracut component.
@@ -12,14 +12,14 @@ dracut-005 package that is currently published in Debian and Ubuntu.
  configure.ac                    |    2 -
  dracut/90zfs/.gitignore         |    3 -
  dracut/90zfs/Makefile.am        |   21 --
- dracut/90zfs/Makefile.in        |  568 --------------------------------
+ dracut/90zfs/Makefile.in        |  569 --------------------------------
  dracut/90zfs/module-setup.sh.in |   55 ----
  dracut/90zfs/mount-zfs.sh.in    |   71 ----
  dracut/90zfs/parse-zfs.sh.in    |   58 ----
  dracut/Makefile.am              |    3 -
- dracut/Makefile.in              |  688 ---------------------------------------
+ dracut/Makefile.in              |  689 ---------------------------------------
  dracut/README.dracut.markdown   |  166 ----------
- 11 files changed, 1 insertion(+), 1636 deletions(-)
+ 11 files changed, 1 insertion(+), 1638 deletions(-)
  delete mode 100644 dracut/90zfs/.gitignore
  delete mode 100644 dracut/90zfs/Makefile.am
  delete mode 100644 dracut/90zfs/Makefile.in
@@ -31,7 +31,7 @@ dracut-005 package that is currently published in Debian and Ubuntu.
  delete mode 100644 dracut/README.dracut.markdown
 
 diff --git a/Makefile.am b/Makefile.am
-index 1a9171d..c1975cd 100644
+index 89e094e..e1c063b 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -4,7 +4,7 @@ include $(top_srcdir)/config/tgz.am
@@ -44,7 +44,7 @@ index 1a9171d..c1975cd 100644
  if CONFIG_KERNEL
  KERNEL_DIR = module
 diff --git a/configure.ac b/configure.ac
-index 9fc1ef4..cd1be03 100644
+index 3b741df..cd801b7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -56,8 +56,6 @@ ZFS_AC_DEBUG_DMU_TX
@@ -94,10 +94,10 @@ index 4112061..0000000
 -      -$(RM) $(pkgdracut_SCRIPTS)
 diff --git a/dracut/90zfs/Makefile.in b/dracut/90zfs/Makefile.in
 deleted file mode 100644
-index 956e458..0000000
+index 60fa585..0000000
 --- a/dracut/90zfs/Makefile.in
 +++ /dev/null
-@@ -1,568 +0,0 @@
+@@ -1,569 +0,0 @@
 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
 -# @configure_input@
 -
@@ -169,6 +169,7 @@ index 956e458..0000000
 -      $(top_srcdir)/config/kernel-create-umode-t.m4 \
 -      $(top_srcdir)/config/kernel-d-make-root.m4 \
 -      $(top_srcdir)/config/kernel-d-obtain-alias.m4 \
+-      $(top_srcdir)/config/kernel-discard-granularity.m4 \
 -      $(top_srcdir)/config/kernel-encode-fh-inode.m4 \
 -      $(top_srcdir)/config/kernel-evict-inode.m4 \
 -      $(top_srcdir)/config/kernel-fallocate.m4 \
@@ -879,10 +880,10 @@ index 35b88c3..0000000
 -EXTRA_DIST = README.dracut.markdown
 diff --git a/dracut/Makefile.in b/dracut/Makefile.in
 deleted file mode 100644
-index 0e98a6c..0000000
+index cda6b56..0000000
 --- a/dracut/Makefile.in
 +++ /dev/null
-@@ -1,688 +0,0 @@
+@@ -1,689 +0,0 @@
 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
 -# @configure_input@
 -
@@ -953,6 +954,7 @@ index 0e98a6c..0000000
 -      $(top_srcdir)/config/kernel-create-umode-t.m4 \
 -      $(top_srcdir)/config/kernel-d-make-root.m4 \
 -      $(top_srcdir)/config/kernel-d-obtain-alias.m4 \
+-      $(top_srcdir)/config/kernel-discard-granularity.m4 \
 -      $(top_srcdir)/config/kernel-encode-fh-inode.m4 \
 -      $(top_srcdir)/config/kernel-evict-inode.m4 \
 -      $(top_srcdir)/config/kernel-fallocate.m4 \
diff --git a/debian/patches/0005-Remove-userland-dist-rules.patch b/debian/patches/0005-Remove-userland-dist-rules.patch
index cefa468f129415359d601c86386a489916bea97c..c7c264bcc3b2e1fb8c82fd3899fac81949d7c06d 100644 (file)
--- a/debian/patches/0005-Remove-userland-dist-rules.patch
+++ b/debian/patches/0005-Remove-userland-dist-rules.patch
@@ -1,4 +1,4 @@
-From 6a64315e40fd0cf58b9d8c358e3e831ade5f35b6 Mon Sep 17 00:00:00 2001
+From 3a6683b82050f24cf720473b61e971475bafcb64 Mon Sep 17 00:00:00 2001
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Tue, 17 Jan 2012 22:23:16 -0600
 Subject: [PATCH 5/7] Remove userland dist rules.
@@ -24,7 +24,7 @@ instances of EXTRA_DIST and change dist_ to nodist_.
  12 files changed, 9 insertions(+), 19 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index c1975cd..9cb3dc6 100644
+index e1c063b..5da7994 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -12,8 +12,7 @@ endif
@@ -36,7 +36,7 @@ index c1975cd..9cb3dc6 100644
 +EXTRA_DIST  = config/config.awk config/rpm.am config/deb.am config/tgz.am
  EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown
  EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
- noinst_HEADERS = zfs_config.h zfs.release
+ EXTRA_DIST += dkms.postinst
 diff --git a/cmd/vdev_id/Makefile.am b/cmd/vdev_id/Makefile.am
 index fb815fa..86d91d3 100644
 --- a/cmd/vdev_id/Makefile.am
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 f78ba66e2a6cf8f515464015cf594d8bdff94124..5dab52096c95a52ca6894fbc13ad42a53e25d749 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
@@ -1,4 +1,4 @@
-From 7a2a9899a1557b125824438695e9cf610dd1750a Mon Sep 17 00:00:00 2001
+From 6700db9e2b959f784dbc18b10c5ec8633ee2d381 Mon Sep 17 00:00:00 2001
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Fri, 3 Feb 2012 14:49:49 -0600
 Subject: [PATCH 6/7] Improve the --with-spl error for DKMS systems.
@@ -14,10 +14,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
-index a40bb5b..ff60c34 100644
+index c08b6a2..9d50fba 100644
 --- a/config/kernel.m4
 +++ b/config/kernel.m4
-@@ -271,9 +271,10 @@ AC_DEFUN([ZFS_AC_SPL], [
+@@ -307,9 +307,10 @@ AC_DEFUN([ZFS_AC_SPL], [
                ], [
                        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 11f5054bdc09257b91d6a705033cdeef3cc4a1dc..7fcb5e4a52aadf9620a2867e6fc3f400da22c55e 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
@@ -1,4 +1,4 @@
-From 778c690d8a803db713682868441713ec38815a13 Mon Sep 17 00:00:00 2001
+From 81df05a48b5078a0f86203d709d8503219d66c6f Mon Sep 17 00:00:00 2001
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Fri, 13 Apr 2012 09:22:29 -0500
 Subject: [PATCH 7/7] Improve the SPL version error for DKMS systems.
@@ -17,10 +17,10 @@ Closes: dajhorn/pkg-zfs#30
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/config/kernel.m4 b/config/kernel.m4
-index ff60c34..160b821 100644
+index 9d50fba..0057c5e 100644
 --- a/config/kernel.m4
 +++ b/config/kernel.m4
-@@ -304,7 +304,10 @@ AC_DEFUN([ZFS_AC_SPL], [
+@@ -340,7 +340,10 @@ AC_DEFUN([ZFS_AC_SPL], [
                AC_MSG_RESULT([Not found])
                AC_MSG_ERROR([
        *** Cannot determine the version of the spl source.
Mirror of ZFSOnLinux for Debian