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