Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
Date: Wed, 07 Oct 2020 00:00:32
Message-Id: 1602028640.3b8776e6a42774c17151f07a4a45dcdefb3f7991.gyakovlev@gentoo
1 commit: 3b8776e6a42774c17151f07a4a45dcdefb3f7991
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 6 23:54:49 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 6 23:57:20 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b8776e6
7
8 sys-fs/zfs-kmod: drop old rc
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 sys-fs/zfs-kmod/Manifest | 1 -
14 sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild | 175 ------------------------------
15 2 files changed, 176 deletions(-)
16
17 diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
18 index e722910db54..238f7e1e23d 100644
19 --- a/sys-fs/zfs-kmod/Manifest
20 +++ b/sys-fs/zfs-kmod/Manifest
21 @@ -1,4 +1,3 @@
22 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
23 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
24 -DIST zfs-2.0.0-rc2.tar.gz 12854085 BLAKE2B 73cabd565c11eef1bebbc391f8c4ba18acd1610f98f1b8afb507bc844f4b6a64ba32d9727e634c7f26c48fe365a841bf071513df234b9b7a87e954610a6d7f3b SHA512 14b17d06124890efef15b3b073e103c9faeecaea761779fff9a8420e3ab72fa611df9875fa766a323d69646e9025f8b19f918ded4c6705af116cf9f14eea4f40
25 DIST zfs-2.0.0-rc3.tar.gz 12860212 BLAKE2B bd29ceb17938180ffda9a26cfee97f4b9b42752cd7a3bf5d72705d94967d219889cc84a71d4c0f59aaf718d596011ecdbf07000788aa39a424087eb7cf62a944 SHA512 c09bebb1d1b19079b51305eea1b3d1a428a46bf1301afc9dfa20871ac670d94dc9f7f9127384b2db501fd909f22a16fad0c1b7383eb9ce31a7c0e696e66a097f
26
27 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild
28 deleted file mode 100644
29 index 689dcbc4494..00000000000
30 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild
31 +++ /dev/null
32 @@ -1,175 +0,0 @@
33 -# Copyright 1999-2020 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -inherit autotools flag-o-matic linux-mod toolchain-funcs
39 -
40 -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
41 -HOMEPAGE="https://github.com/openzfs/zfs"
42 -
43 -if [[ ${PV} == "9999" ]]; then
44 - inherit git-r3
45 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
46 -else
47 - MY_PV="${PV/_rc/-rc}"
48 - SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
49 - KEYWORDS="~amd64 ~arm64 ~ppc64"
50 - S="${WORKDIR}/zfs-${PV%_rc?}"
51 - ZFS_KERNEL_COMPAT="5.8"
52 -fi
53 -
54 -LICENSE="CDDL debug? ( GPL-2+ )"
55 -SLOT="0"
56 -IUSE="custom-cflags debug +rootfs"
57 -
58 -DEPEND=""
59 -
60 -RDEPEND="${DEPEND}
61 - !sys-kernel/spl
62 -"
63 -
64 -BDEPEND="
65 - dev-lang/perl
66 - virtual/awk
67 -"
68 -
69 -RESTRICT="debug? ( strip ) test"
70 -
71 -DOCS=( AUTHORS COPYRIGHT META README.md )
72 -
73 -pkg_setup() {
74 - CONFIG_CHECK="
75 - !DEBUG_LOCK_ALLOC
76 - EFI_PARTITION
77 - MODULES
78 - !PAX_KERNEXEC_PLUGIN_METHOD_OR
79 - !TRIM_UNUSED_KSYMS
80 - ZLIB_DEFLATE
81 - ZLIB_INFLATE
82 - "
83 -
84 - use debug && CONFIG_CHECK="${CONFIG_CHECK}
85 - FRAME_POINTER
86 - DEBUG_INFO
87 - !DEBUG_INFO_REDUCED
88 - "
89 -
90 - use rootfs && \
91 - CONFIG_CHECK="${CONFIG_CHECK}
92 - BLK_DEV_INITRD
93 - DEVTMPFS
94 - "
95 -
96 - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
97 -
98 - if [[ ${PV} != "9999" ]]; then
99 - local kv_major_max kv_minor_max zcompat
100 - zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
101 - kv_major_max="${zcompat%%.*}"
102 - zcompat="${zcompat#*.}"
103 - kv_minor_max="${zcompat%%.*}"
104 - kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
105 - "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
106 -
107 - fi
108 -
109 - kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
110 -
111 - linux-mod_pkg_setup
112 -}
113 -
114 -src_prepare() {
115 - default
116 -
117 - if [[ ${PV} == "9999" ]]; then
118 - eautoreconf
119 - else
120 - # Set module revision number
121 - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
122 - fi
123 -}
124 -
125 -src_configure() {
126 - set_arch_to_kernel
127 -
128 - use custom-cflags || strip-flags
129 -
130 - filter-ldflags -Wl,*
131 -
132 - local myconf=(
133 - CROSS_COMPILE="${CHOST}-"
134 - HOSTCC="$(tc-getBUILD_CC)"
135 - --bindir="${EPREFIX}/bin"
136 - --sbindir="${EPREFIX}/sbin"
137 - --with-config=kernel
138 - --with-linux="${KV_DIR}"
139 - --with-linux-obj="${KV_OUT_DIR}"
140 - $(use_enable debug)
141 - )
142 -
143 - econf "${myconf[@]}"
144 -}
145 -
146 -src_compile() {
147 - set_arch_to_kernel
148 -
149 - myemakeargs=(
150 - CROSS_COMPILE="${CHOST}-"
151 - HOSTCC="$(tc-getBUILD_CC)"
152 - V=1
153 - )
154 -
155 - emake "${myemakeargs[@]}"
156 -}
157 -
158 -src_install() {
159 - set_arch_to_kernel
160 -
161 - myemakeargs+=(
162 - DEPMOD="/bin/true"
163 - DESTDIR="${D}"
164 - INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
165 - )
166 -
167 - emake "${myemakeargs[@]}" install
168 -
169 - einstalldocs
170 -}
171 -
172 -pkg_postinst() {
173 - linux-mod_pkg_postinst
174 -
175 - # Remove old modules
176 - if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
177 - ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
178 - ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
179 - ewarn "Automatically removing old modules to avoid problems."
180 - rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
181 - rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
182 - fi
183 -
184 - if use x86 || use arm; then
185 - ewarn "32-bit kernels will likely require increasing vmalloc to"
186 - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
187 - fi
188 -
189 - ewarn "This version of OpenZFS includes support for new feature flags"
190 - ewarn "that are incompatible with previous versions. GRUB2 support for"
191 - ewarn "/boot with the new feature flags is not yet available."
192 - ewarn "Do *NOT* upgrade root pools to use the new feature flags."
193 - ewarn "Any new pools will be created with the new feature flags by default"
194 - ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
195 - ewarn "create a newpool that is backward compatible wih GRUB2, use "
196 - ewarn
197 - ewarn "zpool create -d -o feature@async_destroy=enabled "
198 - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
199 - ewarn " -o feature@spacemap_histogram=enabled"
200 - ewarn " -o feature@enabled_txg=enabled "
201 - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
202 - ewarn " ..."
203 - ewarn
204 - ewarn "GRUB2 support will be updated as soon as either the GRUB2"
205 - ewarn "developers do a tag or the Gentoo developers find time to backport"
206 - ewarn "support from GRUB2 HEAD."
207 -}