1 |
commit: 29bb318af5b049d3274ab126ecd4955063ec1888 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 28 09:51:39 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 28 10:22:26 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29bb318a |
7 |
|
8 |
sys-fs/bcache-tools: Import all fedora patches |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
sys-fs/bcache-tools/Manifest | 2 + |
14 |
.../bcache-tools-1.0.8_p20140220.ebuild | 76 ++++++++++++++++++++++ |
15 |
.../1.0.8_p20140220/bcache-status-python3.patch | 8 +++ |
16 |
.../1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch | 55 ++++++++++++++++ |
17 |
.../bcache-tools-1.0.8-noprobe.patch | 32 +++++++++ |
18 |
.../bcache-tools-20131018-fedconf.patch | 5 ++ |
19 |
.../bcache-tools-status-20130826-man.patch | 49 ++++++++++++++ |
20 |
7 files changed, 227 insertions(+) |
21 |
|
22 |
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest |
23 |
index 4cbcd0f..24e90f2 100644 |
24 |
--- a/sys-fs/bcache-tools/Manifest |
25 |
+++ b/sys-fs/bcache-tools/Manifest |
26 |
@@ -1,2 +1,4 @@ |
27 |
+DIST bcache-status-20140220.tar.gz 3779 SHA256 5f05ced834a80c824bb5fc78a6b1a71641ebc981c77422679b5514d44d5e055d SHA512 0c8db02dc865b469f3a5964f679a3bfdf5cdbf5a2f6ccd5d81544f3bb3c06df2f5d06b9f09aaec527ec90229740dcd31fbb33e2628721b6da139cfcee6b48d7c WHIRLPOOL eee642edaf8c9fd7b567d6e0c83aa7bbbfe1c147db97998dafb716ba9e76d0e5ba8f87c4226b9309ca8f8ba1a3f66c83f03f162d4ebc4569008fc7d1ce026acf |
28 |
DIST bcache-tools-1.0.5.tgz 21934 SHA256 1449294ef545b3dc6f715f7b063bc2c8656984ad73bcd81a0dc048cbba416ea9 SHA512 aaf27e4cc3037d482cb14c8bb083c1ce5cda5641a19cec67ca1ad22cde71ce035e49701145c6d920b4d62058897c4b7d29d341b3b8bd436c9c51e2f8bdb5c568 WHIRLPOOL 7c2dd6919ba7cc7eebab0c90b517cd73ab4b7e02aedf4c998d95681e3feeedf5368fa5edf58a6a3e079fd7ad3ae5040fe6f02c743132f054c7f56fbad9c44f4b |
29 |
DIST bcache-tools-1.0.8.tgz 22153 SHA256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc WHIRLPOOL 7fada61d2bce55755dd75a1d5518c264c0470b071b6a3c6a003bb3016554eba5715014edfda1a05597d3dca1b557fd7eaea19df467c6c503ad1a52b9664657ef |
30 |
+DIST bcache-tools-1.0.8_p20140220.tgz 22153 SHA256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc WHIRLPOOL 7fada61d2bce55755dd75a1d5518c264c0470b071b6a3c6a003bb3016554eba5715014edfda1a05597d3dca1b557fd7eaea19df467c6c503ad1a52b9664657ef |
31 |
|
32 |
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220.ebuild |
33 |
new file mode 100644 |
34 |
index 0000000..5903050 |
35 |
--- /dev/null |
36 |
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220.ebuild |
37 |
@@ -0,0 +1,76 @@ |
38 |
+# Copyright 1999-2016 Gentoo Foundation |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+# $Id$ |
41 |
+ |
42 |
+EAPI=5 |
43 |
+ |
44 |
+PYTHON_COMPAT=( python3_{3,4,5} ) |
45 |
+ |
46 |
+inherit eutils python-r1 toolchain-funcs udev |
47 |
+ |
48 |
+DESCRIPTION="Tools for bcachefs" |
49 |
+HOMEPAGE="http://bcache.evilpiepirate.org/" |
50 |
+SRC_URI=" |
51 |
+ https://github.com/g2p/bcache-tools/archive/v${PV%%_p*}.tar.gz -> ${P}.tgz |
52 |
+ https://dev.gentoo.org/~jlec/distfiles/bcache-status-20140220.tar.gz |
53 |
+" |
54 |
+ |
55 |
+SLOT="0" |
56 |
+LICENSE="GPL-2" |
57 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
58 |
+IUSE="" |
59 |
+ |
60 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
61 |
+ |
62 |
+RDEPEND="${PYTHON_DEPS} |
63 |
+ >=sys-apps/util-linux-2.24" |
64 |
+DEPEND="${RDEPEND}" |
65 |
+ |
66 |
+PATCHES=( |
67 |
+ "${FILESDIR}"/${PV}/bcache-status-python3.patch |
68 |
+ "${FILESDIR}"/${PV}/bcache-tools-1.0.8-crc64.patch |
69 |
+ "${FILESDIR}"/${PV}/bcache-tools-1.0.8-noprobe.patch |
70 |
+ "${FILESDIR}"/${PV}/bcache-tools-20131018-fedconf.patch |
71 |
+ "${FILESDIR}"/${PV}/bcache-tools-status-20130826-man.patch |
72 |
+) |
73 |
+ |
74 |
+S="${WORKDIR}"/${P%%_p*} |
75 |
+ |
76 |
+src_prepare() { |
77 |
+ tc-export CC |
78 |
+ sed \ |
79 |
+ -e '/^CFLAGS/s:-O2::' \ |
80 |
+ -e '/^CFLAGS/s:-g::' \ |
81 |
+ -i Makefile || die |
82 |
+ |
83 |
+ cp ../bcache-status*/bcache-status . || die |
84 |
+ |
85 |
+ epatch "${PATCHES[@]}" |
86 |
+} |
87 |
+ |
88 |
+src_install() { |
89 |
+ into / |
90 |
+ dosbin make-bcache bcache-super-show |
91 |
+ |
92 |
+ exeinto $(get_udevdir) |
93 |
+ doexe bcache-register probe-bcache |
94 |
+ |
95 |
+ python_foreach_impl python_doscript bcache-status |
96 |
+ |
97 |
+ udev_dorules 69-bcache.rules |
98 |
+ |
99 |
+ insinto /etc/initramfs-tools/hooks/bcache |
100 |
+ doins initramfs/hook |
101 |
+ |
102 |
+ # that is what dracut does |
103 |
+ insinto /usr/lib/dracut/modules.d/90bcache |
104 |
+ doins dracut/module-setup.sh |
105 |
+ |
106 |
+ doman *.8 |
107 |
+ |
108 |
+ dodoc README |
109 |
+} |
110 |
+ |
111 |
+pkg_postinst() { |
112 |
+ udev_reload |
113 |
+} |
114 |
|
115 |
diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch |
116 |
new file mode 100644 |
117 |
index 0000000..0cb08cc |
118 |
--- /dev/null |
119 |
+++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch |
120 |
@@ -0,0 +1,8 @@ |
121 |
+--- bcache-tools-1.0.8/bcache-status.orig 2015-06-20 08:56:22.343589706 +0200 |
122 |
++++ bcache-tools-1.0.8/bcache-status 2015-06-20 08:56:39.971692433 +0200 |
123 |
+@@ -1,4 +1,4 @@ |
124 |
+-#!/usr/bin/env python |
125 |
++#!/usr/bin/env python3 |
126 |
+ # |
127 |
+ # Dumb script to dump (some) of bcache status |
128 |
+ # Copyright 2014 Darrick J. Wong. All rights reserved. |
129 |
|
130 |
diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch |
131 |
new file mode 100644 |
132 |
index 0000000..9b11d80 |
133 |
--- /dev/null |
134 |
+++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch |
135 |
@@ -0,0 +1,55 @@ |
136 |
+diff -ruN bcache-tools-1.0.8.orig/bcache.c bcache-tools-1.0.8/bcache.c |
137 |
+--- bcache-tools-1.0.8.orig/bcache.c 2014-12-04 23:51:24.000000000 +0100 |
138 |
++++ bcache-tools-1.0.8/bcache.c 2015-05-22 19:40:41.039355096 +0200 |
139 |
+@@ -26,7 +26,7 @@ |
140 |
+ * x^7 + x^4 + x + 1 |
141 |
+ */ |
142 |
+ |
143 |
+-static const uint64_t crc_table[256] = { |
144 |
++const uint64_t crc_table[256] = { |
145 |
+ 0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL, |
146 |
+ 0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL, |
147 |
+ 0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL, |
148 |
+@@ -114,16 +114,3 @@ |
149 |
+ 0x5DEDC41A34BBEEB2ULL, 0x1F1D25F19D51D821ULL, 0xD80C07CD676F8394ULL, |
150 |
+ 0x9AFCE626CE85B507ULL |
151 |
+ }; |
152 |
+- |
153 |
+-inline uint64_t crc64(const void *_data, size_t len) |
154 |
+-{ |
155 |
+- uint64_t crc = 0xFFFFFFFFFFFFFFFFULL; |
156 |
+- const unsigned char *data = _data; |
157 |
+- |
158 |
+- while (len--) { |
159 |
+- int i = ((int) (crc >> 56) ^ *data++) & 0xFF; |
160 |
+- crc = crc_table[i] ^ (crc << 8); |
161 |
+- } |
162 |
+- |
163 |
+- return crc ^ 0xFFFFFFFFFFFFFFFFULL; |
164 |
+-} |
165 |
+diff -ruN bcache-tools-1.0.8.orig/bcache.h bcache-tools-1.0.8/bcache.h |
166 |
+--- bcache-tools-1.0.8.orig/bcache.h 2014-12-04 23:51:24.000000000 +0100 |
167 |
++++ bcache-tools-1.0.8/bcache.h 2015-05-22 19:40:34.924320569 +0200 |
168 |
+@@ -115,7 +115,20 @@ |
169 |
+ #define BDEV_STATE_DIRTY 2U |
170 |
+ #define BDEV_STATE_STALE 3U |
171 |
+ |
172 |
+-uint64_t crc64(const void *_data, size_t len); |
173 |
++extern const uint64_t crc_table[]; |
174 |
++ |
175 |
++inline uint64_t crc64(const void *_data, size_t len) |
176 |
++{ |
177 |
++ uint64_t crc = 0xFFFFFFFFFFFFFFFFULL; |
178 |
++ const unsigned char *data = _data; |
179 |
++ |
180 |
++ while (len--) { |
181 |
++ int i = ((int) (crc >> 56) ^ *data++) & 0xFF; |
182 |
++ crc = crc_table[i] ^ (crc << 8); |
183 |
++ } |
184 |
++ |
185 |
++ return crc ^ 0xFFFFFFFFFFFFFFFFULL; |
186 |
++} |
187 |
+ |
188 |
+ #define node(i, j) ((void *) ((i)->d + (j))) |
189 |
+ #define end(i) node(i, (i)->keys) |
190 |
+Binary files bcache-tools-1.0.8.orig/bcache-register and bcache-tools-1.0.8/bcache-register differ |
191 |
|
192 |
diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch |
193 |
new file mode 100644 |
194 |
index 0000000..6d2d9f5 |
195 |
--- /dev/null |
196 |
+++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch |
197 |
@@ -0,0 +1,32 @@ |
198 |
+diff -ruN bcache-tools-1.0.8.orig/69-bcache.rules bcache-tools-1.0.8/69-bcache.rules |
199 |
+--- bcache-tools-1.0.8.orig/69-bcache.rules 2014-12-04 23:51:24.000000000 +0100 |
200 |
++++ bcache-tools-1.0.8/69-bcache.rules 2014-12-05 19:38:42.284643952 +0100 |
201 |
+@@ -7,17 +7,10 @@ |
202 |
+ KERNEL=="fd*|sr*", GOTO="bcache_end" |
203 |
+ |
204 |
+ # blkid was run by the standard udev rules |
205 |
+-# It recognised bcache (util-linux 2.24+) |
206 |
+-ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found" |
207 |
+-# It recognised something else; bail |
208 |
+-ENV{ID_FS_TYPE}=="?*", GOTO="bcache_backing_end" |
209 |
+- |
210 |
+ # Backing devices: scan, symlink, register |
211 |
+-IMPORT{program}="probe-bcache -o udev $tempnode" |
212 |
+ ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end" |
213 |
+ ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" |
214 |
+ |
215 |
+-LABEL="bcache_backing_found" |
216 |
+ RUN{builtin}+="kmod load bcache" |
217 |
+ RUN+="bcache-register $tempnode" |
218 |
+ LABEL="bcache_backing_end" |
219 |
+diff -ruN bcache-tools-1.0.8.orig/dracut/module-setup.sh bcache-tools-1.0.8/dracut/module-setup.sh |
220 |
+--- bcache-tools-1.0.8.orig/dracut/module-setup.sh 2014-12-04 23:51:24.000000000 +0100 |
221 |
++++ bcache-tools-1.0.8/dracut/module-setup.sh 2014-12-05 19:32:37.771480651 +0100 |
222 |
+@@ -29,6 +29,6 @@ |
223 |
+ } |
224 |
+ |
225 |
+ install() { |
226 |
+- inst_multiple ${udevdir}/probe-bcache ${udevdir}/bcache-register |
227 |
++ inst_multiple ${udevdir}/bcache-register |
228 |
+ inst_rules 69-bcache.rules |
229 |
+ } |
230 |
|
231 |
diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch |
232 |
new file mode 100644 |
233 |
index 0000000..993ec21 |
234 |
--- /dev/null |
235 |
+++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch |
236 |
@@ -0,0 +1,5 @@ |
237 |
+diff -ruN bcache-tools-20130827.orig/configure bcache-tools-20130827/configure |
238 |
+--- bcache-tools-20130827.orig/configure 1970-01-01 01:00:00.000000000 +0100 |
239 |
++++ bcache-tools-20130827/configure 2013-08-31 15:12:41.093218432 +0200 |
240 |
+@@ -0,0 +1 @@ |
241 |
++#!/bin/sh |
242 |
|
243 |
diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch |
244 |
new file mode 100644 |
245 |
index 0000000..3eabb3f |
246 |
--- /dev/null |
247 |
+++ b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch |
248 |
@@ -0,0 +1,49 @@ |
249 |
+diff -ruN bcache-tools-20130820.orig/bcache-status.8 bcache-tools-20130820/bcache-status.8 |
250 |
+--- bcache-tools-20130820.orig/bcache-status.8 1970-01-01 01:00:00.000000000 +0100 |
251 |
++++ bcache-tools-20130820/bcache-status.8 2013-08-26 23:32:02.477274882 +0200 |
252 |
+@@ -0,0 +1,45 @@ |
253 |
++.TH bcache-status 8 |
254 |
++.SH NAME |
255 |
++bcache-status \- Display useful bcache statistics |
256 |
++.SH SYNOPSIS |
257 |
++.B bcache-status |
258 |
++[\fB \--help\fR ] |
259 |
++[\fB \-f\fR ] |
260 |
++[\fB \-h\fR ] |
261 |
++[\fB \-d\fR ] |
262 |
++[\fB \-t\fR ] |
263 |
++[\fB \-a\fR ] |
264 |
++[\fB \-r\fR ] |
265 |
++[\fB \-s\fR ] |
266 |
++[\fB \-g\fR ] |
267 |
++.SH DESCRIPTION |
268 |
++This command displays useful bcache statistics in a convenient way. |
269 |
++.SH OPTIONS |
270 |
++.TP |
271 |
++.BR \---help |
272 |
++Print help message and exit. |
273 |
++.TP |
274 |
++.BR \-f,\ --five-minute |
275 |
++Print the last five minutes of stats. |
276 |
++.TP |
277 |
++.BR \-h,\ --hour |
278 |
++Print the last hour of stats. |
279 |
++.TP |
280 |
++.BR \-d,\ --day |
281 |
++Print the last day of stats. |
282 |
++.TP |
283 |
++.BR \-t,\ --total |
284 |
++Print total stats. |
285 |
++.TP |
286 |
++.BR \-a,\ --all |
287 |
++Print all stats. |
288 |
++.TP |
289 |
++.BR \-r,\ --reset-stats |
290 |
++Reset stats after printing them. |
291 |
++.TP |
292 |
++.BR \-s,\ --sub-status |
293 |
++Print subdevice status. |
294 |
++.TP |
295 |
++.BR \-g,\ --gc |
296 |
++Print subdevice status. |
297 |
++ |