1 |
commit: b96ad3962f4ac11bfb2dad351da7fd8016e92ba1 |
2 |
Author: Richard Yao <ryao <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 27 22:21:14 2016 +0000 |
4 |
Commit: Richard Yao <ryao <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 27 22:22:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b96ad396 |
7 |
|
8 |
sys-fs/spl-0.6.5.4{,-r1}: Version Bump |
9 |
|
10 |
The patches from the 0.6.5.3-r1 ebuild that were not backported |
11 |
upstream have been carried forward in 0.6.5.4-r1. 0.6.5.4 has been |
12 |
commited without any patches as an aid to users who do not want |
13 |
patches. However, it is left unkeyworded to be consistent with the |
14 |
sys-fs/zfs-kmod ebuild. |
15 |
|
16 |
Package-Manager: portage-2.2.24 |
17 |
Signed-off-by: Richard Yao <ryao <AT> gentoo.org> |
18 |
|
19 |
sys-kernel/spl/Manifest | 2 + |
20 |
sys-kernel/spl/spl-0.6.5.4-r1.ebuild | 120 +++++++++++++++++++++++++++++++++++ |
21 |
sys-kernel/spl/spl-0.6.5.4.ebuild | 111 ++++++++++++++++++++++++++++++++ |
22 |
3 files changed, 233 insertions(+) |
23 |
|
24 |
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest |
25 |
index 9cf3701..79a63bf 100644 |
26 |
--- a/sys-kernel/spl/Manifest |
27 |
+++ b/sys-kernel/spl/Manifest |
28 |
@@ -9,3 +9,5 @@ DIST spl-0.6.4.2.tar.gz 190421 SHA256 05c428f48acc55287c0662a90cfc087985b8ef3694 |
29 |
DIST spl-0.6.5.2.tar.gz 193153 SHA256 2642b69870b32e0feeaa57fbfcef546a330064bd4e5805c4862a97287a9287ca SHA512 9db23daf6cc1d6aaa926c987e284d7dbbc538876d6a8b9636d3126efc2be9d54b5ae2cb9cb3a89b604b3d4106374d85d9ad2c1acaf940a1299c1620ee1526d3f WHIRLPOOL cc99f131f9dfcc9ef84237f16491c8c5417af70c57dcbc3dba448c83f93636d5161b301f4fefa4fa8c54c56a1864cd9ce5d5fc758697803bac880839ea57e359 |
30 |
DIST spl-0.6.5.3-patches-p0.tar.xz 4968 SHA256 8e652d41eba421720bcecee99077d3f3c375153809426011f04a2c64aa181ca7 SHA512 cdc053d7ad537cec3b0e7d777d6a341d1b48d6f49613f77db3831b86f54cef098748b944a353c3bf920974a812d650b65116fe26906ff7921ea69cfa5fef9691 WHIRLPOOL ff9e6a193a8585738f57fec59a3513fe69856019569e90c95da306ab853b0c5a8266bb457ef1f4df0c4bcd20dfbde1062c616d3ee55621b288ab796c733d9589 |
31 |
DIST spl-0.6.5.3.tar.gz 556179 SHA256 637c1eccd721f5d3bb1570621d2cd6646ec0488608482c0dbeb2838cf4bb310c SHA512 24a0c97f1a425e44d12f43519c23ba78672c06d65a03833a8d3827e4c762a873283c90ce66f64b9b186ab815f0b005e69da537e120b8b53877d0f13e649bac57 WHIRLPOOL e67f50c8adc4ac2b770dfaeb479fa8a8c87270c8314b5366dd95665a30adb2f1fb29db9719a0431cc18adc6865ea6f222c1b443f2b95b764cede8db50f49333d |
32 |
+DIST spl-0.6.5.4-patches-p1.tar.xz 2020 SHA256 0a554d86ff1874b09263fbec2ee8e03dbae24f4c45cf54c9e8a8d2fcf3a21207 SHA512 2650f06bf23045bd2805ef58baa2561534373862e1fbbaf189cf93283aa8e18cbee989b4e81751b37da3058aeba357cf8e46db97331379e1b5eafde7faa33851 WHIRLPOOL 8054310c8d62d17f45566e67f886e025b5798c1ebb32bf66f3b91b440a42869d09a45030e5d8695687ace829fe21f43289647dafd206d1021626fffb35a2979e |
33 |
+DIST spl-0.6.5.4.tar.gz 556298 SHA256 a49ff1dd255215da18ea60bf76dc5b764ddc1aa40d86f4e842b63185357b1504 SHA512 a50d804008237820d6a8e7d938f6699df2966836ebedf0b6a4421f55bd6c24ae69e8f80eaf3aa2b7f6ed308983ab4ca11abfb32f98c8d070e4957b4802e00cac WHIRLPOOL 4c9150fec7e5539e391ffd078e7aa4412d47416749187d62e36136d945514694b09920e595c391ed3fedcf5d13f7486539f49ca33e166909d8a8b2fc99b39a37 |
34 |
|
35 |
diff --git a/sys-kernel/spl/spl-0.6.5.4-r1.ebuild b/sys-kernel/spl/spl-0.6.5.4-r1.ebuild |
36 |
new file mode 100644 |
37 |
index 0000000..d53ecec |
38 |
--- /dev/null |
39 |
+++ b/sys-kernel/spl/spl-0.6.5.4-r1.ebuild |
40 |
@@ -0,0 +1,120 @@ |
41 |
+# Copyright 1999-2015 Gentoo Foundation |
42 |
+# Distributed under the terms of the GNU General Public License v2 |
43 |
+# $Id$ |
44 |
+ |
45 |
+EAPI="5" |
46 |
+ |
47 |
+if [[ ${PV} == "9999" ]] ; then |
48 |
+ AUTOTOOLS_AUTORECONF="1" |
49 |
+ EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" |
50 |
+ inherit git-r3 |
51 |
+else |
52 |
+ SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz |
53 |
+ https://dev.gentoo.org/~ryao/dist/${P}-patches-p${PR#r}.tar.xz" |
54 |
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64" |
55 |
+fi |
56 |
+ |
57 |
+inherit flag-o-matic linux-info linux-mod autotools-utils |
58 |
+ |
59 |
+DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs" |
60 |
+HOMEPAGE="http://zfsonlinux.org/" |
61 |
+ |
62 |
+LICENSE="GPL-2" |
63 |
+SLOT="0" |
64 |
+IUSE="custom-cflags debug" |
65 |
+RESTRICT="debug? ( strip ) test" |
66 |
+ |
67 |
+COMMON_DEPEND="dev-lang/perl |
68 |
+ virtual/awk" |
69 |
+ |
70 |
+DEPEND="${COMMON_DEPEND}" |
71 |
+ |
72 |
+RDEPEND="${COMMON_DEPEND} |
73 |
+ !sys-devel/spl" |
74 |
+ |
75 |
+AT_M4DIR="config" |
76 |
+AUTOTOOLS_IN_SOURCE_BUILD="1" |
77 |
+DOCS=( AUTHORS DISCLAIMER ) |
78 |
+ |
79 |
+pkg_setup() { |
80 |
+ linux-info_pkg_setup |
81 |
+ CONFIG_CHECK=" |
82 |
+ !DEBUG_LOCK_ALLOC |
83 |
+ !GRKERNSEC_RANDSTRUCT |
84 |
+ KALLSYMS |
85 |
+ MODULES |
86 |
+ !PAX_KERNEXEC_PLUGIN_METHOD_OR |
87 |
+ ZLIB_DEFLATE |
88 |
+ ZLIB_INFLATE |
89 |
+ " |
90 |
+ |
91 |
+ use debug && CONFIG_CHECK="${CONFIG_CHECK} |
92 |
+ FRAME_POINTER |
93 |
+ DEBUG_INFO |
94 |
+ !DEBUG_INFO_REDUCED |
95 |
+ " |
96 |
+ |
97 |
+ kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
98 |
+ |
99 |
+ [ ${PV} != "9999" ] && \ |
100 |
+ { kernel_is le 4 4 || die "Linux 4.4 is the latest supported version."; } |
101 |
+ |
102 |
+ check_extra_config |
103 |
+} |
104 |
+ |
105 |
+src_prepare() { |
106 |
+ if [ ${PV} != "9999" ] |
107 |
+ then |
108 |
+ # Apply patch set |
109 |
+ EPATCH_SUFFIX="patch" \ |
110 |
+ EPATCH_FORCE="yes" \ |
111 |
+ epatch "${WORKDIR}/${P}-patches" |
112 |
+ fi |
113 |
+ |
114 |
+ # Workaround for hard coded path |
115 |
+ sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \ |
116 |
+ die "Cannot patch check.sh" |
117 |
+ |
118 |
+ # splat is unnecessary unless we are debugging |
119 |
+ use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; } |
120 |
+ |
121 |
+ # Set module revision number |
122 |
+ [ ${PV} != "9999" ] && \ |
123 |
+ { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
124 |
+ |
125 |
+ autotools-utils_src_prepare |
126 |
+} |
127 |
+ |
128 |
+src_configure() { |
129 |
+ use custom-cflags || strip-flags |
130 |
+ filter-ldflags -Wl,* |
131 |
+ |
132 |
+ set_arch_to_kernel |
133 |
+ local myeconfargs=( |
134 |
+ --bindir="${EPREFIX}/bin" |
135 |
+ --sbindir="${EPREFIX}/sbin" |
136 |
+ --with-config=all |
137 |
+ --with-linux="${KV_DIR}" |
138 |
+ --with-linux-obj="${KV_OUT_DIR}" |
139 |
+ $(use_enable debug) |
140 |
+ ) |
141 |
+ autotools-utils_src_configure |
142 |
+} |
143 |
+ |
144 |
+src_install() { |
145 |
+ autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
146 |
+} |
147 |
+ |
148 |
+pkg_postinst() { |
149 |
+ linux-mod_pkg_postinst |
150 |
+ |
151 |
+ # Remove old modules |
152 |
+ if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ] |
153 |
+ then |
154 |
+ ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl" |
155 |
+ ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl" |
156 |
+ ewarn "Automatically removing old modules to avoid problems." |
157 |
+ rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules" |
158 |
+ rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
159 |
+ fi |
160 |
+} |
161 |
|
162 |
diff --git a/sys-kernel/spl/spl-0.6.5.4.ebuild b/sys-kernel/spl/spl-0.6.5.4.ebuild |
163 |
new file mode 100644 |
164 |
index 0000000..33314da |
165 |
--- /dev/null |
166 |
+++ b/sys-kernel/spl/spl-0.6.5.4.ebuild |
167 |
@@ -0,0 +1,111 @@ |
168 |
+# Copyright 1999-2015 Gentoo Foundation |
169 |
+# Distributed under the terms of the GNU General Public License v2 |
170 |
+# $Id$ |
171 |
+ |
172 |
+EAPI="5" |
173 |
+ |
174 |
+if [[ ${PV} == "9999" ]] ; then |
175 |
+ AUTOTOOLS_AUTORECONF="1" |
176 |
+ EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" |
177 |
+ inherit git-r3 |
178 |
+else |
179 |
+ SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz" |
180 |
+ KEYWORDS="" |
181 |
+fi |
182 |
+ |
183 |
+inherit flag-o-matic linux-info linux-mod autotools-utils |
184 |
+ |
185 |
+DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs" |
186 |
+HOMEPAGE="http://zfsonlinux.org/" |
187 |
+ |
188 |
+LICENSE="GPL-2" |
189 |
+SLOT="0" |
190 |
+IUSE="custom-cflags debug" |
191 |
+RESTRICT="debug? ( strip ) test" |
192 |
+ |
193 |
+COMMON_DEPEND="dev-lang/perl |
194 |
+ virtual/awk" |
195 |
+ |
196 |
+DEPEND="${COMMON_DEPEND}" |
197 |
+ |
198 |
+RDEPEND="${COMMON_DEPEND} |
199 |
+ !sys-devel/spl" |
200 |
+ |
201 |
+AT_M4DIR="config" |
202 |
+AUTOTOOLS_IN_SOURCE_BUILD="1" |
203 |
+DOCS=( AUTHORS DISCLAIMER ) |
204 |
+ |
205 |
+pkg_setup() { |
206 |
+ linux-info_pkg_setup |
207 |
+ CONFIG_CHECK=" |
208 |
+ !DEBUG_LOCK_ALLOC |
209 |
+ MODULES |
210 |
+ KALLSYMS |
211 |
+ !PAX_KERNEXEC_PLUGIN_METHOD_OR |
212 |
+ !PAX_SIZE_OVERFLOW |
213 |
+ ZLIB_DEFLATE |
214 |
+ ZLIB_INFLATE |
215 |
+ " |
216 |
+ |
217 |
+ use debug && CONFIG_CHECK="${CONFIG_CHECK} |
218 |
+ FRAME_POINTER |
219 |
+ DEBUG_INFO |
220 |
+ !DEBUG_INFO_REDUCED |
221 |
+ " |
222 |
+ |
223 |
+ kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
224 |
+ |
225 |
+ [ ${PV} != "9999" ] && \ |
226 |
+ { kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; } |
227 |
+ |
228 |
+ check_extra_config |
229 |
+} |
230 |
+ |
231 |
+src_prepare() { |
232 |
+ # Workaround for hard coded path |
233 |
+ sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \ |
234 |
+ die "Cannot patch check.sh" |
235 |
+ |
236 |
+ # splat is unnecessary unless we are debugging |
237 |
+ use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; } |
238 |
+ |
239 |
+ # Set module revision number |
240 |
+ [ ${PV} != "9999" ] && \ |
241 |
+ { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
242 |
+ |
243 |
+ autotools-utils_src_prepare |
244 |
+} |
245 |
+ |
246 |
+src_configure() { |
247 |
+ use custom-cflags || strip-flags |
248 |
+ filter-ldflags -Wl,* |
249 |
+ |
250 |
+ set_arch_to_kernel |
251 |
+ local myeconfargs=( |
252 |
+ --bindir="${EPREFIX}/bin" |
253 |
+ --sbindir="${EPREFIX}/sbin" |
254 |
+ --with-config=all |
255 |
+ --with-linux="${KV_DIR}" |
256 |
+ --with-linux-obj="${KV_OUT_DIR}" |
257 |
+ $(use_enable debug) |
258 |
+ ) |
259 |
+ autotools-utils_src_configure |
260 |
+} |
261 |
+ |
262 |
+src_install() { |
263 |
+ autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
264 |
+} |
265 |
+ |
266 |
+pkg_postinst() { |
267 |
+ linux-mod_pkg_postinst |
268 |
+ |
269 |
+ # Remove old modules |
270 |
+ if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ] |
271 |
+ then |
272 |
+ ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl" |
273 |
+ ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl" |
274 |
+ ewarn "Automatically removing old modules to avoid problems." |
275 |
+ rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules" |
276 |
+ rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
277 |
+ fi |
278 |
+} |