commit 63b2f90077ab22b721ec3ea7190e8b9339e433e0
Author: Jakub Bogusz <[email protected]>
Date: Wed Jul 17 17:59:12 2019 +0200
- added sh patch (kill += bashism in configure)
- force systemd support even if systemd is not installed
zfs-sh.patch | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
zfs.spec | 3 +++
2 files changed, 81 insertions(+)
---
diff --git a/zfs.spec b/zfs.spec
index d539bfb..6b122a3 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -42,6 +42,7 @@ Source0:
https://github.com/zfsonlinux/zfs/archive/zfs-%{version}/%{pname}-%{ver
# Source0-md5: db6618a09f6494e1126b14a1302f77c8
Patch0: x32.patch
Patch1: am.patch
+Patch2: %{name}-sh.patch
URL: http://zfsonlinux.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -274,6 +275,7 @@ p=`pwd`\
%setup -q -n %{pname}-zfs-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
@@ -286,6 +288,7 @@ p=`pwd`\
%if %{with userspace}
%configure \
--disable-silent-rules \
+ --enable-systemd \
--with-config="user" \
--with-linux=%{_kernelsrcdir} \
--with-systemdunitdir=%{systemdunitdir} \
diff --git a/zfs-sh.patch b/zfs-sh.patch
new file mode 100644
index 0000000..b9521ed
--- /dev/null
+++ b/zfs-sh.patch
@@ -0,0 +1,78 @@
+--- zfs-zfs-0.8.1/config/zfs-build.m4.orig 2019-06-14 18:43:18.000000000
+0200
++++ zfs-zfs-0.8.1/config/zfs-build.m4 2019-07-17 16:03:44.885415916 +0200
+@@ -110,7 +110,7 @@
+ [enable_debug_kmem=no])
+
+ AS_IF([test "x$enable_debug_kmem" = xyes], [
+- KERNEL_DEBUG_CPPFLAGS+=" -DDEBUG_KMEM"
++ KERNEL_DEBUG_CPPFLAGS="$KERNEL_DEBUG_CPPFLAGS -DDEBUG_KMEM"
+ DEBUG_KMEM_ZFS="_with_debug_kmem"
+ ], [
+ DEBUG_KMEM_ZFS="_without_debug_kmem"
+@@ -140,7 +140,7 @@
+ [enable_debug_kmem_tracking=no])
+
+ AS_IF([test "x$enable_debug_kmem_tracking" = xyes], [
+- KERNEL_DEBUG_CPPFLAGS+=" -DDEBUG_KMEM_TRACKING"
++ KERNEL_DEBUG_CPPFLAGS="$KERNEL_DEBUG_CPPFLAGS
-DDEBUG_KMEM_TRACKING"
+ DEBUG_KMEM_TRACKING_ZFS="_with_debug_kmem_tracking"
+ ], [
+ DEBUG_KMEM_TRACKING_ZFS="_without_debug_kmem_tracking"
+@@ -242,10 +242,10 @@
+ ])
+
+ RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"'
+- RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_ZFS) 1"'
+- RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_TRACKING_ZFS) 1"'
+- RPM_DEFINE_COMMON+=' --define "$(DEBUGINFO_ZFS) 1"'
+- RPM_DEFINE_COMMON+=' --define "$(ASAN_ZFS) 1"'
++ RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(DEBUG_KMEM_ZFS) 1"'
++ RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define
"$(DEBUG_KMEM_TRACKING_ZFS) 1"'
++ RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(DEBUGINFO_ZFS) 1"'
++ RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(ASAN_ZFS) 1"'
+
+ RPM_DEFINE_UTIL=' --define "_initconfdir $(DEFAULT_INITCONF_DIR)"'
+
+@@ -258,16 +258,16 @@
+ RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)"'
+ ])
+ AS_IF([test -n "$udevdir" ], [
+- RPM_DEFINE_UTIL+=' --define "_udevdir $(udevdir)"'
++ RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' --define "_udevdir
$(udevdir)"'
+ ])
+ AS_IF([test -n "$udevruledir" ], [
+- RPM_DEFINE_UTIL+=' --define "_udevdir $(udevruledir)"'
++ RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' --define "_udevdir
$(udevruledir)"'
+ ])
+- RPM_DEFINE_UTIL+=' $(DEFINE_INITRAMFS)'
+- RPM_DEFINE_UTIL+=' $(DEFINE_SYSTEMD)'
+- RPM_DEFINE_UTIL+=' $(DEFINE_PYZFS)'
+- RPM_DEFINE_UTIL+=' $(DEFINE_PYTHON_VERSION)'
+- RPM_DEFINE_UTIL+=' $(DEFINE_PYTHON_PKG_VERSION)'
++ RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_INITRAMFS)'
++ RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_SYSTEMD)'
++ RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_PYZFS)'
++ RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_PYTHON_VERSION)'
++ RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_PYTHON_PKG_VERSION)'
+
+ dnl # Override default lib directory on Debian/Ubuntu systems. The
+ dnl # provided /usr/lib/rpm/platform/<arch>/macros files do not
+@@ -279,14 +279,14 @@
+ dnl #
+ AS_IF([test "$DEFAULT_PACKAGE" = "deb"], [
+ MULTIARCH_LIBDIR="lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+- RPM_DEFINE_UTIL+=' --define "_lib $(MULTIARCH_LIBDIR)"'
++ RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' --define "_lib
$(MULTIARCH_LIBDIR)"'
+ AC_SUBST(MULTIARCH_LIBDIR)
+ ])
+
+ RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"'
+- RPM_DEFINE_KMOD+=' --define "ksrc $(LINUX)"'
+- RPM_DEFINE_KMOD+=' --define "kobj $(LINUX_OBJ)"'
+- RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"'
++ RPM_DEFINE_KMOD="$RPM_DEFINE_KMOD"' --define "ksrc $(LINUX)"'
++ RPM_DEFINE_KMOD="$RPM_DEFINE_KMOD"' --define "kobj $(LINUX_OBJ)"'
++ RPM_DEFINE_KMOD="$RPM_DEFINE_KMOD"' --define
"_wrong_version_format_terminate_build 0"'
+
+ RPM_DEFINE_DKMS=''
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/63b2f90077ab22b721ec3ea7190e8b9339e433e0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
