]> 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: 1083ff7)
Refresh debian/patches after upstream merge.
authorDarik Horn <dajhorn@vanadac.com>
Tue, 28 Feb 2012 01:35:05 +0000 (19:35 -0600)
committerDarik Horn <dajhorn@vanadac.com>
Tue, 28 Feb 2012 01:35:05 +0000 (19:35 -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 fc86ae3dbbae57c50fdf2cafe24fbc46567488f8..11fea86590e6fc049fca40a09c6ecacc01b518d4 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 32bdd27675618e33f816d07a40bc9066288e2988 Mon Sep 17 00:00:00 2001
+From d93e090fd9490eed0563f0bfaef8be5a5b5cf90d 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.
@@ -53,10 +53,10 @@ index 4fcef3d..16b8a76 100644
        ZFS_AC_CONFIG_USER_ARCH
        ZFS_AC_CONFIG_USER_IOCTL
 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
-index aa8d3e5..784e21e 100644
+index 823f332..32fc6ab 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
-@@ -54,10 +54,10 @@ AC_DEFUN([ZFS_AC_CONFIG], [
+@@ -58,10 +58,10 @@ AC_DEFUN([ZFS_AC_CONFIG], [
        ZFS_AC_CONFIG_ALWAYS
  
        case "$ZFS_CONFIG" in
diff --git a/debian/patches/0002-Remove-the-COPYING-file.patch b/debian/patches/0002-Remove-the-COPYING-file.patch
index 95948ff29978322889b87e35374b6ddcf6d55b75..d5fc9072956ac92ed5c4e928e6864edd74c48be4 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 1c9a2d4ddcd5467dfb44e2d13e07276bbf68b352 Mon Sep 17 00:00:00 2001
+From f752df7e1e9be1346b7044ec70e0ec795e72ed0b 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 1e1d656d4b5f00e2cb70794d8c297f4331e77f21..d18870ba6040f73a07f586af2d6f859db99c0b64 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 ce4d381670db296150fb80cdd00dec0d8d62a20e Mon Sep 17 00:00:00 2001
+From 1cd781902bbf986a16b1fbcf82c50de6fda4a7c0 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   |  559 ----------------------------------------------
+ etc/init.d/Makefile.in   |  560 ----------------------------------------------
  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(+), 1402 deletions(-)
+ 11 files changed, 1 insertions(+), 1403 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 cbed8c0..0000000
+index 9ff3e22..0000000
 --- a/etc/init.d/Makefile.in
 +++ /dev/null
-@@ -1,559 +0,0 @@
+@@ -1,560 +0,0 @@
 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
 -# @configure_input@
 -
@@ -243,6 +243,7 @@ index cbed8c0..0000000
 -CYGPATH_W = @CYGPATH_W@
 -DEBUG_CFLAGS = @DEBUG_CFLAGS@
 -DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@
+-DEBUG_ZFS = @DEBUG_ZFS@
 -DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@
 -DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@
 -DEFAULT_PACKAGE = @DEFAULT_PACKAGE@
diff --git a/debian/patches/0004-Remove-the-upstream-dracut-component.patch b/debian/patches/0004-Remove-the-upstream-dracut-component.patch
index 689389a8b0a7d530dd17d8d549a3743537d597f6..afc6a2d929192f32b19a06a17e7ea3b4813db85c 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 1f81eaade9ea5826b025b0bcf69e442a5b0e3c51 Mon Sep 17 00:00:00 2001
+From 84858495e0923fbf94fb331fb05953a598c84959 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        |  558 --------------------------------
+ dracut/90zfs/Makefile.in        |  559 --------------------------------
  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              |  678 ---------------------------------------
+ dracut/Makefile.in              |  679 ---------------------------------------
  dracut/README.dracut.markdown   |  166 ----------
- 11 files changed, 1 insertions(+), 1616 deletions(-)
+ 11 files changed, 1 insertions(+), 1618 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 0725bbc..0000000
+index 470f204..0000000
 --- a/dracut/90zfs/Makefile.in
 +++ /dev/null
-@@ -1,558 +0,0 @@
+@@ -1,559 +0,0 @@
 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
 -# @configure_input@
 -
@@ -253,6 +253,7 @@ index 0725bbc..0000000
 -CYGPATH_W = @CYGPATH_W@
 -DEBUG_CFLAGS = @DEBUG_CFLAGS@
 -DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@
+-DEBUG_ZFS = @DEBUG_ZFS@
 -DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@
 -DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@
 -DEFAULT_PACKAGE = @DEFAULT_PACKAGE@
@@ -869,10 +870,10 @@ index 35b88c3..0000000
 -EXTRA_DIST = README.dracut.markdown
 diff --git a/dracut/Makefile.in b/dracut/Makefile.in
 deleted file mode 100644
-index 1544385..0000000
+index d65ef24..0000000
 --- a/dracut/Makefile.in
 +++ /dev/null
-@@ -1,678 +0,0 @@
+@@ -1,679 +0,0 @@
 -# Makefile.in generated by automake 1.11.1 from Makefile.am.
 -# @configure_input@
 -
@@ -1044,6 +1045,7 @@ index 1544385..0000000
 -CYGPATH_W = @CYGPATH_W@
 -DEBUG_CFLAGS = @DEBUG_CFLAGS@
 -DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@
+-DEBUG_ZFS = @DEBUG_ZFS@
 -DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@
 -DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@
 -DEFAULT_PACKAGE = @DEFAULT_PACKAGE@
diff --git a/debian/patches/0005-Remove-userland-dist-rules.patch b/debian/patches/0005-Remove-userland-dist-rules.patch
index dc52a57c407d675ae0358731d4c6b911f71289a0..7805d9a4c7f8207e711ce8898d815f0059336a5b 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 416748594ffed9beb9b8afdddd69babc69abb543 Mon Sep 17 00:00:00 2001
+From d72cecab4b0d15082796648314a33fad36c25a1e 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 24bac43d3d79d1414818c889b30b395f1ca43d79..19807ee28af1ba43dde39397f30865ebbfe234e0 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 3233d2ae22dab01fa484dcd93db06a568ed116f5 Mon Sep 17 00:00:00 2001
+From d50295867c2d105b0db793660afa51e09ac6f520 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.
Mirror of ZFSOnLinux for Debian