Refresh debian/patches after upstream merge.

diff --git a/debian/patches/0001-Revert-Remove-etc-hostid-missing-warning.patch b/debian/patches/0001-Revert-Remove-etc-hostid-missing-warning.patch
index 0ddfeed6447b5a0b4d72addc6cdf44b9f70bec22..c0ef9e75d03053bf425db1911929dd5dfb3be3f9 100644 (file)
--- a/debian/patches/0001-Revert-Remove-etc-hostid-missing-warning.patch
+++ b/debian/patches/0001-Revert-Remove-etc-hostid-missing-warning.patch
@@ -8,11 +8,11 @@ This reverts commit 6b3b569df30d13ed7bbbff877cffc71290a52f12.
  module/spl/spl-generic.c |    6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)
 
-diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
-index 1dedf76..651d45e 100644
+Index: b/module/spl/spl-generic.c
+===================================================================
 --- a/module/spl/spl-generic.c
 +++ b/module/spl/spl-generic.c
-@@ -414,8 +414,12 @@ hostid_read(void)
+@@ -414,8 +414,12 @@
  
        file = kobj_open_file(spl_hostid_path);
  
@@ -26,6 +26,3 @@ index 1dedf76..651d45e 100644
  
        result = kobj_get_filesize(file, &size);
  
--- 
-1.7.5.4
-

diff --git a/debian/patches/0002-Revert-Revert-Stabilize-the-hostid-for-RPM-installations.patch b/debian/patches/0002-Revert-Revert-Stabilize-the-hostid-for-RPM-installations.patch
index c87757d61d03a66d47e7c4c018a224aeb7c900c1..75987aadfad62943cfb5a4f675c1a40672d241d6 100644 (file)
--- a/debian/patches/0002-Revert-Revert-Stabilize-the-hostid-for-RPM-installations.patch
+++ b/debian/patches/0002-Revert-Revert-Stabilize-the-hostid-for-RPM-installations.patch
@@ -9,11 +9,11 @@ This reverts commit 39a87c69211aceef23889ceb4a33291e476237b9.
  spl-modules.spec.in |   11 +++++++++++
  1 files changed, 11 insertions(+), 0 deletions(-)
 
-diff --git a/spl-modules.spec.in b/spl-modules.spec.in
-index e02d6c2..ddeb260 100644
+Index: b/spl-modules.spec.in
+===================================================================
 --- a/spl-modules.spec.in
 +++ b/spl-modules.spec.in
-@@ -233,6 +233,17 @@ rm -rf $RPM_BUILD_ROOT
+@@ -233,6 +233,17 @@
  %{_prefix}/src/*
  
  %post
@@ -29,8 +29,5 @@ index e02d6c2..ddeb260 100644
 +      "$(which printf)" "\x$DD\x$CC\x$BB\x$AA" >"/etc/hostid"
 +fi
  if [ -f /boot/System.map-%{kver} ]; then
-       depmod -ae -F /boot/System.map-%{kver} %{kver} || exit 0
+       /sbin/depmod -ae -F /boot/System.map-%{kver} %{kver} || exit 0
  else
--- 
-1.7.5.4
-