1 |
commit: a19427b9ebd749036ac73d9165b53d9044027c1d |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 3 19:25:01 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 3 20:04:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19427b9 |
7 |
|
8 |
sys-fs/zfs-kmod: drop 0.8.4 |
9 |
|
10 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
sys-fs/zfs-kmod/Manifest | 1 - |
14 |
sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch | 48 ------ |
15 |
sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild | 183 --------------------- |
16 |
3 files changed, 232 deletions(-) |
17 |
|
18 |
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest |
19 |
index 128c485727a..103e10fa8d8 100644 |
20 |
--- a/sys-fs/zfs-kmod/Manifest |
21 |
+++ b/sys-fs/zfs-kmod/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1 |
24 |
DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 |
25 |
DIST zfs-2.0.0-rc4.tar.gz 12861762 BLAKE2B 638eb426955de38efbbb390cb02642298dd73caa5d9c9e28d8aea89bb40967c251bbbe66fbd38e08c922fb1c6fa935c959572abf237ea57ee7d9a5982693e275 SHA512 3972b92c7c0e92416fcde1fa01e7d1c20046de2e21d83a6694d0dc8753f13009b38f0f656202364da85b798886feffd06292b5fd5d23b0b3afc4f81fd86a540b |
26 |
|
27 |
diff --git a/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch b/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch |
28 |
deleted file mode 100644 |
29 |
index 1a2948a3158..00000000000 |
30 |
--- a/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch |
31 |
+++ /dev/null |
32 |
@@ -1,48 +0,0 @@ |
33 |
-From bd0efd1f062bfba5dd2d6b1fe30b6949f8e0a8ef Mon Sep 17 00:00:00 2001 |
34 |
-From: sterlingjensen <5555776+sterlingjensen@××××××××××××××××××××.com> |
35 |
-Date: Mon, 24 Aug 2020 22:41:05 -0500 |
36 |
-Subject: [PATCH] Mark lua setjmp/longjmp for powerpc weak |
37 |
- |
38 |
-Linux already defines setjmp/longjmp for powerpc, which leads to |
39 |
-duplicate symbols in a statically linked build. |
40 |
- |
41 |
-Signed-off-by: Sterlng Jensen <sterlingjensen@××××××××××××××××××××.com> |
42 |
---- |
43 |
- module/lua/setjmp/setjmp_ppc.S | 10 +++++----- |
44 |
- 1 file changed, 5 insertions(+), 5 deletions(-) |
45 |
- |
46 |
-diff --git a/module/lua/setjmp/setjmp_ppc.S b/module/lua/setjmp/setjmp_ppc.S |
47 |
-index f787ef34913..72aa5d5ab5b 100644 |
48 |
---- a/module/lua/setjmp/setjmp_ppc.S |
49 |
-+++ b/module/lua/setjmp/setjmp_ppc.S |
50 |
-@@ -56,7 +56,7 @@ |
51 |
- #define ENTRY(name) \ |
52 |
- .align 2 ; \ |
53 |
- .type name,@function; \ |
54 |
-- .globl name; \ |
55 |
-+ .weak name; \ |
56 |
- name: |
57 |
- |
58 |
- #else /* PPC64_ELF_ABI_v1 */ |
59 |
-@@ -65,8 +65,8 @@ name: |
60 |
- #define GLUE(a,b) XGLUE(a,b) |
61 |
- #define ENTRY(name) \ |
62 |
- .align 2 ; \ |
63 |
-- .globl name; \ |
64 |
-- .globl GLUE(.,name); \ |
65 |
-+ .weak name; \ |
66 |
-+ .weak GLUE(.,name); \ |
67 |
- .pushsection ".opd","aw"; \ |
68 |
- name: \ |
69 |
- .quad GLUE(.,name); \ |
70 |
-@@ -83,8 +83,8 @@ GLUE(.,name): |
71 |
- #define ENTRY(name) \ |
72 |
- .text; \ |
73 |
- .p2align 4; \ |
74 |
-- .globl name; \ |
75 |
-- .type name,@function; \ |
76 |
-+ .weak name; \ |
77 |
-+ .type name,@function; \ |
78 |
- name: |
79 |
- |
80 |
- #endif /* __powerpc64__ */ |
81 |
|
82 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild |
83 |
deleted file mode 100644 |
84 |
index 18afe59c4a9..00000000000 |
85 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild |
86 |
+++ /dev/null |
87 |
@@ -1,183 +0,0 @@ |
88 |
-# Copyright 1999-2020 Gentoo Authors |
89 |
-# Distributed under the terms of the GNU General Public License v2 |
90 |
- |
91 |
-EAPI=7 |
92 |
- |
93 |
-inherit autotools flag-o-matic linux-mod toolchain-funcs |
94 |
- |
95 |
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
96 |
-HOMEPAGE="https://github.com/openzfs/zfs" |
97 |
- |
98 |
-if [[ ${PV} == "9999" ]]; then |
99 |
- inherit git-r3 |
100 |
- EGIT_REPO_URI="https://github.com/openzfs/zfs.git" |
101 |
-else |
102 |
- SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" |
103 |
- KEYWORDS="amd64 arm64 ppc64" |
104 |
- S="${WORKDIR}/zfs-${PV}" |
105 |
- ZFS_KERNEL_COMPAT="5.6" |
106 |
-fi |
107 |
- |
108 |
-LICENSE="CDDL debug? ( GPL-2+ )" |
109 |
-SLOT="0" |
110 |
-IUSE="custom-cflags debug +rootfs" |
111 |
- |
112 |
-DEPEND="" |
113 |
- |
114 |
-RDEPEND="${DEPEND} |
115 |
- !sys-kernel/spl |
116 |
-" |
117 |
- |
118 |
-BDEPEND=" |
119 |
- dev-lang/perl |
120 |
- virtual/awk |
121 |
-" |
122 |
- |
123 |
-RESTRICT="debug? ( strip ) test" |
124 |
- |
125 |
-DOCS=( AUTHORS COPYRIGHT META README.md ) |
126 |
- |
127 |
-PATCHES=( "${FILESDIR}/${PV}-powerpc_jmp_weak.patch" ) |
128 |
- |
129 |
-pkg_setup() { |
130 |
- CONFIG_CHECK=" |
131 |
- !DEBUG_LOCK_ALLOC |
132 |
- EFI_PARTITION |
133 |
- MODULES |
134 |
- !PAX_KERNEXEC_PLUGIN_METHOD_OR |
135 |
- !TRIM_UNUSED_KSYMS |
136 |
- ZLIB_DEFLATE |
137 |
- ZLIB_INFLATE |
138 |
- " |
139 |
- |
140 |
- use debug && CONFIG_CHECK="${CONFIG_CHECK} |
141 |
- FRAME_POINTER |
142 |
- DEBUG_INFO |
143 |
- !DEBUG_INFO_REDUCED |
144 |
- " |
145 |
- |
146 |
- use rootfs && \ |
147 |
- CONFIG_CHECK="${CONFIG_CHECK} |
148 |
- BLK_DEV_INITRD |
149 |
- DEVTMPFS |
150 |
- " |
151 |
- |
152 |
- if use arm64; then |
153 |
- kernel_is -ge 5 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT" |
154 |
- fi |
155 |
- |
156 |
- kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" |
157 |
- |
158 |
- if [[ ${PV} != "9999" ]]; then |
159 |
- local kv_major_max kv_minor_max zcompat |
160 |
- zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" |
161 |
- kv_major_max="${zcompat%%.*}" |
162 |
- zcompat="${zcompat#*.}" |
163 |
- kv_minor_max="${zcompat%%.*}" |
164 |
- kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ |
165 |
- "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" |
166 |
- |
167 |
- # 0.8.x requires at least 2.6.32 |
168 |
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
169 |
- else |
170 |
- # git master requires at least 3.10 |
171 |
- kernel_is -ge 3 10 || die "Linux 3.10 or newer required" |
172 |
- fi |
173 |
- |
174 |
- linux-mod_pkg_setup |
175 |
-} |
176 |
- |
177 |
-src_prepare() { |
178 |
- default |
179 |
- |
180 |
- if [[ ${PV} == "9999" ]]; then |
181 |
- eautoreconf |
182 |
- else |
183 |
- # Set module revision number |
184 |
- sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" |
185 |
- fi |
186 |
-} |
187 |
- |
188 |
-src_configure() { |
189 |
- set_arch_to_kernel |
190 |
- |
191 |
- use custom-cflags || strip-flags |
192 |
- |
193 |
- filter-ldflags -Wl,* |
194 |
- |
195 |
- local myconf=( |
196 |
- CROSS_COMPILE="${CHOST}-" |
197 |
- HOSTCC="$(tc-getBUILD_CC)" |
198 |
- --bindir="${EPREFIX}/bin" |
199 |
- --sbindir="${EPREFIX}/sbin" |
200 |
- --with-config=kernel |
201 |
- --with-linux="${KV_DIR}" |
202 |
- --with-linux-obj="${KV_OUT_DIR}" |
203 |
- $(use_enable debug) |
204 |
- ) |
205 |
- |
206 |
- CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}" |
207 |
-} |
208 |
- |
209 |
-src_compile() { |
210 |
- set_arch_to_kernel |
211 |
- |
212 |
- myemakeargs=( |
213 |
- CROSS_COMPILE="${CHOST}-" |
214 |
- HOSTCC="$(tc-getBUILD_CC)" |
215 |
- V=1 |
216 |
- ) |
217 |
- |
218 |
- emake "${myemakeargs[@]}" |
219 |
-} |
220 |
- |
221 |
-src_install() { |
222 |
- set_arch_to_kernel |
223 |
- |
224 |
- myemakeargs+=( |
225 |
- DEPMOD="/bin/true" |
226 |
- DESTDIR="${D}" |
227 |
- INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
228 |
- ) |
229 |
- |
230 |
- emake "${myemakeargs[@]}" install |
231 |
- |
232 |
- einstalldocs |
233 |
-} |
234 |
- |
235 |
-pkg_postinst() { |
236 |
- linux-mod_pkg_postinst |
237 |
- |
238 |
- # Remove old modules |
239 |
- if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then |
240 |
- ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" |
241 |
- ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" |
242 |
- ewarn "Automatically removing old modules to avoid problems." |
243 |
- rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
244 |
- rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" |
245 |
- fi |
246 |
- |
247 |
- if use x86 || use arm; then |
248 |
- ewarn "32-bit kernels will likely require increasing vmalloc to" |
249 |
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
250 |
- fi |
251 |
- |
252 |
- ewarn "This version of OpenZFS includes support for new feature flags" |
253 |
- ewarn "that are incompatible with previous versions. GRUB2 support for" |
254 |
- ewarn "/boot with the new feature flags is not yet available." |
255 |
- ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
256 |
- ewarn "Any new pools will be created with the new feature flags by default" |
257 |
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
258 |
- ewarn "create a newpool that is backward compatible wih GRUB2, use " |
259 |
- ewarn |
260 |
- ewarn "zpool create -d -o feature@async_destroy=enabled " |
261 |
- ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
262 |
- ewarn " -o feature@spacemap_histogram=enabled" |
263 |
- ewarn " -o feature@enabled_txg=enabled " |
264 |
- ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
265 |
- ewarn " ..." |
266 |
- ewarn |
267 |
- ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
268 |
- ewarn "developers do a tag or the Gentoo developers find time to backport" |
269 |
- ewarn "support from GRUB2 HEAD." |
270 |
-} |