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

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