]> 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: c8257db)
Refresh debian/patches after upstream merge.
authorDarik Horn <dajhorn@vanadac.com>
Mon, 13 Feb 2012 01:27:35 +0000 (19:27 -0600)
committerDarik Horn <dajhorn@vanadac.com>
Mon, 13 Feb 2012 01:27:35 +0000 (19:27 -0600)
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

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 d79b2c7f5c7a8ac93a533b6f269c500594247236..fc86ae3dbbae57c50fdf2cafe24fbc46567488f8 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 6d52861e705bf184087f2433a8a604bbb242820f Mon Sep 17 00:00:00 2001
+From 32bdd27675618e33f816d07a40bc9066288e2988 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/6] 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 1c30c4ed673b8ba54ce0063880673841b112e1a0..95948ff29978322889b87e35374b6ddcf6d55b75 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 9df48ce74d4acf4bd3f4dcc68591e6e0ac002d6e Mon Sep 17 00:00:00 2001
+From 1c9a2d4ddcd5467dfb44e2d13e07276bbf68b352 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/6] 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 4f85e86e3d4d05e16cac09064ca740625501afb6..1e1d656d4b5f00e2cb70794d8c297f4331e77f21 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 ae4ce590f3cb7cf3528a8cb5519d7aed93de7396 Mon Sep 17 00:00:00 2001
+From ce4d381670db296150fb80cdd00dec0d8d62a20e 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/6] 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   |  557 ----------------------------------------------
+ etc/init.d/Makefile.in   |  559 ----------------------------------------------
  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 insertions(+), 1400 deletions(-)
+ 11 files changed, 1 insertions(+), 1402 deletions(-)
  delete mode 100644 etc/init.d/.gitignore
  delete mode 100644 etc/init.d/Makefile.am
  delete mode 100644 etc/init.d/Makefile.in
@@ -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 0106a50..0000000
+index cbed8c0..0000000
 --- a/etc/init.d/Makefile.in
 +++ /dev/null
-@@ -1,557 +0,0 @@
+@@ -1,559 +0,0 @@
 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
 -# @configure_input@
 -
@@ -140,6 +140,7 @@ index 0106a50..0000000
 -      $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
 -      $(top_srcdir)/config/kernel-blk-end-request.m4 \
 -      $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+-      $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
 -      $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
 -      $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
 -      $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \
@@ -154,6 +155,7 @@ index 0106a50..0000000
 -      $(top_srcdir)/config/kernel-check-disk-size-change.m4 \
 -      $(top_srcdir)/config/kernel-d-obtain-alias.m4 \
 -      $(top_srcdir)/config/kernel-evict-inode.m4 \
+-      $(top_srcdir)/config/kernel-fallocate.m4 \
 -      $(top_srcdir)/config/kernel-fmode-t.m4 \
 -      $(top_srcdir)/config/kernel-fsync.m4 \
 -      $(top_srcdir)/config/kernel-get-disk-ro.m4 \
diff --git a/debian/patches/0004-Remove-the-upstream-dracut-component.patch b/debian/patches/0004-Remove-the-upstream-dracut-component.patch
index b54437e237d3df07bbc4bf22f7d858f7ec6c9d25..689389a8b0a7d530dd17d8d549a3743537d597f6 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 9dcf4e11e572d5af642583bfdc95a9a377858b2e Mon Sep 17 00:00:00 2001
+From 1f81eaade9ea5826b025b0bcf69e442a5b0e3c51 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/6] 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        |  556 --------------------------------
+ dracut/90zfs/Makefile.in        |  558 --------------------------------
  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              |  676 ---------------------------------------
+ dracut/Makefile.in              |  678 ---------------------------------------
  dracut/README.dracut.markdown   |  166 ----------
- 11 files changed, 1 insertions(+), 1612 deletions(-)
+ 11 files changed, 1 insertions(+), 1616 deletions(-)
  delete mode 100644 dracut/90zfs/.gitignore
  delete mode 100644 dracut/90zfs/Makefile.am
  delete mode 100644 dracut/90zfs/Makefile.in
