c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase ZFS patches

Browse Source
This commit is contained in:
Fabian Grünbichler 2017-12-19 12:47:27 +01:00
parent e5fa0aa21d
commit b9d59150d1
3 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
zfs-patches/0001-remove-DKMS-modules-and-dracut-build.patch
View File

@ -1,4 +1,4 @@
From 0337ccd47d411a1db11e09dce1a6d183c2542f29 Mon Sep 17 00:00:00 2001 From bb4b48440d2048d3f9461753a976b7c102bad5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Mon, 6 Feb 2017 11:03:10 +0100 Date: Mon, 6 Feb 2017 11:03:10 +0100
Subject: [PATCH 1/3] remove DKMS, modules and dracut build Subject: [PATCH 1/3] remove DKMS, modules and dracut build
@ -15,24 +15,24 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
4 files changed, 8 insertions(+), 135 deletions(-) 4 files changed, 8 insertions(+), 135 deletions(-)
diff --git a/debian/control.in b/debian/control.in diff --git a/debian/control.in b/debian/control.in
index 18d2417cc..79bd9b302 100644 index 771fc3a80..edfed470f 100644
--- a/debian/control.in --- a/debian/control.in
+++ b/debian/control.in +++ b/debian/control.in
@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf, @@ -8,7 +8,6 @@ Uploaders: Aron Xu <aron@debian.org>,
dh-systemd | debhelper (>= 10.1), Build-Depends: dh-autoreconf,
autotools-dev, autotools-dev,
debhelper (>= 9), debhelper (>= 10.2),
- dkms (>> 2.1.1.2-5), - dkms (>> 2.1.1.2-5),
libselinux1-dev, libselinux1-dev,
libtool, libtool,
lsb-release, lsb-release,
@@ -85,25 +84,11 @@ Description: OpenZFS pool library for Linux @@ -84,25 +83,11 @@ Description: OpenZFS pool library for Linux
. .
This zpool library provides support for managing zpools. This zpool library provides support for managing zpools.
-Package: zfs-dkms -Package: zfs-dkms
-Architecture: all -Architecture: all
-Pre-Depends: spl-dkms (>= ${source:Upstream-Version}) -Pre-Depends: spl-dkms (>= ${source:Upstream-Version}), spl-dkms (<<${source:Upstream-Version}.)
-Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends} -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
-Recommends: zfsutils-linux, zfs-zed -Recommends: zfsutils-linux, zfs-zed
-Provides: zfs-modules -Provides: zfs-modules
@ -53,7 +53,7 @@ index 18d2417cc..79bd9b302 100644
${misc:Depends} ${misc:Depends}
Description: OpenZFS root filesystem capabilities for Linux - initramfs Description: OpenZFS root filesystem capabilities for Linux - initramfs
The Z file system is a pooled filesystem designed for maximum data The Z file system is a pooled filesystem designed for maximum data
@@ -113,23 +98,12 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs @@ -112,23 +97,12 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
This package adds OpenZFS to the system initramfs with a hook This package adds OpenZFS to the system initramfs with a hook
for the initramfs-tools infrastructure. for the initramfs-tools infrastructure.
@ -79,7 +79,7 @@ index 18d2417cc..79bd9b302 100644
Conflicts: zfs, zfs-fuse, zutils Conflicts: zfs, zfs-fuse, zutils
Provides: zfsutils Provides: zfsutils
Description: command-line tools to manage OpenZFS filesystems Description: command-line tools to manage OpenZFS filesystems
@@ -143,7 +117,7 @@ Description: command-line tools to manage OpenZFS filesystems @@ -142,7 +116,7 @@ Description: command-line tools to manage OpenZFS filesystems
Package: zfs-zed Package: zfs-zed
Section: contrib/admin Section: contrib/admin
Architecture: linux-any Architecture: linux-any
@ -88,23 +88,23 @@ index 18d2417cc..79bd9b302 100644
Description: OpenZFS Event Daemon Description: OpenZFS Event Daemon
The Z file system is a pooled filesystem designed for maximum data The Z file system is a pooled filesystem designed for maximum data
integrity, supporting data snapshots, multiple copies, and data integrity, supporting data snapshots, multiple copies, and data
@@ -154,7 +128,7 @@ Description: OpenZFS Event Daemon @@ -153,7 +127,7 @@ Description: OpenZFS Event Daemon
Package: zfs-test Package: zfs-test
Section: contrib/admin Section: contrib/admin
Architecture: linux-any Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python -Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python
+Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python +Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python
Breaks: zfsutils-linux (<= 0.6.5.11-1)
Replaces: zfsutils-linux (<= 0.6.5.11-1)
Description: OpenZFS test infrastructure an support scripts Description: OpenZFS test infrastructure an support scripts
The Z file system is a pooled filesystem designed for maximum data
integrity, supporting data snapshots, multiple copies, and data
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index 18d2417cc..b426b93c0 100644 index 771fc3a80..be0b90337 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf, @@ -8,7 +8,6 @@ Uploaders: Aron Xu <aron@debian.org>,
dh-systemd | debhelper (>= 10.1), Build-Depends: dh-autoreconf,
autotools-dev, autotools-dev,
debhelper (>= 9), debhelper (>= 10.2),
- dkms (>> 2.1.1.2-5), - dkms (>> 2.1.1.2-5),
libselinux1-dev, libselinux1-dev,
libtool, libtool,
@ -119,12 +119,12 @@ index f54fe7310..16b1cef6c 100644
etc/zfs/vdev_id.conf.sas_switch.example etc/zfs/vdev_id.conf.sas_switch.example
+usr/lib/dracut +usr/lib/dracut
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index 800df22e0..8c5beca10 100755 index f445b58c5..d71926b33 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META) @@ -5,9 +5,6 @@ include /usr/share/dpkg/default.mk
VERSION := $(shell dpkg-parsechangelog \ LSB_DISTRIBUTOR := $(shell lsb_release -is)
| awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1) NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
-DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \ -DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
- DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown - DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
@ -132,16 +132,16 @@ index 800df22e0..8c5beca10 100755
ifndef BUILD_UDEB ifndef BUILD_UDEB
BUILD_UDEB=false BUILD_UDEB=false
endif endif
@@ -21,21 +18,16 @@ KVERS=$(shell uname -r) @@ -17,21 +14,16 @@ KVERS=$(shell uname -r)
endif endif
ifndef SPL ifndef SPL
-SPL=/usr/src/spl-$(VERSION) -SPL=/usr/src/spl-$(DEB_VERSION_UPSTREAM)
-endif -endif
- -
-ifndef SPLOBJ -ifndef SPLOBJ
-SPLOBJ=/var/lib/dkms/spl/$(VERSION)/$(KVERS)/$(shell dpkg-architecture -qDEB_TARGET_GNU_CPU) -SPLOBJ=/var/lib/dkms/spl/$(DEB_VERSION_UPSTREAM)/$(KVERS)/$(DEB_TARGET_GNU_CPU)
+SPL=../pkg-spl +SPL=../spl-build
endif endif
non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://') non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
@ -156,54 +156,54 @@ index 800df22e0..8c5beca10 100755
override_dh_auto_configure: override_dh_auto_configure:
@cp debian/control.in debian/control @cp debian/control.in debian/control
@@ -77,36 +69,6 @@ override_dh_auto_install: @@ -73,36 +65,6 @@ override_dh_auto_install:
$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/' $(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed' mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
- @# Get a bare copy of the source code for DKMS. - @# Get a bare copy of the source code for DKMS.
- @# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree, which does not - @# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ tree, which does not
- @# contain the userland sources. NB: Remove-userland-dist-rules.patch - @# contain the userland sources. NB: Remove-userland-dist-rules.patch
- $(MAKE) distdir - $(MAKE) distdir
- -
- @# Install the DKMS source. - @# Install the DKMS source.
- @# We only want the files needed to build the modules - @# We only want the files needed to build the modules
- mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' - mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'
- $(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;) - $(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)' || exit 1;)
- @# Hellish awk line: - @# Hellish awk line:
- @# * Deletes from configure.ac the parts not needed for building the kernel module - @# * Deletes from configure.ac the parts not needed for building the kernel module
- @# * It deletes from inside AC_CONFIG_FILES([]) everything except: - @# * It deletes from inside AC_CONFIG_FILES([]) everything except:
- @# (Makefile$|include/|module/|*.release$) - @# (Makefile$|include/|module/|*.release$)
- @# * Takes care of spaces and tabs - @# * Takes care of spaces and tabs
- awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \ - awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \
- '$(CURDIR)/$(NAME)-$(VERSION)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/configure.ac' - '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac'
- @# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs. - @# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
- sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \ - sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
- '$(CURDIR)/$(NAME)-$(VERSION)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am' - '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
- @# Sanity test - @# Sanity test
- grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am' - grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
- @# Run autogen on the stripped source tree - @# Run autogen on the stripped source tree
- cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh - cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'; ./autogen.sh
- rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/autom4te.cache' - rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/autom4te.cache'
- -
- @# This shunt allows DKMS to install the Module.symvers and zfs_config.h - @# This shunt allows DKMS to install the Module.symvers and zfs_config.h
- @# files to the ${dkms_tree} area through the POST_INSTALL directive. - @# files to the ${dkms_tree} area through the POST_INSTALL directive.
- printf '#!/bin/sh\ncp "$$@"\n' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp' - printf '#!/bin/sh\ncp "$$@"\n' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/cp'
- chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp' - chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/cp'
- -
mkdir -p $(CURDIR)/debian/tmp/usr/lib mkdir -p $(CURDIR)/debian/tmp/usr/lib
for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \ for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \ ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
@@ -116,9 +78,6 @@ override_dh_auto_install: @@ -112,9 +74,6 @@ override_dh_auto_install:
chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
-override_dh_dkms: -override_dh_dkms:
- dh_dkms -V $(VERSION) - dh_dkms -V $(DEB_VERSION_UPSTREAM)
- -
override_dh_makeshlibs: override_dh_makeshlibs:
dh_makeshlibs -a dh_makeshlibs -a -V
ifeq ($(BUILD_UDEB), true) ifeq ($(BUILD_UDEB), true)
@@ -156,65 +115,5 @@ override_dh_install: @@ -152,65 +111,5 @@ override_dh_install:
# ------------ # ------------

