diff --git a/.gitmodules b/.gitmodules index 96b8a4d..0877fc1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,7 @@ [submodule "zfs"] path = zfs - url = git://git.proxmox.com/git/zfsonlinux.git + url = git@github.com:openzfs/zfs.git [submodule "linux"] path = linux url = git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git - shallow = true diff --git a/Makefile b/Makefile index 9aa0205..2e37e63 100644 --- a/Makefile +++ b/Makefile @@ -43,14 +43,11 @@ KERNEL_SRC=linux KERNEL_SRC_SUBMODULE=$(KERNEL_SRC) KERNEL_CFG_ORG=config-${KERNEL_VER}.org -ZFSONLINUX_SUBMODULE=zfs/ -ZFSDIR=pkg-zfs - MODULES=modules MODULE_DIRS=${ZFSDIR} # exported to debian/rules via debian/rules.d/dirs.mk -DIRS=KERNEL_SRC ZFSDIR MODULES +DIRS=KERNEL_SRC MODULES DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGRELFULL}_${ARCH}.deb HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGRELFULL}_${ARCH}.deb @@ -105,22 +102,12 @@ ${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE} cp -a ${KERNEL_SRC_SUBMODULE} ${BUILD_DIR}/${KERNEL_SRC} sed -i ${BUILD_DIR}/${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/' rm -rf ${BUILD_DIR}/${KERNEL_SRC}/debian + cp -r zfs ${BUILD_DIR}/zfs touch $@ ${MODULES}.prepared: $(addsuffix .prepared,${MODULE_DIRS}) touch $@ -ZFS_PATCHES=$(wildcard patches/zfs/*.patch) - -${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE} - rm -rf ${BUILD_DIR}/${MODULES}/${ZFSDIR} ${BUILD_DIR}/${MODULES}/tmp $@ - mkdir -p ${BUILD_DIR}/${MODULES}/tmp - cp -a ${ZFSONLINUX_SUBMODULE}/* ${BUILD_DIR}/${MODULES}/tmp - set -e; cd ${BUILD_DIR}/${MODULES}/tmp/upstream; for patch in ${ZFS_PATCHES}; do echo "applying patch '$$patch'" && patch -p1 < ../../../../$${patch}; done - cd ${BUILD_DIR}/${MODULES}/tmp; make kernel - rm -rf ${BUILD_DIR}/${MODULES}/tmp - touch ${ZFSDIR}.prepared - .PHONY: clean clean: rm -rf *~ build *.prepared ${KERNEL_CFG_ORG} diff --git a/debian/patches/series.zfs b/debian/patches/series.zfs new file mode 100644 index 0000000..97d8fe8 --- /dev/null +++ b/debian/patches/series.zfs @@ -0,0 +1,9 @@ +zfs/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch +zfs/0002-always-load-ZFS-module-on-boot.patch +zfs/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch +zfs/0004-import-with-d-dev-disk-by-id-in-scan-service.patch +zfs/0005-Enable-zed-emails.patch +zfs/0006-dont-symlink-zed-scripts.patch +zfs/0007-Use-installed-python3.patch +zfs/0008-Add-systemd-unit-for-importing-specific-pools.patch +zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch \ No newline at end of file diff --git a/debian/patches/zfs/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch b/debian/patches/zfs/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch new file mode 100644 index 0000000..c1f6a4b --- /dev/null +++ b/debian/patches/zfs/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch @@ -0,0 +1,70 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Debian ZFS on Linux maintainers + +Date: Wed, 30 Jan 2019 15:12:04 +0100 +Subject: [PATCH] Check-for-META-and-DCH-consistency-in-autoconf + +Signed-off-by: Thomas Lamprecht +--- + config/zfs-meta.m4 | 34 +++++++++++++++++++++++++++++----- + 1 file changed, 29 insertions(+), 5 deletions(-) + +diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4 +index b3c1befaa..660d8ccb9 100644 +--- a/config/zfs-meta.m4 ++++ b/config/zfs-meta.m4 +@@ -1,9 +1,10 @@ + dnl # + dnl # DESCRIPTION: +-dnl # Read meta data from the META file. When building from a git repository +-dnl # the ZFS_META_RELEASE field will be overwritten if there is an annotated +-dnl # tag matching the form ZFS_META_NAME-ZFS_META_VERSION-*. This allows +-dnl # for working builds to be uniquely identified using the git commit hash. ++dnl # Read meta data from the META file or the debian/changelog file if it ++dnl # exists. When building from a git repository the ZFS_META_RELEASE field ++dnl # will be overwritten if there is an annotated tag matching the form ++dnl # ZFS_META_NAME-ZFS_META_VERSION-*. This allows for working builds to be ++dnl # uniquely identified using the git commit hash. + dnl # + dnl # The META file format is as follows: + dnl # ^[ ]*KEY:[ \t]+VALUE$ +@@ -49,6 +50,7 @@ AC_DEFUN([ZFS_AC_META], [ + _zfs_ac_meta_type="none" + if test -f "$META"; then + _zfs_ac_meta_type="META file" ++ _dpkg_parsechangelog=$(dpkg-parsechangelog 2>/dev/null) + + ZFS_META_NAME=_ZFS_AC_META_GETVAL([(Name|Project|Package)]); + if test -n "$ZFS_META_NAME"; then +@@ -69,8 +71,30 @@ AC_DEFUN([ZFS_AC_META], [ + AC_SUBST([ZFS_META_VERSION]) + fi + ++ if test -n "${_dpkg_parsechangelog}"; then ++ _dpkg_version=$(echo "${_dpkg_parsechangelog}" \ ++ | $AWK '$[]1 == "Version:" { print $[]2; }' \ ++ | cut -d- -f1) ++ if test "${_dpkg_version}" != "$ZFS_META_VERSION"; then ++ AC_MSG_ERROR([ ++ *** Version $ZFS_META_VERSION in the META file is different than ++ *** version $_dpkg_version in the debian/changelog file. DKMS and DEB ++ *** packaging require that these files have the same version. ++ ]) ++ fi ++ fi ++ + ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([Release]); +- if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then ++ ++ if test -n "${_dpkg_parsechangelog}"; then ++ _dpkg_release=$(echo "${_dpkg_parsechangelog}" \ ++ | $AWK '$[]1 == "Version:" { print $[]2; }' \ ++ | cut -d- -f2-) ++ if test -n "${_dpkg_release}"; then ++ ZFS_META_RELEASE=${_dpkg_release} ++ _zfs_ac_meta_type="dpkg-parsechangelog" ++ fi ++ elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then + _match="${ZFS_META_NAME}-${ZFS_META_VERSION}" + _alias=$(git describe --match=${_match} 2>/dev/null) + _release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g') diff --git a/debian/patches/zfs/0002-always-load-ZFS-module-on-boot.patch b/debian/patches/zfs/0002-always-load-ZFS-module-on-boot.patch new file mode 100644 index 0000000..6b1e068 --- /dev/null +++ b/debian/patches/zfs/0002-always-load-ZFS-module-on-boot.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Fri, 19 Jan 2018 12:13:46 +0100 +Subject: [PATCH] always load ZFS module on boot +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +since zfs-import-scan.service is disabled by default, and +zfs-import-cache.service only gets started if a cache file exists, this +is needed for zfs-mount, zfs-share and zfs-zed services in case ZFS is +not actually used. + +Signed-off-by: Fabian Grünbichler +Signed-off-by: Stoiko Ivanov +Signed-off-by: Thomas Lamprecht +--- + etc/modules-load.d/zfs.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/modules-load.d/zfs.conf b/etc/modules-load.d/zfs.conf +index 44e1bb3ed..7509b03cb 100644 +--- a/etc/modules-load.d/zfs.conf ++++ b/etc/modules-load.d/zfs.conf +@@ -1,3 +1,3 @@ + # The default behavior is to allow udev to load the kernel modules on demand. + # Uncomment the following line to unconditionally load them at boot. +-#zfs ++zfs diff --git a/debian/patches/zfs/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch b/debian/patches/zfs/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch new file mode 100644 index 0000000..ebc1850 --- /dev/null +++ b/debian/patches/zfs/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Mon, 6 Feb 2017 12:04:35 +0100 +Subject: [PATCH] Fix the path to the zed binary on the systemd unit. + +We install zed into /usr/sbin manually meanwhile the upstream default is +installing it into /sbin. Ubuntu packages also install zed to /usr/sbin, but +they ship their own zfs-zed unit. + +Signed-off-by: Thomas Lamprecht +--- + etc/systemd/system/zfs-zed.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in +index 008075138..570e27707 100644 +--- a/etc/systemd/system/zfs-zed.service.in ++++ b/etc/systemd/system/zfs-zed.service.in +@@ -4,7 +4,7 @@ Documentation=man:zed(8) + ConditionPathIsDirectory=/sys/module/zfs + + [Service] +-ExecStart=@sbindir@/zed -F ++ExecStart=/usr/sbin/zed -F + Restart=on-abort + + [Install] diff --git a/debian/patches/zfs/0004-import-with-d-dev-disk-by-id-in-scan-service.patch b/debian/patches/zfs/0004-import-with-d-dev-disk-by-id-in-scan-service.patch new file mode 100644 index 0000000..46b03fd --- /dev/null +++ b/debian/patches/zfs/0004-import-with-d-dev-disk-by-id-in-scan-service.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Mon, 24 Oct 2016 13:47:06 +0200 +Subject: [PATCH] import with -d /dev/disk/by-id in scan service +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Fabian Grünbichler +Signed-off-by: Stoiko Ivanov +Signed-off-by: Thomas Lamprecht +--- + etc/systemd/system/zfs-import-scan.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in +index f0317e23e..9a5e9cb17 100644 +--- a/etc/systemd/system/zfs-import-scan.service.in ++++ b/etc/systemd/system/zfs-import-scan.service.in +@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs + [Service] + Type=oneshot + RemainAfterExit=yes +-ExecStart=@sbindir@/zpool import -aN -o cachefile=none ++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none + + [Install] + WantedBy=zfs-import.target diff --git a/debian/patches/zfs/0005-Enable-zed-emails.patch b/debian/patches/zfs/0005-Enable-zed-emails.patch new file mode 100644 index 0000000..e837d7e --- /dev/null +++ b/debian/patches/zfs/0005-Enable-zed-emails.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Richard Laager +Date: Wed, 30 Jan 2019 15:12:04 +0100 +Subject: [PATCH] Enable zed emails + +The OpenZFS event daemon monitors pools. This patch enables the email sending +function by default (if zed is installed). This is consistent with the default +behavior of mdadm. + +Signed-off-by: Thomas Lamprecht +--- + cmd/zed/zed.d/zed.rc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc +index df560f921..4ce7af744 100644 +--- a/cmd/zed/zed.d/zed.rc ++++ b/cmd/zed/zed.d/zed.rc +@@ -15,7 +15,7 @@ + # Email will only be sent if ZED_EMAIL_ADDR is defined. + # Disabled by default; uncomment to enable. + # +-#ZED_EMAIL_ADDR="root" ++ZED_EMAIL_ADDR="root" + + ## + # Name or path of executable responsible for sending notifications via email; +@@ -41,7 +41,7 @@ + ## + # Minimum number of seconds between notifications for a similar event. + # +-#ZED_NOTIFY_INTERVAL_SECS=3600 ++ZED_NOTIFY_INTERVAL_SECS=3600 + + ## + # Notification verbosity. diff --git a/debian/patches/zfs/0006-dont-symlink-zed-scripts.patch b/debian/patches/zfs/0006-dont-symlink-zed-scripts.patch new file mode 100644 index 0000000..078f6d6 --- /dev/null +++ b/debian/patches/zfs/0006-dont-symlink-zed-scripts.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Antonio Russo +Date: Fri, 20 Mar 2020 17:28:43 +0100 +Subject: [PATCH] dont symlink zed scripts + +(cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0]) + +[0] https://salsa.debian.org/zfsonlinux-team/zfs.git + +Signed-off-by: Stoiko Ivanov + +Description: track default symlinks, instead of symlinking +Forwarded: no need +--- + cmd/zed/zed.d/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am +index 8b2d0c200..118c96547 100644 +--- a/cmd/zed/zed.d/Makefile.am ++++ b/cmd/zed/zed.d/Makefile.am +@@ -48,6 +48,6 @@ install-data-hook: + for f in $(zedconfdefaults); do \ + test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \ + -L "$(DESTDIR)$(zedconfdir)/$${f}" || \ +- ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \ ++ echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \ + done + chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc" diff --git a/debian/patches/zfs/0007-Use-installed-python3.patch b/debian/patches/zfs/0007-Use-installed-python3.patch new file mode 100644 index 0000000..789ce2a --- /dev/null +++ b/debian/patches/zfs/0007-Use-installed-python3.patch @@ -0,0 +1,55 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Antonio Russo +Date: Tue, 5 May 2020 22:15:16 -0600 +Subject: [PATCH] Use installed python3 + +--- + .../functional/cli_root/zfs_program/zfs_program_json.ksh | 6 +++--- + .../tests/functional/rsend/send_encrypted_files.ksh | 2 +- + .../tests/functional/rsend/send_realloc_dnode_size.ksh | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh +index 3788543b0..c7ee4ae9a 100755 +--- a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh ++++ b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh +@@ -100,10 +100,10 @@ typeset -a pos_cmds_out=( + # the same as the input and the --sort-keys option was added. Detect when + # --sort-keys is supported and apply the option to ensure the expected order. + # +-if python -m json.tool --sort-keys <<< "{}"; then +- JSON_TOOL_CMD="python -m json.tool --sort-keys" ++if python3 -m json.tool --sort-keys <<< "{}"; then ++ JSON_TOOL_CMD="python3 -m json.tool --sort-keys" + else +- JSON_TOOL_CMD="python -m json.tool" ++ JSON_TOOL_CMD="python3 -m json.tool" + fi + + typeset -i cnt=0 +diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh +index f89cb3b31..375d483f7 100755 +--- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh ++++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh +@@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir + # ZoL issue #7432 + log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2 + log_must touch /$TESTPOOL/$TESTFS2/attrs +-log_must eval "python -c 'print \"a\" * 4096' | \ ++log_must eval "python3 -c 'print \"a\" * 4096' | \ + set_xattr_stdin bigval /$TESTPOOL/$TESTFS2/attrs" + log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2 + +diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh +index 394fe95bb..43560aac5 100755 +--- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh ++++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh +@@ -93,7 +93,7 @@ log_must zfs snapshot $POOL/fs@c + # 4. Create an empty file and add xattrs to it to exercise reclaiming a + # dnode that requires more than 1 slot for its bonus buffer (Zol #7433) + log_must zfs set compression=on xattr=sa $POOL/fs +-log_must eval "python -c 'print \"a\" * 512' | ++log_must eval "python3 -c 'print \"a\" * 512' | + set_xattr_stdin bigval /$POOL/fs/attrs" + log_must zfs snapshot $POOL/fs@d + diff --git a/debian/patches/zfs/0008-Add-systemd-unit-for-importing-specific-pools.patch b/debian/patches/zfs/0008-Add-systemd-unit-for-importing-specific-pools.patch new file mode 100644 index 0000000..98aaf02 --- /dev/null +++ b/debian/patches/zfs/0008-Add-systemd-unit-for-importing-specific-pools.patch @@ -0,0 +1,66 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Stoiko Ivanov +Date: Tue, 15 Sep 2020 19:07:24 +0200 +Subject: [PATCH] Add systemd-unit for importing specific pools + +The unit can be instantiated with a specific poolname, which will get imported +by scanning /dev/disk/by-id, irrespective of the existence and content of +/etc/zfs/zpool.cache. + +the instance name is used unescaped (see systemd.unit(5)), since zpool names +can contain characters which will be escaped by systemd. + +Signed-off-by: Stoiko Ivanov +--- + etc/systemd/system/50-zfs.preset.in | 1 + + etc/systemd/system/Makefile.am | 1 + + etc/systemd/system/zfs-import@.service.in | 16 ++++++++++++++++ + 3 files changed, 18 insertions(+) + create mode 100644 etc/systemd/system/zfs-import@.service.in + +diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in +index e4056a92c..030611419 100644 +--- a/etc/systemd/system/50-zfs.preset.in ++++ b/etc/systemd/system/50-zfs.preset.in +@@ -1,6 +1,7 @@ + # ZFS is enabled by default + enable zfs-import-cache.service + disable zfs-import-scan.service ++enable zfs-import@.service + enable zfs-import.target + enable zfs-mount.service + enable zfs-share.service +diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am +index c374a52ac..25d1b99d7 100644 +--- a/etc/systemd/system/Makefile.am ++++ b/etc/systemd/system/Makefile.am +@@ -7,6 +7,7 @@ systemdunit_DATA = \ + zfs-zed.service \ + zfs-import-cache.service \ + zfs-import-scan.service \ ++ zfs-import@.service \ + zfs-mount.service \ + zfs-share.service \ + zfs-volume-wait.service \ +diff --git a/etc/systemd/system/zfs-import@.service.in b/etc/systemd/system/zfs-import@.service.in +new file mode 100644 +index 000000000..9b4ee9371 +--- /dev/null ++++ b/etc/systemd/system/zfs-import@.service.in +@@ -0,0 +1,16 @@ ++[Unit] ++Description=Import ZFS pool %i ++Documentation=man:zpool(8) ++DefaultDependencies=no ++After=systemd-udev-settle.service ++After=cryptsetup.target ++After=multipathd.target ++Before=zfs-import.target ++ ++[Service] ++Type=oneshot ++RemainAfterExit=yes ++ExecStart=@sbindir@/zpool import -N -d /dev/disk/by-id -o cachefile=none %I ++ ++[Install] ++WantedBy=zfs-import.target diff --git a/debian/patches/zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch b/debian/patches/zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch new file mode 100644 index 0000000..917a181 --- /dev/null +++ b/debian/patches/zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch @@ -0,0 +1,54 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Stoiko Ivanov +Date: Thu, 4 Feb 2021 19:01:12 +0100 +Subject: [PATCH] Patch: move manpage arcstat(1) to arcstat(8). + +Originally-By: Mo Zhou +Originally-By: Antonio Russo + +Signed-off-by: Stoiko Ivanov +--- + man/man1/Makefile.am | 2 +- + man/man8/Makefile.am | 1 + + man/{man1/arcstat.1 => man8/arcstat.8} | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + rename man/{man1/arcstat.1 => man8/arcstat.8} (99%) + +diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am +index 8d7457a3e..101af7b6c 100644 +--- a/man/man1/Makefile.am ++++ b/man/man1/Makefile.am +@@ -1,4 +1,4 @@ +-dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1 ++dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 + EXTRA_DIST = cstyle.1 + + if BUILD_LINUX +diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am +index 07f6aefa6..a757b1c62 100644 +--- a/man/man8/Makefile.am ++++ b/man/man8/Makefile.am +@@ -1,6 +1,7 @@ + include $(top_srcdir)/config/Substfiles.am + + dist_man_MANS = \ ++ arcstat.8 \ + fsck.zfs.8 \ + mount.zfs.8 \ + vdev_id.8 \ +diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8 +similarity index 99% +rename from man/man1/arcstat.1 +rename to man/man8/arcstat.8 +index ca508b49c..0aa81849a 100644 +--- a/man/man1/arcstat.1 ++++ b/man/man8/arcstat.8 +@@ -13,7 +13,7 @@ + .\" Copyright (c) 2015 by Delphix. All rights reserved. + .\" Copyright (c) 2020 by AJ Jordan. All rights reserved. + .\" +-.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS ++.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS + .SH NAME + arcstat \- report ZFS ARC and L2ARC statistics + .SH SYNOPSIS diff --git a/debian/rules b/debian/rules index ddad5b0..2e9e8b2 100755 --- a/debian/rules +++ b/debian/rules @@ -41,13 +41,21 @@ override_dh_quilt_patch: QUILT_PATCHES=../debian/patches \ QUILT_SERIES=series.linux \ quilt --quiltrc /dev/null --color=always push -a || test $$? = 2 + cd zfs; \ + QUILT_PATCHES=../debian/patches \ + QUILT_SERIES=series.zfs \ + quilt --quiltrc /dev/null --color=always push -a || test $$? = 2 override_dh_quilt_unpatch: cd linux; \ QUILT_PATCHES=../debian/patches \ QUILT_SERIES=series.linux \ quilt --quiltrc /dev/null pop -a || test $$? = 2 - rm -rf linux/.pc + cd zfs; \ + QUILT_PATCHES=../debian/patches \ + QUILT_SERIES=series.zfs \ + quilt --quiltrc /dev/null pop -a || test $$? = 2 + rm -rf linux/.pc zfs/.pc override_dh_auto_build: .compile_mark .tools_compile_mark .modules_compile_mark @@ -85,7 +93,7 @@ ${KERNEL_SRC}/.config: ${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install # install zfs drivers install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs - install -m 644 $(addprefix ${MODULES}/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs + install -m 644 $(addprefix modules/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs # remove firmware rm -rf debian/${PVE_KERNEL_PKG}/lib/firmware # strip debug info @@ -192,16 +200,17 @@ ${KERNEL_SRC}/.config: .modules_compile_mark: ${MODULES}/zfs.ko touch $@ -${MODULES}/zfs.ko: .compile_mark - cd ${MODULES}/${ZFSDIR}; ./autogen.sh - cd ${MODULES}/${ZFSDIR}; ./configure --with-config=kernel --with-linux=${BUILD_DIR}/${KERNEL_SRC} --with-linux-obj=${BUILD_DIR}/${KERNEL_SRC} - ${MAKE} -C ${MODULES}/${ZFSDIR} - cp ${MODULES}/${ZFSDIR}/module/avl/zavl.ko ${MODULES}/ - cp ${MODULES}/${ZFSDIR}/module/nvpair/znvpair.ko ${MODULES}/ - cp ${MODULES}/${ZFSDIR}/module/unicode/zunicode.ko ${MODULES}/ - cp ${MODULES}/${ZFSDIR}/module/zcommon/zcommon.ko ${MODULES}/ - cp ${MODULES}/${ZFSDIR}/module/icp/icp.ko ${MODULES}/ - cp ${MODULES}/${ZFSDIR}/module/zfs/zfs.ko ${MODULES}/ - cp ${MODULES}/${ZFSDIR}/module/lua/zlua.ko ${MODULES}/ - cp ${MODULES}/${ZFSDIR}/module/spl/spl.ko ${MODULES}/ - cp ${MODULES}/${ZFSDIR}/module/zstd/zzstd.ko ${MODULES}/ +modules/zfs.ko: .compile_mark + dh_autoreconf -D zfs + dh_auto_configure -D zfs -- --with-config=kernel --with-linux=$(realpath linux) --with-linux-obj=$(realpath linux) + dh_auto_build -D zfs + mkdir -p modules + cp zfs/module/avl/zavl.ko modules/ + cp zfs/module/nvpair/znvpair.ko modules/ + cp zfs/module/unicode/zunicode.ko modules/ + cp zfs/module/zcommon/zcommon.ko modules/ + cp zfs/module/icp/icp.ko modules/ + cp zfs/module/zfs/zfs.ko modules/ + cp zfs/module/lua/zlua.ko modules/ + cp zfs/module/spl/spl.ko modules/ + cp zfs/module/zstd/zzstd.ko modules/ diff --git a/zfs b/zfs index 363c009..6150fbe 160000 --- a/zfs +++ b/zfs @@ -1 +1 @@ -Subproject commit 363c009381207615ba5880124e195c1263223add +Subproject commit 6150fbe67f7a9485eaabbca7df9a66852cda6892