-From 0337ccd47d411a1db11e09dce1a6d183c2542f29 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Mon, 6 Feb 2017 11:03:10 +0100
-Subject: [PATCH 1/3] remove DKMS, modules and dracut build
+Subject: [PATCH] remove DKMS, modules and dracut build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- debian/control.in | 36 +++---------------
+ debian/control.in | 41 ++------------------
debian/control | 1 -
- debian/not-installed | 1 +
+ debian/not-installed | 2 +
debian/rules | 105 +--------------------------------------------------
- 4 files changed, 8 insertions(+), 135 deletions(-)
+ 4 files changed, 7 insertions(+), 142 deletions(-)
diff --git a/debian/control.in b/debian/control.in
-index 18d2417cc..79bd9b302 100644
+index aef8cac2e..3cc15a05b 100644
--- a/debian/control.in
+++ b/debian/control.in
-@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf,
- dh-systemd | debhelper (>= 10.1),
- autotools-dev,
- debhelper (>= 9),
+@@ -9,7 +9,6 @@ Build-Depends: autotools-dev,
+ debhelper (>= 10.2),
+ dh-autoreconf,
+ dh-python,
- dkms (>> 2.1.1.2-5),
+ libattr1-dev,
+ libblkid-dev,
libselinux1-dev,
- libtool,
- lsb-release,
-@@ -85,25 +84,11 @@ Description: OpenZFS pool library for Linux
+@@ -86,27 +85,10 @@ Description: OpenZFS pool library for Linux
.
This zpool library provides support for managing zpools.
-Package: zfs-dkms
-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}
--Recommends: zfsutils-linux, zfs-zed
+-Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}),
+- @LINUX_COMPAT@
-Provides: zfs-modules
-Description: OpenZFS filesystem kernel modules for Linux
- The Z file system is a pooled filesystem designed for maximum data
-
Package: zfs-initramfs
Architecture: all
- Depends: initramfs-tools,
- busybox-initramfs | busybox-static | busybox,
-- zfs-modules | zfs-dkms, zfsutils-linux,
-+ zfsutils-linux,
- ${misc:Depends}
+ Depends: busybox-initramfs | busybox-static | busybox,
+ initramfs-tools,
+- zfs-modules | zfs-dkms,
+ zfsutils-linux (>= ${binary:Version}),
+ ${misc:Depends}
Description: OpenZFS root filesystem capabilities for Linux - initramfs
- The Z file system is a pooled filesystem designed for maximum data
-@@ -113,23 +98,12 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
+@@ -117,29 +99,14 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
This package adds OpenZFS to the system initramfs with a hook
for the initramfs-tools infrastructure.
-Package: zfs-dracut
-Architecture: all
--Depends: dracut, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
+-Depends: dracut,
+- zfs-modules | zfs-dkms,
+- zfsutils-linux (>= ${binary:Version}),
+- ${misc:Depends}
-Description: OpenZFS root filesystem capabilities for Linux - dracut
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
Package: zfsutils-linux
Section: contrib/admin
Architecture: linux-any
- Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
+ Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
-Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
--Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
+-Breaks: zfs-dkms (<< ${binary:Version}), zfs-dkms (>> ${binary:Version})
+Recommends: lsb-base, zfs-zed
-+Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
+ Suggests: nfs-kernel-server,
+ samba-common-bin (>= 3.0.23),
+- zfs-initramfs | zfs-dracut
++ zfs-initramfs
Conflicts: zfs, zfs-fuse, zutils
Provides: zfsutils
Description: command-line tools to manage OpenZFS filesystems
-@@ -143,7 +117,7 @@ Description: command-line tools to manage OpenZFS filesystems
+@@ -153,8 +120,7 @@ Description: command-line tools to manage OpenZFS filesystems
Package: zfs-zed
Section: contrib/admin
Architecture: linux-any
--Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux
-+Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux
+-Depends: zfs-modules | zfs-dkms,
+- zfsutils-linux (>= ${binary:Version}),
++Depends: zfsutils-linux (>= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: OpenZFS Event Daemon
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
-@@ -154,7 +128,7 @@ Description: OpenZFS Event Daemon
- Package: zfs-test
- Section: contrib/admin
- 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}, zfsutils-linux, parted, lsscsi, mdadm, bc, ksh, fio, acl, sudo, sysstat, python
- 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
+@@ -177,7 +143,6 @@ Depends: acl,
+ python,
+ sudo,
+ sysstat,
+- zfs-modules | zfs-dkms,
+ zfsutils-linux (>=${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
diff --git a/debian/control b/debian/control
-index 18d2417cc..b426b93c0 100644
+index 3cf6fb649..51cfe6a64 100644
--- a/debian/control
+++ b/debian/control
-@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf,
- dh-systemd | debhelper (>= 10.1),
- autotools-dev,
- debhelper (>= 9),
+@@ -9,7 +9,6 @@ Build-Depends: autotools-dev,
+ debhelper (>= 10.2),
+ dh-autoreconf,
+ dh-python,
- dkms (>> 2.1.1.2-5),
+ libattr1-dev,
+ libblkid-dev,
libselinux1-dev,
- libtool,
- lsb-release,
diff --git a/debian/not-installed b/debian/not-installed
-index f54fe7310..16b1cef6c 100644
+index f54fe7310..c3929d90e 100644
--- a/debian/not-installed
+++ b/debian/not-installed
-@@ -5,3 +5,4 @@ etc/zfs/vdev_id.conf.alias.example
+@@ -5,3 +5,5 @@ etc/zfs/vdev_id.conf.alias.example
etc/zfs/vdev_id.conf.multipath.example
etc/zfs/vdev_id.conf.sas_direct.example
etc/zfs/vdev_id.conf.sas_switch.example
+usr/lib/dracut
++usr/share/zfs/enum-extract.pl
diff --git a/debian/rules b/debian/rules
-index 800df22e0..8c5beca10 100755
+index cc47a74a1..a5c37c81d 100755
--- a/debian/rules
+++ b/debian/rules
-@@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
- VERSION := $(shell dpkg-parsechangelog \
- | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1)
+@@ -5,9 +5,6 @@ include /usr/share/dpkg/default.mk
+ LSB_DISTRIBUTOR := $(shell lsb_release -is)
+ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
-DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
- DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
ifndef BUILD_UDEB
BUILD_UDEB=false
endif
-@@ -21,21 +18,16 @@ KVERS=$(shell uname -r)
+@@ -17,21 +14,16 @@ KVERS=$(shell uname -r)
endif
ifndef SPL
--SPL=/usr/src/spl-$(VERSION)
+-SPL=/usr/src/spl-$(DEB_VERSION_UPSTREAM)
-endif
-
-ifndef SPLOBJ
--SPLOBJ=/var/lib/dkms/spl/$(VERSION)/$(KVERS)/$(shell dpkg-architecture -qDEB_TARGET_GNU_CPU)
-+SPL=../pkg-spl
+-SPLOBJ=/var/lib/dkms/spl/$(DEB_VERSION_UPSTREAM)/$(KVERS)/$(DEB_TARGET_GNU_CPU)
++SPL=../spl-build
endif
non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
+ dh $@ --with autoreconf,python3,systemd --parallel
override_dh_auto_configure:
- @cp debian/control.in debian/control
-@@ -77,36 +69,6 @@ override_dh_auto_install:
+ sed "s/@LINUX_COMPAT@/linux-libc-dev \(< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
+@@ -73,36 +65,6 @@ override_dh_auto_install:
$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
- @# 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
- $(MAKE) distdir
-
- @# Install the DKMS source.
- @# We only want the files needed to build the modules
-- mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'
-- $(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
+- mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'
+- $(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)' || exit 1;)
- @# Hellish awk line:
- @# * Deletes from configure.ac the parts not needed for building the kernel module
- @# * It deletes from inside AC_CONFIG_FILES([]) everything except:
- @# (Makefile$|include/|module/|*.release$)
- @# * 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}' \
-- '$(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.
- 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
-- 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
-- cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh
-- rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/autom4te.cache'
+- cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'; ./autogen.sh
+- 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
- @# files to the ${dkms_tree} area through the POST_INSTALL directive.
-- printf '#!/bin/sh\ncp "$$@"\n' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
-- chmod 755 '$(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)-$(DEB_VERSION_UPSTREAM)/cp'
-
mkdir -p $(CURDIR)/debian/tmp/usr/lib
for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
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/default/zfs
-override_dh_dkms:
-- dh_dkms -V $(VERSION)
+- dh_dkms -V $(DEB_VERSION_UPSTREAM)
-
override_dh_makeshlibs:
- dh_makeshlibs -a
+ dh_makeshlibs -a -V
ifeq ($(BUILD_UDEB), true)
-@@ -156,65 +115,5 @@ override_dh_install:
+@@ -152,65 +111,5 @@ override_dh_install:
# ------------
projects / zfsonlinux.git / blobdiff