8
zfs-patches/0002-import-with-d-dev-disk-by-id-in-scan-service.patch
View File

@ -1,4 +1,4 @@
From 72fbbc64fe6f9e527e7ebce42d8e57c1fa82dd34 Mon Sep 17 00:00:00 2001 From f76e53288b20d1d078bcae5e8a80be50044bfd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Mon, 24 Oct 2016 13:47:06 +0200 Date: Mon, 24 Oct 2016 13:47:06 +0200
Subject: [PATCH 2/3] import with -d /dev/disk/by-id in scan service Subject: [PATCH 2/3] import with -d /dev/disk/by-id in scan service
@ -12,10 +12,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-) 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 diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
index 625f3a955..9a33d5f4a 100644 index 227f5b74f..cc428b0d0 100644
--- a/etc/systemd/system/zfs-import-scan.service.in --- a/etc/systemd/system/zfs-import-scan.service.in
+++ b/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -11,7 +11,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache @@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStartPre=/sbin/modprobe zfs ExecStartPre=/sbin/modprobe zfs
@ -23,7 +23,7 @@ index 625f3a955..9a33d5f4a 100644
+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none +ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
[Install] [Install]
WantedBy=zfs-mount.service WantedBy=zfs-import.target
-- --
2.14.2 2.14.2

3
zfs-patches/0003-Use-user-namespaces-for-FSETID-policy-check.patch
View File

@ -1,4 +1,4 @@
From f9171eb92ffd260debce2b28111dc7018d258588 Mon Sep 17 00:00:00 2001 From e03f6d99c515ab83c3c6984cab00d6f0392e501f Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com> From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Tue, 31 Oct 2017 09:08:42 +0100 Date: Tue, 31 Oct 2017 09:08:42 +0100
Subject: [PATCH 3/3] Use user namespaces for FSETID policy check. Subject: [PATCH 3/3] Use user namespaces for FSETID policy check.
@ -11,6 +11,7 @@ the setgid flag has a valid mapping in the current
namespace. namespace.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
--- ---
module/zfs/policy.c | 16 +++++++++++++--- module/zfs/policy.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-) 1 file changed, 13 insertions(+), 3 deletions(-)