- started update to 2.0.0, lots of unpackaged files

diff --git a/am.patch b/am.patch
index 9fd774fa768842c5a8dc3d07cdaa1b99bace79b8..1f827abfa034b822a2d6622e2750a314c2e71af1 100644 (file)
--- a/am.patch
+++ b/am.patch
@@ -2,7 +2,7 @@ diff --git a/Makefile.am b/Makefile.am
 index 55cae89fa..8ce1af3b8 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -9,13 +9,13 @@ if CONFIG_USER
+@@ -9,14 +9,14 @@ if CONFIG_USER
  SUBDIRS += udev etc man scripts lib tests cmd contrib
  endif
  if CONFIG_KERNEL
@@ -13,12 +13,13 @@ index 55cae89fa..8ce1af3b8 100644
 -extra_HEADERS = zfs.release.in zfs_config.h.in
 +extra_HEADERS = zfs.release zfs_config.h
  
+ if BUILD_LINUX
  kerneldir = $(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION)
 -nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
 +nodist_kernel_HEADERS = zfs.release.in zfs_config.h.in module/$(LINUX_SYMBOLS)
  endif
+ endif
  
- AUTOMAKE_OPTIONS = foreign
 @@ -54,8 +54,8 @@ install-data-hook:
        cd $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \
        ln -s ../zfs-$(VERSION)/include/spl include && \

diff --git a/initdir.patch b/initdir.patch
new file mode 100644 (file)
index 0000000..9f5f36c
--- /dev/null
+++ b/initdir.patch
@@ -0,0 +1,11 @@
+--- zfs-2.0.0/config/zfs-build.m4~     2020-10-08 18:41:58.000000000 +0200
++++ zfs-2.0.0/config/zfs-build.m4      2020-12-24 23:45:01.909714362 +0100
+@@ -479,7 +479,7 @@
+       AC_MSG_CHECKING([default init directory])
+       case "$VENDOR" in
+               freebsd)    initdir=$sysconfdir/rc.d  ;;
+-              *)          initdir=$sysconfdir/init.d;;
++              *)          initdir=$sysconfdir/rc.d/init.d;;
+       esac
+       AC_MSG_RESULT([$initdir])
+       AC_SUBST(initdir)

diff --git a/link.patch b/link.patch
deleted file mode 100644 (file)
index e3816c9..0000000
--- a/link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- zfs-zfs-0.8.3/lib/libnvpair/Makefile.am~   2020-01-22 22:51:17.000000000 +0100
-+++ zfs-zfs-0.8.3/lib/libnvpair/Makefile.am    2020-04-05 10:21:40.550628294 +0200
-@@ -28,7 +28,9 @@
-       $(USER_C) \
-       $(KERNEL_C)
- 
--libnvpair_la_LIBADD = $(LIBTIRPC_LIBS)
-+libnvpair_la_LIBADD = $(LIBTIRPC_LIBS) \
-+      $(top_builddir)/lib/libspl/libspl.la
-+
- libnvpair_la_LDFLAGS = -version-info 1:1:0
- 
- EXTRA_DIST = $(USER_C)

diff --git a/x32.patch b/x32.patch
deleted file mode 100644 (file)
index 5939080..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- zfs-0.6.3/lib/libspl/include/sys/isa_defs.h~       2015-03-01 13:37:53.000000000 +0000
-+++ zfs-0.6.3/lib/libspl/include/sys/isa_defs.h        2015-03-01 13:38:21.366669848 +0000
-@@ -41,7 +41,7 @@
- #if !defined(__x86)
- #define       __x86
- #endif
- 
--#if !defined(_LP64)
-+#if !defined(_LP64) && !defined(_ILP32)
- #define       _LP64
- #endif
- 

