spl-patches/0001-remove-DKMS-and-module-build.patch

   1 From 8c0a5dd331d746c5c114dda69f2eb5a4a0ac8eb9 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
   3 Date: Wed, 12 Oct 2016 10:57:39 +0200
   4 Subject: [PATCH] remove DKMS and module build
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  10 ---
  11  debian/control.in | 24 --------------------
  12  debian/control    |  1 -
  13  debian/rules      | 68 +------------------------------------------------------
  14  3 files changed, 1 insertion(+), 92 deletions(-)
  15
  16 diff --git a/debian/control.in b/debian/control.in
  17 index 6846796..786e689 100644
  18 --- a/debian/control.in
  19 +++ b/debian/control.in
  20 @@ -8,40 +8,16 @@ Build-Depends: autogen,
  21                 autotools-dev,
  22                 debhelper (>= 9),
  23                 dh-autoreconf,
  24 -               dkms (>> 2.2.0.2-1~),
  25                 libtool
  26  Standards-Version: 4.1.2
  27  Homepage: http://www.zfsonlinux.org/
  28  Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/spl.git
  29  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
  30
  31 -Package: spl-dkms
  32 -Architecture: all
  33 -Depends: dkms (>> 2.2.1.0), file, libc-dev, lsb-release, ${misc:Depends}
  34 -Recommends: spl (>= ${source:Upstream-Version})
  35 -Provides: spl-modules
  36 -Description: Solaris Porting Layer kernel modules for Linux
  37 - The Solaris Porting Layer (SPL) is a Linux kernel module which provides
  38 - many of the Solaris kernel APIs. This shim layer makes it possible to
  39 - run Solaris kernel code in the Linux kernel with relatively minimal
  40 - modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
  41 - module which provides a testing harness for the SPL module.
  42 - .
  43 - SPL can be particularly useful when you want to track upstream Illumos
  44 - (or any other OpenSolaris fork) development closely and don't want the
  45 - overhead of maintaining a large patch which converts Solaris primitives
  46 - to Linux primitives.
  47 - .
  48 - This package contains the source code for the SPL and SPLAT Linux kernel
  49 - modules, which can be used with DKMS, so that local kernel modules are
  50 - automatically built and installed every time the kernel packages are
  51 - upgraded.
  52 -
  53  Package: spl
  54  Architecture: linux-any
  55  Conflicts: spl-dev, splat
  56  Depends: ${misc:Depends}, ${shlibs:Depends}
  57 -Recommends: spl-modules | spl-dkms
  58  Description: Solaris Porting Layer user-space utilities for Linux
  59   The Solaris Porting Layer (SPL) is a Linux kernel module which provides
  60   many of the Solaris kernel APIs. This shim layer makes it possible to
  61 diff --git a/debian/control b/debian/control
  62 index 6846796..af4b7bb 100644
  63 --- a/debian/control
  64 +++ b/debian/control
  65 @@ -8,7 +8,6 @@ Build-Depends: autogen,
  66                 autotools-dev,
  67                 debhelper (>= 9),
  68                 dh-autoreconf,
  69 -               dkms (>> 2.2.0.2-1~),
  70                 libtool
  71  Standards-Version: 4.1.2
  72  Homepage: http://www.zfsonlinux.org/
  73 diff --git a/debian/rules b/debian/rules
  74 index b2fc86c..a474ca4 100755
  75 --- a/debian/rules
  76 +++ b/debian/rules
  77 @@ -14,12 +14,8 @@ ifndef KVERS
  78  KVERS=$(shell uname -r)
  79  endif
  80
  81 -non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
  82 -PACKAGE=spl
  83 -pmodules = $(PACKAGE)-modules-$(non_epoch_version)
  84 -
  85  %:
  86 -       dh $@ --with dkms,autoreconf --parallel
  87 +       dh $@ --with autoreconf --parallel
  88
  89  override_dh_auto_configure:
  90         @cp debian/control.in debian/control
  91 @@ -45,69 +41,7 @@ override_dh_auto_install:
  92         @# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
  93         $(MAKE) distdir
  94
  95 -       @# This shunt allows DKMS to install the Module.symvers and spl_config.h
  96 -       @# files to the ${dkms_tree} area through the POST_INSTALL directive.
  97 -       echo '#!/bin/sh'  >'$(CURDIR)/$(NAME)-$(VERSION)/cp'
  98 -       echo 'cp "$$@"'  >>'$(CURDIR)/$(NAME)-$(VERSION)/cp'
  99 -       chmod 755 '$(CURDIR)/$(NAME)-$(VERSION)/cp'
 100 -
 101 -       # Install the DKMS source.
 102 -       mkdir -p '$(CURDIR)/debian/tmp/usr/src/'
 103 -       mv '$(CURDIR)/$(NAME)-$(VERSION)' '$(CURDIR)/debian/tmp/usr/src/'
 104 -
 105 -override_dh_dkms:
 106 -       dh_dkms -V $(VERSION)
 107 -
 108  override_dh_auto_clean:
 109         dh_auto_clean
 110         @if test -e META.orig; then mv META.orig META; fi
 111         cp debian/control.in debian/control
 112 -
 113 -# ------------
 114 -
 115 -override_dh_prep-deb-files:
 116 -       for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
 117 -               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' \
 118 -               < $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
 119 -       done
 120 -       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' \
 121 -       < debian/control.modules.in > debian/control
 122 -
 123 -override_dh_configure_modules: override_dh_configure_modules_stamp
 124 -override_dh_configure_modules_stamp:
 125 -       ./configure --with-config=kernel --with-linux=$(KSRC) \
 126 -               --with-linux-obj=$(KOBJ) \
 127 -               --disable-debug-kmem
 128 -       touch override_dh_configure_modules_stamp
 129 -
 130 -override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules
 131 -       dh_testdir
 132 -       dh_testroot
 133 -       dh_prep
 134 -
 135 -       $(MAKE) -C $(CURDIR)/module modules
 136 -
 137 -       dh_installdirs -p${pmodules}-di
 138 -       dh_install -p${pmodules}-di
 139 -       dh_gencontrol -p${pmodules}-di
 140 -
 141 -       dh_builddeb -p${pmodules}-di
 142 -
 143 -override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_modules
 144 -       dh_testdir
 145 -       dh_testroot
 146 -       dh_prep
 147 -
 148 -       $(MAKE) -C $(CURDIR)/module modules
 149 -
 150 -       dh_installdocs -p${pmodules}
 151 -       dh_install -p${pmodules}
 152 -       dh_installchangelogs -p${pmodules}
 153 -       dh_compress -p${pmodules}
 154 -       dh_strip -p${pmodules}
 155 -       dh_fixperms -p${pmodules}
 156 -       dh_installdeb -p${pmodules}
 157 -       dh_gencontrol -p${pmodules}
 158 -       dh_md5sums -p${pmodules}
 159 -
 160 -       dh_builddeb -p${pmodules}
 161 --
 162 2.14.2
 163