290 lines
11 KiB
Diff
290 lines
11 KiB
Diff
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] 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>
|
|
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
|
---
|
|
debian/control | 1 -
|
|
debian/control.in | 40 ++-----------------
|
|
debian/not-installed | 2 +
|
|
debian/rules | 108 +--------------------------------------------------
|
|
4 files changed, 7 insertions(+), 144 deletions(-)
|
|
|
|
diff --git a/debian/control b/debian/control
|
|
index 4d22ff50..f33008df 100644
|
|
--- a/debian/control
|
|
+++ b/debian/control
|
|
@@ -10,7 +10,6 @@ Build-Depends: autotools-dev,
|
|
debhelper (>= 10.2),
|
|
dh-autoreconf,
|
|
dh-python,
|
|
- dkms (>> 2.1.1.2-5),
|
|
libattr1-dev,
|
|
libblkid-dev,
|
|
libselinux1-dev,
|
|
diff --git a/debian/control.in b/debian/control.in
|
|
index 96154c5c..0a9ceef6 100644
|
|
--- a/debian/control.in
|
|
+++ b/debian/control.in
|
|
@@ -10,7 +10,6 @@ Build-Depends: autotools-dev,
|
|
debhelper (>= 10.2),
|
|
dh-autoreconf,
|
|
dh-python,
|
|
- dkms (>> 2.1.1.2-5),
|
|
libattr1-dev,
|
|
libblkid-dev,
|
|
libselinux1-dev,
|
|
@@ -95,26 +94,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}.),
|
|
- spl-dkms (>= ${source:Upstream-Version})
|
|
-Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
|
|
-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
|
|
- integrity, supporting data snapshots, multiple copies, and data
|
|
- checksums.
|
|
- .
|
|
- This DKMS package includes the SPA, DMU, ZVOL, and ZPL components of
|
|
- OpenZFS.
|
|
-
|
|
Package: zfs-initramfs
|
|
Architecture: all
|
|
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
|
|
@@ -125,29 +108,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 (>= ${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
|
|
- checksums.
|
|
- .
|
|
- This package adds OpenZFS to the system initramfs with a hook
|
|
- for the dracut infrastructure.
|
|
-
|
|
Package: zfsutils-linux
|
|
Section: contrib/admin
|
|
Architecture: linux-any
|
|
Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
|
|
-Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
|
|
-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 | zfs-dracut
|
|
+ zfs-initramfs
|
|
Conflicts: zfs, zfs-fuse
|
|
Provides: zfsutils
|
|
Description: command-line tools to manage OpenZFS filesystems
|
|
@@ -161,8 +129,7 @@ Description: command-line tools to manage OpenZFS filesystems
|
|
Package: zfs-zed
|
|
Section: contrib/admin
|
|
Architecture: linux-any
|
|
-Depends: zfs-modules | zfs-dkms,
|
|
- zfsutils-linux (>= ${binary:Version}),
|
|
+Depends: zfsutils-linux (>= ${binary:Version}),
|
|
${misc:Depends},
|
|
${shlibs:Depends}
|
|
Description: OpenZFS Event Daemon
|
|
@@ -185,7 +152,6 @@ Depends: acl,
|
|
python,
|
|
sudo,
|
|
sysstat,
|
|
- zfs-modules | zfs-dkms,
|
|
zfsutils-linux (>=${binary:Version}),
|
|
${misc:Depends},
|
|
${shlibs:Depends}
|
|
diff --git a/debian/not-installed b/debian/not-installed
|
|
index a008985c..c60b0016 100644
|
|
--- a/debian/not-installed
|
|
+++ b/debian/not-installed
|
|
@@ -6,3 +6,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 21b8ccef..3ba4b99a 100755
|
|
--- a/debian/rules
|
|
+++ b/debian/rules
|
|
@@ -6,9 +6,6 @@ LSB_DISTRIBUTOR := $(shell lsb_release -is)
|
|
NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
|
|
LINUX_NEXT := $(shell awk -F. '{print $$1 "." $$2+1}' debian/linux_compat)
|
|
|
|
-DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
|
|
- DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
|
|
-
|
|
ifndef BUILD_UDEB
|
|
BUILD_UDEB=false
|
|
endif
|
|
@@ -18,21 +15,16 @@ KVERS=$(shell uname -r)
|
|
endif
|
|
|
|
ifndef SPL
|
|
-SPL=/usr/src/spl-$(DEB_VERSION_UPSTREAM)
|
|
-endif
|
|
-
|
|
-ifndef SPLOBJ
|
|
-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+://')
|
|
PACKAGE=zfs
|
|
-pmodules = $(PACKAGE)-modules-$(non_epoch_version)
|
|
|
|
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
|
|
|
%:
|
|
- dh $@ --with autoreconf,dkms,python3,systemd --parallel
|
|
+ dh $@ --with autoreconf,python3,systemd --parallel
|
|
|
|
override_dh_autoreconf:
|
|
@# Embed the downstream version in the module.
|
|
@@ -57,14 +49,6 @@ endif
|
|
--with-systemdpresetdir=/lib/systemd/system-preset \
|
|
--with-config=user
|
|
|
|
-override_dh_auto_build:
|
|
- @# Get a bare copy of the source code for DKMS.
|
|
- @# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ tree, which does not
|
|
- @# contain the userland sources. NB: Remove-userland-dist-rules.patch
|
|
- $(MAKE) distdir
|
|
-
|
|
- dh_auto_build
|
|
-
|
|
override_dh_auto_test:
|
|
# The dh_auto_test rule is disabled because
|
|
# `make check` cannot run in an unprivileged build environment.
|
|
@@ -88,29 +72,6 @@ override_dh_auto_install:
|
|
@# Zed has dependencies outside of the system root.
|
|
mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
|
|
|
|
- @# Install the DKMS source.
|
|
- @# We only want the files needed to build the modules
|
|
- install -D -t '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts' \
|
|
- '$(CURDIR)/scripts/enum-extract.pl' \
|
|
- '$(CURDIR)/scripts/dkms.postbuild'
|
|
- $(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
|
|
- @# * Remove reference to ZFS_AC_PACKAGE
|
|
- awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \
|
|
- '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' | sed '/ZFS_AC_PACKAGE/d' > '$(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)-$(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)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
|
|
- @# Run autogen on the stripped source tree
|
|
- 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'
|
|
-
|
|
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}`; \
|
|
@@ -121,11 +82,6 @@ override_dh_auto_install:
|
|
chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
|
|
chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
|
|
|
|
-override_dh_dkms:
|
|
- '$(CURDIR)/scripts/dkms.mkconf' -n $(NAME) -v $(DEB_VERSION_UPSTREAM) -f '$(CURDIR)/scripts/zfs-dkms.dkms'
|
|
- dh_dkms
|
|
- rm -f '$(CURDIR)/scripts/zfs-dkms.dkms'
|
|
-
|
|
override_dh_makeshlibs:
|
|
dh_makeshlibs -a -V
|
|
ifeq ($(BUILD_UDEB), true)
|
|
@@ -171,65 +127,5 @@ override_dh_installinit:
|
|
|
|
# ------------
|
|
|
|
-override_dh_prep-deb-files:
|
|
- for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
|
|
- sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/' \
|
|
- < $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
|
|
- done
|
|
- sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g' \
|
|
- < debian/control.modules.in > debian/control
|
|
-
|
|
-override_dh_configure_modules_udeb: override_dh_configure_modules_udeb_stamp
|
|
-override_dh_configure_modules_udeb_stamp:
|
|
- ./configure \
|
|
- --without-selinux \
|
|
- --with-config=kernel \
|
|
- --with-linux=$(KSRC) \
|
|
- --with-linux-obj=$(KOBJ) \
|
|
- --with-spl=$(SPL) \
|
|
- --with-spl-obj=$(SPLOBJ)
|
|
- touch override_dh_configure_modules_udeb_stamp
|
|
-
|
|
-override_dh_configure_modules: override_dh_configure_modules_stamp
|
|
-override_dh_configure_modules_stamp:
|
|
- ./configure \
|
|
- --with-config=kernel \
|
|
- --with-linux=$(KSRC) \
|
|
- --with-linux-obj=$(KOBJ) \
|
|
- --with-spl=$(SPL) \
|
|
- --with-spl-obj=$(SPLOBJ)
|
|
- touch override_dh_configure_modules_stamp
|
|
-
|
|
-override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules_udeb
|
|
- dh_testdir
|
|
- dh_testroot
|
|
- dh_prep
|
|
-
|
|
- $(MAKE) -C $(CURDIR)/module modules
|
|
-
|
|
- dh_installdirs -p${pmodules}-di
|
|
- dh_install -p${pmodules}-di
|
|
- dh_gencontrol -p${pmodules}-di
|
|
-
|
|
- dh_builddeb -p${pmodules}-di
|
|
-
|
|
-override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_modules
|
|
- dh_testdir
|
|
- dh_testroot
|
|
- dh_prep
|
|
-
|
|
- $(MAKE) -C $(CURDIR)/module modules
|
|
-
|
|
- dh_install -p${pmodules}
|
|
- dh_installdocs -p${pmodules}
|
|
- dh_installchangelogs -p${pmodules}
|
|
- dh_compress -p${pmodules}
|
|
- dh_strip -p${pmodules}
|
|
- dh_fixperms -p${pmodules}
|
|
- dh_installdeb -p${pmodules}
|
|
- dh_gencontrol -p${pmodules}
|
|
- dh_md5sums -p${pmodules}
|
|
- dh_builddeb -p${pmodules}
|
|
-
|
|
debian-copyright:
|
|
cme update dpkg-copyright -file debian/copyright.cme
|