@@ -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 b7c3be6..0000000
+index 0725bbc..0000000
 --- a/dracut/90zfs/Makefile.in
 +++ /dev/null
-@@ -1,556 +0,0 @@
+@@ -1,558 +0,0 @@
 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
 -# @configure_input@
 -
@@ -150,6 +150,7 @@ index b7c3be6..0000000
 -      $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
 -      $(top_srcdir)/config/kernel-blk-end-request.m4 \
 -      $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+-      $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
 -      $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
 -      $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
 -      $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \
@@ -164,6 +165,7 @@ index b7c3be6..0000000
 -      $(top_srcdir)/config/kernel-check-disk-size-change.m4 \
 -      $(top_srcdir)/config/kernel-d-obtain-alias.m4 \
 -      $(top_srcdir)/config/kernel-evict-inode.m4 \
+-      $(top_srcdir)/config/kernel-fallocate.m4 \
 -      $(top_srcdir)/config/kernel-fmode-t.m4 \
 -      $(top_srcdir)/config/kernel-fsync.m4 \
 -      $(top_srcdir)/config/kernel-get-disk-ro.m4 \
@@ -867,10 +869,10 @@ index 35b88c3..0000000
 -EXTRA_DIST = README.dracut.markdown
 diff --git a/dracut/Makefile.in b/dracut/Makefile.in
 deleted file mode 100644
-index d92a983..0000000
+index 1544385..0000000
 --- a/dracut/Makefile.in
 +++ /dev/null
-@@ -1,676 +0,0 @@
+@@ -1,678 +0,0 @@
 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
 -# @configure_input@
 -
@@ -922,6 +924,7 @@ index d92a983..0000000
 -      $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
 -      $(top_srcdir)/config/kernel-blk-end-request.m4 \
 -      $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+-      $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
 -      $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
 -      $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
 -      $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \
@@ -936,6 +939,7 @@ index d92a983..0000000
 -      $(top_srcdir)/config/kernel-check-disk-size-change.m4 \
 -      $(top_srcdir)/config/kernel-d-obtain-alias.m4 \
 -      $(top_srcdir)/config/kernel-evict-inode.m4 \
+-      $(top_srcdir)/config/kernel-fallocate.m4 \
 -      $(top_srcdir)/config/kernel-fmode-t.m4 \
 -      $(top_srcdir)/config/kernel-fsync.m4 \
 -      $(top_srcdir)/config/kernel-get-disk-ro.m4 \
diff --git a/debian/patches/0005-Remove-userland-dist-rules.patch b/debian/patches/0005-Remove-userland-dist-rules.patch
index a507bbd5646d86393f64e1badc42a9540d9bdc0e..dc52a57c407d675ae0358731d4c6b911f71289a0 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 cbbff2bfd58eca8b67b9a5f83bac697fb2b0b31f Mon Sep 17 00:00:00 2001
+From 416748594ffed9beb9b8afdddd69babc69abb543 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/6] Remove userland dist rules.
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 7c069052a5d9c2ba5195a90aa2d659510bd84ec9..24bac43d3d79d1414818c889b30b395f1ca43d79 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 280dda758d3dadb969698365547687cad553b656 Mon Sep 17 00:00:00 2001
+From 3233d2ae22dab01fa484dcd93db06a568ed116f5 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/6] Improve the --with-spl error for DKMS systems.
@@ -14,10 +14,10 @@ or to bundle SPL into the ZFS package.
  1 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/config/kernel.m4 b/config/kernel.m4
-index b464557..9895561 100644
+index 0adcead..bf43a75 100644
 --- a/config/kernel.m4
 +++ b/config/kernel.m4
-@@ -254,9 +254,10 @@ AC_DEFUN([ZFS_AC_SPL], [
+@@ -256,9 +256,10 @@ AC_DEFUN([ZFS_AC_SPL], [
                ], [
                        AC_MSG_RESULT([Not found])
                        AC_MSG_ERROR([
Mirror of ZFSOnLinux for Debian