X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=debian%2Frules;h=003b9950d0d03771f1a731580f8ce5313380aeb5;hb=0aa4ec8eaa8969ee282c1c62238de22edc8e6e34;hp=0a18bba035a4aa4da48b347580c430971a53a227;hpb=a0d08c54553894a18cdec4b31067d32571b81432;p=mirror_zfs-debian.git diff --git a/debian/rules b/debian/rules index 0a18bba0..003b9950 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,6 @@ VERSION := $(shell dpkg-parsechangelog \ DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \ DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown -export SHLIB_MAJOR = 1 - ifndef BUILD_UDEB BUILD_UDEB=false endif @@ -22,12 +20,18 @@ ifndef KVERS KVERS=$(shell uname -r) endif +ifndef SPL +SPL=/usr/src/spl-$(VERSION) +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 dkms --parallel + dh $@ --with autoreconf,dkms --parallel override_dh_auto_configure: @cp debian/control.in debian/control @@ -38,16 +42,12 @@ endif @# Embed the downstream version in the module. @sed -e 's/^Version:.*/Version: $(VERSION)/' -i.orig META - @# Create the makefiles and configure script. - ./autogen.sh - @# Build the userland, but don't build the kernel modules. - ./configure \ - --prefix='' \ - --libexecdir=/usr/libexec \ + dh_auto_configure -- \ + --bindir=/bin \ + --sbindir=/sbin \ --libdir=/lib \ - --includedir=/usr/include \ - --datarootdir=/usr/share \ + --with-udevdir=/lib/udev \ --with-config=user override_dh_auto_test: @@ -85,8 +85,7 @@ override_dh_auto_install: @# This shunt allows DKMS to install the Module.symvers and zfs_config.h @# files to the ${dkms_tree} area through the POST_INSTALL directive. - echo '#!/bin/sh' >'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp' - echo 'cp "$$@"' >>'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp' + printf '#!/bin/sh\ncp "$$@"\n' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp' chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp' mkdir -p $(CURDIR)/debian/tmp/usr/lib @@ -95,63 +94,32 @@ override_dh_auto_install: rm $${i}; \ done -override_dh_installinit: - @# Install the /etc/default/zfs options file. - dh_installinit --name=zfs - - @# Install the /etc/init.d/zfs-mount script. -ifeq ($(LSB_DISTRIBUTOR),Debian) - @# Debian runs local mounts at sysv sequences [10..12] [08..09]. - dh_installinit --name=zfs-mount \ - --no-restart-on-upgrade --no-start -- defaults 13 07 -else - dh_installinit --name=zfs-mount \ - --no-restart-on-upgrade --no-start -endif - - @# Install the /etc/init.d/zfs-share script. -ifeq ($(LSB_DISTRIBUTOR),Debian) - @# Debian runs nfs-kernel-server at sysv sequence 17 01. - dh_installinit --name=zfs-share \ - --no-restart-on-upgrade --no-start -- defaults 18 00 -else ifeq ($(LSB_DISTRIBUTOR),Ubuntu) - @# Ubuntu runs nfs-kernel-server at sysv sequence 20 80. - dh_installinit --name=zfs-share \ - --no-restart-on-upgrade --no-start -- defaults 21 79 -else - dh_installinit --name=zfs-share \ - --no-restart-on-upgrade --no-start -endif - override_dh_dkms: dh_dkms -V $(VERSION) override_dh_makeshlibs: dh_makeshlibs -a ifeq ($(BUILD_UDEB), true) - dh_makeshlibs -plibnvpair$(SHLIB_MAJOR) --add-udeb=libnvpair$(SHLIB_MAJOR)-udeb - dh_makeshlibs -plibuutil$(SHLIB_MAJOR) --add-udeb=libuutil$(SHLIB_MAJOR)-udeb - dh_makeshlibs -plibzfs$(SHLIB_MAJOR) --add-udeb=libzfs$(SHLIB_MAJOR)-udeb - dh_makeshlibs -plibzpool$(SHLIB_MAJOR) --add-udeb=libzpool$(SHLIB_MAJOR)-udeb - dh_makeshlibs -pzfsutils --add-udeb=zfsutils-udeb - endif + dh_makeshlibs -plibnvpair1linux --add-udeb=libnvpair1-udeb + dh_makeshlibs -plibuutil1linux --add-udeb=libuutil1-udeb + dh_makeshlibs -plibzfs2linux --add-udeb=libzfs2-udeb + dh_makeshlibs -plibzpool2linux --add-udeb=libzpool2-udeb + dh_makeshlibs -pzfsutils-linux --add-udeb=zfsutils-udeb +endif override_dh_strip: - dh_strip -plibnvpair1 --dbg-package=libnvpair1-dbg - dh_strip -plibuutil1 --dbg-package=libuutil1-dbg - dh_strip -plibzfs1 --dbg-package=libzfs1-dbg - dh_strip -plibzpool1 --dbg-package=libzpool1-dbg - dh_strip -pzfsutils --dbg-package=zfsutils-dbg + dh_strip --dbg-package=zfs-dbg ifeq ($(BUILD_UDEB), true) - dh_strip -plibnvpair$(SHLIB_MAJOR)-udeb - dh_strip -plibuutil$(SHLIB_MAJOR)-udeb - dh_strip -plibzfs$(SHLIB_MAJOR)-udeb - dh_strip -plibzpool$(SHLIB_MAJOR)-udeb + dh_strip -plibnvpair1-udeb + dh_strip -plibuutil1-udeb + dh_strip -plibzfs2-udeb + dh_strip -plibzpool2-udeb dh_strip -pzfsutils-udeb endif override_dh_auto_clean: dh_auto_clean + debconf-updatepo @if test -e META.orig; then mv META.orig META; fi cp debian/control.in debian/control ifeq ($(BUILD_UDEB), true) @@ -160,7 +128,7 @@ endif override_dh_install: find . -name lib*.la -delete - dh_install + dh_install --list-missing # ------------ @@ -178,7 +146,8 @@ override_dh_configure_modules_udeb_stamp: --without-selinux \ --with-config=kernel \ --with-linux=$(KSRC) \ - --with-linux-obj=$(KOBJ) + --with-linux-obj=$(KOBJ) \ + --with-spl=$(SPL) touch override_dh_configure_modules_udeb_stamp override_dh_configure_modules: override_dh_configure_modules_stamp @@ -186,7 +155,8 @@ override_dh_configure_modules_stamp: ./configure \ --with-config=kernel \ --with-linux=$(KSRC) \ - --with-linux-obj=$(KOBJ) + --with-linux-obj=$(KOBJ) \ + --with-spl=$(SPL) touch override_dh_configure_modules_stamp override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules_udeb @@ -218,5 +188,4 @@ override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_mod dh_installdeb -p${pmodules} dh_gencontrol -p${pmodules} dh_md5sums -p${pmodules} - dh_builddeb -p${pmodules}