From bb4b48440d2048d3f9461753a976b7c102bad5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 6 Feb 2017 11:03:10 +0100 Subject: [PATCH 1/4] 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 --- debian/control.in | 36 +++--------------- debian/control | 1 - debian/not-installed | 1 + debian/rules | 105 +-------------------------------------------------- 4 files changed, 8 insertions(+), 135 deletions(-) diff --git a/debian/control.in b/debian/control.in index 771fc3a80..edfed470f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -8,7 +8,6 @@ Uploaders: Aron Xu , Build-Depends: dh-autoreconf, autotools-dev, debhelper (>= 10.2), - dkms (>> 2.1.1.2-5), libselinux1-dev, libtool, lsb-release, @@ -84,25 +83,11 @@ 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: zfsutils-linux, zfs-zed -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: initramfs-tools, busybox-initramfs | busybox-static | busybox, - zfs-modules | zfs-dkms, zfsutils-linux, + zfsutils-linux, ${misc:Depends} Description: OpenZFS root filesystem capabilities for Linux - initramfs The Z file system is a pooled filesystem designed for maximum data @@ -112,23 +97,12 @@ 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} -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: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3 -Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed -Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut +Recommends: lsb-base, zfs-zed +Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs Conflicts: zfs, zfs-fuse, zutils Provides: zfsutils Description: command-line tools to manage OpenZFS filesystems @@ -142,7 +116,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 Description: OpenZFS Event Daemon The Z file system is a pooled filesystem designed for maximum data integrity, supporting data snapshots, multiple copies, and data @@ -153,7 +127,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 Breaks: zfsutils-linux (<= 0.6.5.11-1) Replaces: zfsutils-linux (<= 0.6.5.11-1) Description: OpenZFS test infrastructure an support scripts diff --git a/debian/control b/debian/control index 771fc3a80..be0b90337 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Uploaders: Aron Xu , Build-Depends: dh-autoreconf, autotools-dev, debhelper (>= 10.2), - dkms (>> 2.1.1.2-5), libselinux1-dev, libtool, lsb-release, diff --git a/debian/not-installed b/debian/not-installed index f54fe7310..16b1cef6c 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -5,3 +5,4 @@ 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 diff --git a/debian/rules b/debian/rules index f445b58c5..d71926b33 100755 --- a/debian/rules +++ b/debian/rules @@ -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 @@ -17,21 +14,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_auto_configure: @cp 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)-$(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)-$(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)-$(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)-$(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' - - @# 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)-$(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}`; \ @@ -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 $(DEB_VERSION_UPSTREAM) - override_dh_makeshlibs: dh_makeshlibs -a -V ifeq ($(BUILD_UDEB), true) @@ -152,65 +111,5 @@ override_dh_install: # ------------ -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 -- 2.14.2