diff --git a/zfs-sh.patch b/zfs-sh.patch
deleted file mode 100644 (file)
index 02fd82b..0000000
--- a/zfs-sh.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- 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=''
- 
-From db0ad393b1bb7f83167e1cece1fd896dd0e63d73 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <48421688+ahesford@users.noreply.github.com>
-Date: Fri, 14 Feb 2020 11:30:29 -0500
-Subject: [PATCH] Use POSIX stdout/stderr redirect in configure macro
-
-This PR fixes an issue wherein redirecting stdout and stderr when
-building kernel modules in configure tests relied on a bashism that
-does not work as expected when /bin/sh is not bash.
-
-Reviewed-by: George Melikov <mail@gmelikov.ru>
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed-By: Richard Laager <rlaager@wiktel.com>
-Signed-off-by: Andrew J. Hesford <ajh@sideband.org>
-Closes #9990
-Closes #9998
----
- config/kernel.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index 23643e0c3de..6bb37937cb4 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -566,7 +566,7 @@ AC_DEFUN([ZFS_LINUX_COMPILE], [
-       AC_TRY_COMMAND([
-           KBUILD_MODPOST_NOFINAL="$5" KBUILD_MODPOST_WARN="$6"
-           make modules -k -j$TEST_JOBS -C $LINUX_OBJ $ARCH_UM
--          M=$PWD/$1 &>$1/build.log])
-+          M=$PWD/$1 >$1/build.log 2>&1])
-       AS_IF([AC_TRY_COMMAND([$2])], [$3], [$4])
- ])
- 

diff --git a/zfs.spec b/zfs.spec
index cad24228e7a030b4c78162f8f1d348d5cd07517a..118e926a26de6d5a589b481299c38cfc6ba4b003 100644 (file)
--- a/zfs.spec
+++ b/zfs.spec
@@ -28,21 +28,19 @@ exit 1
 
 %define                _duplicate_files_terminate_build        0
 
-%define        rel     1
+%define        rel     0.1
 %define        pname   zfs
 Summary:       Native Linux port of the ZFS filesystem
 Summary(pl.UTF-8):     Natywny linuksowy port systemu plików ZFS
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       0.8.5
+Version:       2.0.0
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       CDDL
 Group:         Applications/System
 Source0:       https://github.com/openzfs/zfs/releases/download/zfs-%{version}/%{pname}-%{version}.tar.gz
-# Source0-md5: 905cc25c252999bd2049165eea90c975
-Patch0:                x32.patch
+# Source0-md5: a6f2d1b87562d875d5b18f0580b8289f
+Patch0:                initdir.patch
 Patch1:                am.patch
-Patch2:                %{pname}-sh.patch
-Patch3:                link.patch
 URL:           https://zfsonlinux.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -275,16 +273,22 @@ p=`pwd`\
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' \
       cmd/arc_summary/arc_summary2
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
-      cmd/arc_summary/arc_summary3 \
-      cmd/arcstat/arcstat \
-      cmd/dbufstat/dbufstat
+      cmd/arc_summary/arc_summary3
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+@PYTHON_SHEBANG@(\s|$),#!%{__python3}\1,' \
+      cmd/arcstat/arcstat.in \
+      cmd/dbufstat/dbufstat.in
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
+      contrib/dracut/02zfsexpandknowledge/module-setup.sh.in \
+      contrib/dracut/90zfs/module-setup.sh.in \
+      scripts/zimport.sh \
+      scripts/zloop.sh
 
 %build
 %{__libtoolize}
@@ -455,15 +459,17 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnvpair.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnvpair.so.1
+%attr(755,root,root) %ghost %{_libdir}/libnvpair.so.3
 %attr(755,root,root) %{_libdir}/libuutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libuutil.so.1
+%attr(755,root,root) %ghost %{_libdir}/libuutil.so.3
 %attr(755,root,root) %{_libdir}/libzfs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libzfs.so.2
+%attr(755,root,root) %ghost %{_libdir}/libzfs.so.4
 %attr(755,root,root) %{_libdir}/libzfs_core.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libzfs_core.so.1
+%attr(755,root,root) %ghost %{_libdir}/libzfs_core.so.3
+%attr(755,root,root) %{_libdir}/libzfsbootenv.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libzfsbootenv.so.1
 %attr(755,root,root) %{_libdir}/libzpool.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libzpool.so.2
+%attr(755,root,root) %ghost %{_libdir}/libzpool.so.4
 
 %files devel
 %defattr(644,root,root,755)
@@ -471,11 +477,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libuutil.so
 %attr(755,root,root) %{_libdir}/libzfs.so
 %attr(755,root,root) %{_libdir}/libzfs_core.so
+%attr(755,root,root) %{_libdir}/libzfsbootenv.so
 %attr(755,root,root) %{_libdir}/libzpool.so
 %{_libdir}/libnvpair.la
 %{_libdir}/libuutil.la
 %{_libdir}/libzfs.la
 %{_libdir}/libzfs_core.la
+%{_libdir}/libzfsbootenv.la
 %{_libdir}/libzpool.la
 %{_includedir}/libspl
 %{_includedir}/libzfs