1 |
commit: d3a2f3beb98b83316c57450bd09d0c3ffd8f2148 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 25 17:56:01 2016 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 25 17:56:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3a2f3be |
7 |
|
8 |
sys-cluster/ceph: Version bump to 10.2.1 (bug #583194) |
9 |
|
10 |
This also adds some preliminary code for unbundling dev-libs/jerasure and |
11 |
dev-libs/gf-complete (bug #463326), but it is commented out for the moment |
12 |
pending bugs 584056 and 584058. |
13 |
|
14 |
This also contains fixes for bugs 583550 and 582908. |
15 |
|
16 |
Package-Manager: portage-2.3.0_rc1 |
17 |
|
18 |
sys-cluster/ceph/Manifest | 1 + |
19 |
sys-cluster/ceph/ceph-10.2.1.ebuild | 262 +++++++++++++++ |
20 |
...l-doesnt-support-momit-leaf-frame-pointer.patch | 25 ++ |
21 |
.../ceph/files/ceph-10.2.1-unbundle-jerasure.patch | 355 +++++++++++++++++++++ |
22 |
4 files changed, 643 insertions(+) |
23 |
|
24 |
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest |
25 |
index b575c7d..0ca02c7 100644 |
26 |
--- a/sys-cluster/ceph/Manifest |
27 |
+++ b/sys-cluster/ceph/Manifest |
28 |
@@ -1,4 +1,5 @@ |
29 |
DIST ceph-0.80.10.tar.bz2 4136018 SHA256 a7ca8a3d0710ab88adcd5c52aebe0a8ee573e247c1ccf5d84eea8a9ff07a51fa SHA512 7823a489b7654457512d300050410b4a91d615fbb467d341c76e76b77364d6a2afa763bceb2c6cd8ed05a45d7b0aef4c3baf80155cc3223e940b439e0571f3c9 WHIRLPOOL a03fc3a4ca8c49157ff3b51528418ca62c3520c4141e402863cf3475a11b240be5297f731bf1a4e77a01a476e80f5e06c0722d688fbb8ad2db26ef1975a450da |
30 |
DIST ceph-0.94.6.tar.gz 9131464 SHA256 d2e65e21bdecdfa1fffb2661e9be2d5382bd975a0eb8296df0e96bacc11c251f SHA512 4920857d7493769929754877e3f255cc816400757b014b0c075d65ce9c83c47a86725540fa012eb95f9c6395a477945d3a46322f3055f05345298858fec53997 WHIRLPOOL cb1a230dc1f07903b3712d9d23df718b12df219255b680737d3a746e9cbeee0d0c3ddb21da6dad1e31fb4d77aa9b3283e2dbd6e59ca38146db2ae91c5e7d4229 |
31 |
DIST ceph-10.2.0.tar.gz 11667920 SHA256 1a39d919beccaa26ddfbaeac04eebb80f4d43946a59a18e2e25a9a805d5b262d SHA512 1277f08aa7f8e30d962e455d611ff21667334c27012b7a4c2e22faf0e03c0f3e3278c561ce7ea7548d065c26824e8d212b01303201d0749648b741d2a4eb0125 WHIRLPOOL 3d6e85888f74b629f67107199c4c5de5dffc2f7bdb639a24aaea8cce447710996281685623f667b95786b5218ec586ea1c0b497237ff344b857eb6cbffc28713 |
32 |
+DIST ceph-10.2.1.tar.gz 11697889 SHA256 f9f2f61b9d172f7ac55cde4c22564cf49d2421cdb312b0e7d191de5ab8ca8e9a SHA512 b0dfbca4ce1ebeb069455e7df068d0d3e777080f1bbf10553395106b8dbf198a74f381036c64dbe28854a221c5c5c4a0ac5eed2700b7658e829297610bcd8243 WHIRLPOOL 54c321506fc31875dfec4c4ee13335c8228ef311817cb1021694133303dd0bc9a7216aa46ad3ca529a95909b9974ece14e13db722a106f3130ed4dbc0899a07b |
33 |
DIST ceph-9.2.1.tar.gz 9933444 SHA256 1918dfc3df80df5986c5b7ff6bc6c78064eef0f6c5e8269dba30e08c703a7c2f SHA512 1e84c1e2d64f4156a523658ed11552b045f75986922b7b7dbaf4719e73a0a6aadc71eb2b94ae363526f729534a592921a437468a41a3cea88c1b84e09de8505a WHIRLPOOL 3a0eb6712e5b0235707e86129e1d66f1184f50cd4980c30f6d8cc0e7dfd96d30b91177ed16dd7abf2ad4983c6a543eb91915f74f661f7d3e3c810b5b1d656aca |
34 |
|
35 |
diff --git a/sys-cluster/ceph/ceph-10.2.1.ebuild b/sys-cluster/ceph/ceph-10.2.1.ebuild |
36 |
new file mode 100644 |
37 |
index 0000000..ab79bf3 |
38 |
--- /dev/null |
39 |
+++ b/sys-cluster/ceph/ceph-10.2.1.ebuild |
40 |
@@ -0,0 +1,262 @@ |
41 |
+# Copyright 1999-2016 Gentoo Foundation |
42 |
+# Distributed under the terms of the GNU General Public License v2 |
43 |
+# $Id$ |
44 |
+ |
45 |
+EAPI=6 |
46 |
+PYTHON_COMPAT=( python{2_7,3_{4,5}} ) |
47 |
+ |
48 |
+inherit check-reqs autotools eutils python-r1 udev user \ |
49 |
+ readme.gentoo-r1 systemd versionator flag-o-matic |
50 |
+ |
51 |
+if [[ ${PV} == *9999* ]]; then |
52 |
+ inherit git-r3 |
53 |
+ EGIT_REPO_URI=" |
54 |
+ git://github.com/ceph/ceph.git |
55 |
+ https://github.com/ceph/ceph.git" |
56 |
+ SRC_URI="" |
57 |
+else |
58 |
+ SRC_URI="http://ceph.com/download/${P}.tar.gz" |
59 |
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
60 |
+fi |
61 |
+ |
62 |
+DESCRIPTION="Ceph distributed filesystem" |
63 |
+HOMEPAGE="http://ceph.com/" |
64 |
+ |
65 |
+LICENSE="LGPL-2.1" |
66 |
+SLOT="0" |
67 |
+ |
68 |
+IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio" |
69 |
+IUSE+=" libatomic lttng +nss +radosgw static-libs tcmalloc test xfs zfs" |
70 |
+ |
71 |
+# unbundling code commented out pending bugs 584056 and 584058 |
72 |
+#>=dev-libs/jerasure-2.0.0-r1 |
73 |
+#>=dev-libs/gf-complete-2.0.0 |
74 |
+COMMON_DEPEND=" |
75 |
+ app-arch/snappy |
76 |
+ dev-libs/boost:=[threads] |
77 |
+ dev-libs/libaio |
78 |
+ dev-libs/libedit |
79 |
+ dev-python/sphinx[$(python_gen_usedep 'python2*')] |
80 |
+ dev-libs/leveldb[snappy] |
81 |
+ nss? ( dev-libs/nss ) |
82 |
+ libatomic? ( dev-libs/libatomic_ops ) |
83 |
+ cryptopp? ( dev-libs/crypto++ ) |
84 |
+ sys-apps/keyutils |
85 |
+ sys-apps/util-linux |
86 |
+ dev-libs/libxml2 |
87 |
+ radosgw? ( dev-libs/fcgi ) |
88 |
+ ldap? ( net-nds/openldap ) |
89 |
+ babeltrace? ( dev-util/babeltrace ) |
90 |
+ fuse? ( sys-fs/fuse ) |
91 |
+ xfs? ( sys-fs/xfsprogs ) |
92 |
+ zfs? ( sys-fs/zfs ) |
93 |
+ gtk? ( |
94 |
+ x11-libs/gtk+:2 |
95 |
+ dev-cpp/gtkmm:2.4 |
96 |
+ gnome-base/librsvg |
97 |
+ ) |
98 |
+ radosgw? ( |
99 |
+ dev-libs/fcgi |
100 |
+ dev-libs/expat |
101 |
+ net-misc/curl |
102 |
+ ) |
103 |
+ jemalloc? ( dev-libs/jemalloc ) |
104 |
+ !jemalloc? ( dev-util/google-perftools ) |
105 |
+ lttng? ( dev-util/lttng-ust ) |
106 |
+ ${PYTHON_DEPS} |
107 |
+ " |
108 |
+DEPEND="${COMMON_DEPEND} |
109 |
+ dev-python/cython[${PYTHON_USEDEP}] |
110 |
+ app-arch/cpio |
111 |
+ sys-apps/lsb-release |
112 |
+ virtual/pkgconfig |
113 |
+ test? ( |
114 |
+ sys-fs/btrfs-progs |
115 |
+ sys-apps/grep[pcre] |
116 |
+ dev-python/tox[${PYTHON_USEDEP}] |
117 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
118 |
+ )" |
119 |
+RDEPEND="${COMMON_DEPEND} |
120 |
+ sys-apps/which |
121 |
+ sys-apps/hdparm |
122 |
+ sys-block/parted |
123 |
+ sys-fs/cryptsetup |
124 |
+ sys-apps/gptfdisk |
125 |
+ sys-apps/findutils |
126 |
+ dev-python/flask[${PYTHON_USEDEP}] |
127 |
+ dev-python/requests[${PYTHON_USEDEP}] |
128 |
+ " |
129 |
+REQUIRED_USE=" |
130 |
+ $(python_gen_useflags 'python2*') |
131 |
+ ${PYTHON_REQUIRED_USE} |
132 |
+ ^^ ( nss cryptopp ) |
133 |
+ ?? ( jemalloc tcmalloc ) |
134 |
+ " |
135 |
+ |
136 |
+# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup') |
137 |
+REQUIRED_USE+=" radosgw" |
138 |
+ |
139 |
+RESTRICT="test? ( userpriv )" |
140 |
+ |
141 |
+# distribution tarball does not include everything needed for tests |
142 |
+RESTRICT+=" test" |
143 |
+ |
144 |
+STRIP_MASK="/usr/lib*/rados-classes/*" |
145 |
+ |
146 |
+UNBUNDLE_LIBS=( |
147 |
+ src/erasure-code/jerasure/jerasure |
148 |
+ src/erasure-code/jerasure/gf-complete |
149 |
+) |
150 |
+ |
151 |
+PATCHES=( |
152 |
+ "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch" |
153 |
+ #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch" |
154 |
+ "${FILESDIR}/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch" |
155 |
+) |
156 |
+ |
157 |
+check-reqs_export_vars() { |
158 |
+ if use debug; then |
159 |
+ CHECKREQS_DISK_BUILD="23G" |
160 |
+ CHECKREQS_DISK_USR="7G" |
161 |
+ elif use amd64; then |
162 |
+ CHECKREQS_DISK_BUILD="12G" |
163 |
+ CHECKREQS_DISK_USR="450M" |
164 |
+ else |
165 |
+ CHECKREQS_DISK_BUILD="1400M" |
166 |
+ CHECKREQS_DISK_USR="450M" |
167 |
+ fi |
168 |
+ |
169 |
+ export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR |
170 |
+} |
171 |
+ |
172 |
+user_setup() { |
173 |
+ enewgroup ceph |
174 |
+ enewuser ceph -1 -1 /var/lib/ceph ceph |
175 |
+} |
176 |
+ |
177 |
+emake_python_bindings() { |
178 |
+ local action="${1}" params binding |
179 |
+ shift |
180 |
+ params=("${@}") |
181 |
+ |
182 |
+ __emake_python_bindings_do_impl() { |
183 |
+ emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}" |
184 |
+ |
185 |
+ # these don't work and aren't needed on python3 |
186 |
+ if [[ ${EBUILD_PHASE} == install ]] && python_is_python3; then |
187 |
+ rm -f "${ED}/$(python_get_sitedir)"/ceph_{argparse,volume_client}.py |
188 |
+ fi |
189 |
+ } |
190 |
+ |
191 |
+ pushd "${S}/src" |
192 |
+ for binding in rados rbd $(use cephfs && echo cephfs); do |
193 |
+ python_foreach_impl __emake_python_bindings_do_impl |
194 |
+ done |
195 |
+ popd |
196 |
+ |
197 |
+ unset __emake_python_bindings_do_impl |
198 |
+} |
199 |
+ |
200 |
+pkg_pretend() { |
201 |
+ check-reqs_export_vars |
202 |
+ check-reqs_pkg_pretend |
203 |
+} |
204 |
+ |
205 |
+pkg_setup() { |
206 |
+ python_setup |
207 |
+ check-reqs_export_vars |
208 |
+ check-reqs_pkg_setup |
209 |
+ user_setup |
210 |
+} |
211 |
+ |
212 |
+src_prepare() { |
213 |
+ default |
214 |
+ |
215 |
+ # remove tests that need root access |
216 |
+ rm src/test/cli/ceph-authtool/cap*.t |
217 |
+ |
218 |
+ #rm -rf "${UNBUNDLE_LIBS[@]}" |
219 |
+ |
220 |
+ append-flags -fPIC |
221 |
+ eautoreconf |
222 |
+} |
223 |
+ |
224 |
+src_configure() { |
225 |
+ local myeconfargs=( |
226 |
+ --without-hadoop |
227 |
+ --includedir=/usr/include |
228 |
+ $(use_with cephfs) |
229 |
+ $(use_with debug) |
230 |
+ $(use_with fuse) |
231 |
+ $(use_with libaio) |
232 |
+ $(use_with libatomic libatomic-ops) |
233 |
+ $(use_with nss) |
234 |
+ $(use_with cryptopp) |
235 |
+ $(use_with radosgw) |
236 |
+ $(use_with gtk gtk2) |
237 |
+ $(use_enable static-libs static) |
238 |
+ $(use_with jemalloc) |
239 |
+ $(use_with xfs libxfs) |
240 |
+ $(use_with zfs libzfs) |
241 |
+ $(use_with lttng ) |
242 |
+ $(use_with babeltrace) |
243 |
+ $(use_with ldap openldap) |
244 |
+ $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") |
245 |
+ --with-mon |
246 |
+ --with-eventfd |
247 |
+ --with-cython |
248 |
+ --without-kinetic |
249 |
+ --without-librocksdb |
250 |
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
251 |
+ ) |
252 |
+ |
253 |
+ # we can only use python2.7 for building at the moment |
254 |
+ python_export python2.7 PYTHON EPYTHON |
255 |
+ econf "${myeconfargs[@]}" |
256 |
+} |
257 |
+ |
258 |
+src_compile() { |
259 |
+ emake |
260 |
+ emake_python_bindings all |
261 |
+ |
262 |
+ use test && emake check-local |
263 |
+} |
264 |
+ |
265 |
+src_test() { |
266 |
+ make check || die "make check failed" |
267 |
+} |
268 |
+ |
269 |
+src_install() { |
270 |
+ default |
271 |
+ emake_python_bindings install-exec "DESTDIR=\"${D}\"" |
272 |
+ |
273 |
+ prune_libtool_files --all |
274 |
+ |
275 |
+ exeinto /usr/$(get_libdir)/ceph |
276 |
+ newexe src/init-ceph ceph_init.sh |
277 |
+ |
278 |
+ insinto /etc/logrotate.d/ |
279 |
+ newins "${FILESDIR}"/ceph.logrotate ${PN} |
280 |
+ |
281 |
+ keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat |
282 |
+ |
283 |
+ fowners ceph:ceph /var/lib/ceph |
284 |
+ |
285 |
+ newinitd "${FILESDIR}/rbdmap.initd" rbdmap |
286 |
+ newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} |
287 |
+ newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} |
288 |
+ |
289 |
+ systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service" |
290 |
+ systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service" |
291 |
+ systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service" |
292 |
+ |
293 |
+ python_fix_shebang "${ED}"/usr/{,s}bin/ |
294 |
+ |
295 |
+ udev_dorules udev/*.rules |
296 |
+ |
297 |
+ readme.gentoo_create_doc |
298 |
+} |
299 |
+ |
300 |
+pkg_postinst() { |
301 |
+ readme.gentoo_print_elog |
302 |
+} |
303 |
|
304 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch b/sys-cluster/ceph/files/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch |
305 |
new file mode 100644 |
306 |
index 0000000..38d479a |
307 |
--- /dev/null |
308 |
+++ b/sys-cluster/ceph/files/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch |
309 |
@@ -0,0 +1,25 @@ |
310 |
+From 0160e50fa9b255ad338a50b97bcbb2bfa56aa93d Mon Sep 17 00:00:00 2001 |
311 |
+From: Your Name <you@×××××××.com> |
312 |
+Date: Tue, 3 May 2016 10:51:54 -0500 |
313 |
+Subject: [PATCH] armv7l doesnt support -momit-leaf-frame-pointer |
314 |
+ |
315 |
+--- |
316 |
+ src/rocksdb/Makefile | 2 +- |
317 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
318 |
+ |
319 |
+diff --git a/src/rocksdb/Makefile b/src/rocksdb/Makefile |
320 |
+index c64ea36..541dbf3 100644 |
321 |
+--- a/src/rocksdb/Makefile |
322 |
++++ b/src/rocksdb/Makefile |
323 |
+@@ -84,7 +84,7 @@ endif |
324 |
+ # compile with -O2 if debug level is not 2 |
325 |
+ ifneq ($(DEBUG_LEVEL), 2) |
326 |
+ OPT += -O2 -fno-omit-frame-pointer |
327 |
+-ifneq ($(MACHINE),ppc64) # ppc64 doesn't support -momit-leaf-frame-pointer |
328 |
++ifneq ($(MACHINE),$(filter $(MACHINE),ppc64 armv7l)) # ppc64 and armv7l doesn't support -momit-leaf-frame-pointer |
329 |
+ OPT += -momit-leaf-frame-pointer |
330 |
+ endif |
331 |
+ endif |
332 |
+-- |
333 |
+2.7.3 |
334 |
+ |
335 |
|
336 |
diff --git a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch b/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch |
337 |
new file mode 100644 |
338 |
index 0000000..8340b4d |
339 |
--- /dev/null |
340 |
+++ b/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch |
341 |
@@ -0,0 +1,355 @@ |
342 |
+diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am |
343 |
+index adcb95d..8099208 100644 |
344 |
+--- a/src/erasure-code/jerasure/Makefile.am |
345 |
++++ b/src/erasure-code/jerasure/Makefile.am |
346 |
+@@ -1,52 +1,17 @@ |
347 |
+ # jerasure plugin |
348 |
+ noinst_HEADERS += \ |
349 |
+- erasure-code/jerasure/gf-complete/include/gf_complete.h \ |
350 |
+- erasure-code/jerasure/gf-complete/include/gf_general.h \ |
351 |
+- erasure-code/jerasure/gf-complete/include/gf_int.h \ |
352 |
+- erasure-code/jerasure/gf-complete/include/gf_method.h \ |
353 |
+- erasure-code/jerasure/gf-complete/include/gf_rand.h \ |
354 |
+- erasure-code/jerasure/gf-complete/include/gf_w16.h \ |
355 |
+- erasure-code/jerasure/gf-complete/include/gf_w32.h \ |
356 |
+- erasure-code/jerasure/gf-complete/include/gf_w4.h \ |
357 |
+- erasure-code/jerasure/gf-complete/include/gf_w64.h \ |
358 |
+- erasure-code/jerasure/gf-complete/include/gf_w8.h \ |
359 |
+- erasure-code/jerasure/jerasure/include/cauchy.h \ |
360 |
+- erasure-code/jerasure/jerasure/include/galois.h \ |
361 |
+- erasure-code/jerasure/jerasure/include/jerasure.h \ |
362 |
+- erasure-code/jerasure/jerasure/include/liberation.h \ |
363 |
+- erasure-code/jerasure/jerasure/include/reed_sol.h \ |
364 |
+ erasure-code/jerasure/ErasureCodeJerasure.h |
365 |
+ |
366 |
+ jerasure_sources = \ |
367 |
+ erasure-code/ErasureCode.cc \ |
368 |
+- erasure-code/jerasure/jerasure/src/cauchy.c \ |
369 |
+- erasure-code/jerasure/jerasure/src/galois.c \ |
370 |
+- erasure-code/jerasure/jerasure/src/jerasure.c \ |
371 |
+- erasure-code/jerasure/jerasure/src/liberation.c \ |
372 |
+- erasure-code/jerasure/jerasure/src/reed_sol.c \ |
373 |
+- erasure-code/jerasure/gf-complete/src/gf_wgen.c \ |
374 |
+- erasure-code/jerasure/gf-complete/src/gf_method.c \ |
375 |
+- erasure-code/jerasure/gf-complete/src/gf_w16.c \ |
376 |
+- erasure-code/jerasure/gf-complete/src/gf.c \ |
377 |
+- erasure-code/jerasure/gf-complete/src/gf_w32.c \ |
378 |
+- erasure-code/jerasure/gf-complete/src/gf_w64.c \ |
379 |
+- erasure-code/jerasure/gf-complete/src/gf_w128.c \ |
380 |
+- erasure-code/jerasure/gf-complete/src/gf_general.c \ |
381 |
+- erasure-code/jerasure/gf-complete/src/gf_w4.c \ |
382 |
+- erasure-code/jerasure/gf-complete/src/gf_rand.c \ |
383 |
+- erasure-code/jerasure/gf-complete/src/gf_w8.c \ |
384 |
+ erasure-code/jerasure/ErasureCodePluginJerasure.cc \ |
385 |
+ erasure-code/jerasure/ErasureCodeJerasure.cc |
386 |
+ |
387 |
+ erasure-code/jerasure/ErasureCodePluginJerasure.cc: ./ceph_ver.h |
388 |
+ |
389 |
+ libec_jerasure_generic_la_SOURCES = ${jerasure_sources} |
390 |
+-libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} \ |
391 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
392 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
393 |
+-libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
394 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
395 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
396 |
++libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} |
397 |
++libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} |
398 |
+ libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
399 |
+ libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared |
400 |
+ if LINUX |
401 |
+@@ -55,20 +20,11 @@ endif |
402 |
+ |
403 |
+ erasure_codelib_LTLIBRARIES += libec_jerasure_generic.la |
404 |
+ |
405 |
+-libec_jerasure_neon_la_SOURCES = ${jerasure_sources} \ |
406 |
+- erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \ |
407 |
+- erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \ |
408 |
+- erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \ |
409 |
+- erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \ |
410 |
+- erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c |
411 |
++libec_jerasure_neon_la_SOURCES = ${jerasure_sources} |
412 |
+ libec_jerasure_neon_la_CFLAGS = ${AM_CFLAGS} \ |
413 |
+- ${ARM_NEON_FLAGS} \ |
414 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
415 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
416 |
++ ${ARM_NEON_FLAGS} |
417 |
+ libec_jerasure_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
418 |
+- ${ARM_NEON_FLAGS} \ |
419 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
420 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
421 |
++ ${ARM_NEON_FLAGS} |
422 |
+ libec_jerasure_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
423 |
+ libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared |
424 |
+ if LINUX |
425 |
+@@ -84,16 +40,12 @@ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} \ |
426 |
+ ${INTEL_SSE_FLAGS} \ |
427 |
+ ${INTEL_SSE2_FLAGS} \ |
428 |
+ ${INTEL_SSE3_FLAGS} \ |
429 |
+- ${INTEL_SSSE3_FLAGS} \ |
430 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
431 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
432 |
++ ${INTEL_SSSE3_FLAGS} |
433 |
+ libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
434 |
+ ${INTEL_SSE_FLAGS} \ |
435 |
+ ${INTEL_SSE2_FLAGS} \ |
436 |
+ ${INTEL_SSE3_FLAGS} \ |
437 |
+- ${INTEL_SSSE3_FLAGS} \ |
438 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
439 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
440 |
++ ${INTEL_SSSE3_FLAGS} |
441 |
+ libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
442 |
+ libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared |
443 |
+ if LINUX |
444 |
+@@ -111,18 +63,14 @@ libec_jerasure_sse4_la_CFLAGS = ${AM_CFLAGS} \ |
445 |
+ ${INTEL_SSE3_FLAGS} \ |
446 |
+ ${INTEL_SSSE3_FLAGS} \ |
447 |
+ ${INTEL_SSE4_1_FLAGS} \ |
448 |
+- ${INTEL_SSE4_2_FLAGS} \ |
449 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
450 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
451 |
++ ${INTEL_SSE4_2_FLAGS} |
452 |
+ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
453 |
+ ${INTEL_SSE_FLAGS} \ |
454 |
+ ${INTEL_SSE2_FLAGS} \ |
455 |
+ ${INTEL_SSE3_FLAGS} \ |
456 |
+ ${INTEL_SSSE3_FLAGS} \ |
457 |
+ ${INTEL_SSE4_1_FLAGS} \ |
458 |
+- ${INTEL_SSE4_2_FLAGS} \ |
459 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
460 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include |
461 |
++ ${INTEL_SSE4_2_FLAGS} |
462 |
+ libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
463 |
+ libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared |
464 |
+ if LINUX |
465 |
+diff --git a/src/erasure-code/shec/ErasureCodePluginShec.cc b/src/erasure-code/shec/ErasureCodePluginShec.cc |
466 |
+index d2b72f5..acbd172 100644 |
467 |
+--- a/src/erasure-code/shec/ErasureCodePluginShec.cc |
468 |
++++ b/src/erasure-code/shec/ErasureCodePluginShec.cc |
469 |
+@@ -71,7 +71,7 @@ public: |
470 |
+ }; |
471 |
+ |
472 |
+ extern "C" { |
473 |
+-#include "jerasure/include/galois.h" |
474 |
++#include "galois.h" |
475 |
+ |
476 |
+ extern gf_t *gfp_array[]; |
477 |
+ extern int gfp_is_composite[]; |
478 |
+diff --git a/src/erasure-code/shec/ErasureCodeShec.cc b/src/erasure-code/shec/ErasureCodeShec.cc |
479 |
+index 2180328..c84ffc7 100644 |
480 |
+--- a/src/erasure-code/shec/ErasureCodeShec.cc |
481 |
++++ b/src/erasure-code/shec/ErasureCodeShec.cc |
482 |
+@@ -28,8 +28,8 @@ |
483 |
+ #include "crush/CrushWrapper.h" |
484 |
+ #include "osd/osd_types.h" |
485 |
+ extern "C" { |
486 |
+-#include "jerasure/include/jerasure.h" |
487 |
+-#include "jerasure/include/galois.h" |
488 |
++#include "jerasure.h" |
489 |
++#include "galois.h" |
490 |
+ |
491 |
+ extern int calc_determinant(int *matrix, int dim); |
492 |
+ extern int* reed_sol_vandermonde_coding_matrix(int k, int m, int w); |
493 |
+diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am |
494 |
+index 6b658d5..3281c60 100644 |
495 |
+--- a/src/erasure-code/shec/Makefile.am |
496 |
++++ b/src/erasure-code/shec/Makefile.am |
497 |
+@@ -4,49 +4,19 @@ shec_sources = \ |
498 |
+ erasure-code/shec/ErasureCodePluginShec.cc \ |
499 |
+ erasure-code/shec/ErasureCodeShec.cc \ |
500 |
+ erasure-code/shec/ErasureCodeShecTableCache.cc \ |
501 |
+- erasure-code/shec/determinant.c \ |
502 |
+- erasure-code/jerasure/jerasure/src/cauchy.c \ |
503 |
+- erasure-code/jerasure/jerasure/src/galois.c \ |
504 |
+- erasure-code/jerasure/jerasure/src/jerasure.c \ |
505 |
+- erasure-code/jerasure/jerasure/src/liberation.c \ |
506 |
+- erasure-code/jerasure/jerasure/src/reed_sol.c \ |
507 |
+- erasure-code/jerasure/gf-complete/src/gf_wgen.c \ |
508 |
+- erasure-code/jerasure/gf-complete/src/gf_method.c \ |
509 |
+- erasure-code/jerasure/gf-complete/src/gf_w16.c \ |
510 |
+- erasure-code/jerasure/gf-complete/src/gf.c \ |
511 |
+- erasure-code/jerasure/gf-complete/src/gf_w32.c \ |
512 |
+- erasure-code/jerasure/gf-complete/src/gf_w64.c \ |
513 |
+- erasure-code/jerasure/gf-complete/src/gf_w128.c \ |
514 |
+- erasure-code/jerasure/gf-complete/src/gf_general.c \ |
515 |
+- erasure-code/jerasure/gf-complete/src/gf_w4.c \ |
516 |
+- erasure-code/jerasure/gf-complete/src/gf_rand.c \ |
517 |
+- erasure-code/jerasure/gf-complete/src/gf_w8.c |
518 |
++ erasure-code/shec/determinant.c |
519 |
+ |
520 |
+ noinst_HEADERS += \ |
521 |
+ erasure-code/shec/ErasureCodeShec.h \ |
522 |
+- erasure-code/shec/ErasureCodeShecTableCache.h \ |
523 |
+- erasure-code/jerasure/jerasure/include/cauchy.h \ |
524 |
+- erasure-code/jerasure/jerasure/include/galois.h \ |
525 |
+- erasure-code/jerasure/jerasure/include/jerasure.h \ |
526 |
+- erasure-code/jerasure/jerasure/include/liberation.h \ |
527 |
+- erasure-code/jerasure/jerasure/include/reed_sol.h \ |
528 |
+- erasure-code/jerasure/gf-complete/include/gf_int.h \ |
529 |
+- erasure-code/jerasure/gf-complete/include/gf_complete.h \ |
530 |
+- erasure-code/jerasure/gf-complete/include/gf_rand.h \ |
531 |
+- erasure-code/jerasure/gf-complete/include/gf_method.h \ |
532 |
+- erasure-code/jerasure/gf-complete/include/gf_general.h |
533 |
++ erasure-code/shec/ErasureCodeShecTableCache.h |
534 |
+ |
535 |
+ erasure-code/shec/ErasureCodePluginShec.cc: ./ceph_ver.h |
536 |
+ |
537 |
+ libec_shec_generic_la_SOURCES = ${shec_sources} |
538 |
+ libec_shec_generic_la_CFLAGS = ${AM_CFLAGS} \ |
539 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
540 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
541 |
+ -I$(srcdir)/erasure-code/jerasure \ |
542 |
+ -I$(srcdir)/erasure-code/shec |
543 |
+ libec_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
544 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
545 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
546 |
+ -I$(srcdir)/erasure-code/jerasure \ |
547 |
+ -I$(srcdir)/erasure-code/shec |
548 |
+ libec_shec_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
549 |
+@@ -57,22 +27,13 @@ endif |
550 |
+ |
551 |
+ erasure_codelib_LTLIBRARIES += libec_shec_generic.la |
552 |
+ |
553 |
+-libec_shec_neon_la_SOURCES = ${shec_sources} \ |
554 |
+- erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \ |
555 |
+- erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \ |
556 |
+- erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \ |
557 |
+- erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \ |
558 |
+- erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c |
559 |
++libec_shec_neon_la_SOURCES = ${shec_sources} |
560 |
+ libec_shec_neon_la_CFLAGS = ${AM_CFLAGS} \ |
561 |
+ ${ARM_NEON_FLAGS} \ |
562 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
563 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
564 |
+ -I$(srcdir)/erasure-code/jerasure \ |
565 |
+ -I$(srcdir)/erasure-code/shec |
566 |
+ libec_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
567 |
+ ${ARM_NEON_FLAGS} \ |
568 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
569 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
570 |
+ -I$(srcdir)/erasure-code/jerasure \ |
571 |
+ -I$(srcdir)/erasure-code/shec |
572 |
+ libec_shec_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
573 |
+@@ -91,8 +52,6 @@ libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS} \ |
574 |
+ ${INTEL_SSE2_FLAGS} \ |
575 |
+ ${INTEL_SSE3_FLAGS} \ |
576 |
+ ${INTEL_SSSE3_FLAGS} \ |
577 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
578 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
579 |
+ -I$(srcdir)/erasure-code/jerasure \ |
580 |
+ -I$(srcdir)/erasure-code/shec |
581 |
+ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
582 |
+@@ -100,8 +59,6 @@ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
583 |
+ ${INTEL_SSE2_FLAGS} \ |
584 |
+ ${INTEL_SSE3_FLAGS} \ |
585 |
+ ${INTEL_SSSE3_FLAGS} \ |
586 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
587 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
588 |
+ -I$(srcdir)/erasure-code/jerasure \ |
589 |
+ -I$(srcdir)/erasure-code/shec |
590 |
+ libec_shec_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
591 |
+@@ -122,8 +79,6 @@ libec_shec_sse4_la_CFLAGS = ${AM_CFLAGS} \ |
592 |
+ ${INTEL_SSSE3_FLAGS} \ |
593 |
+ ${INTEL_SSE4_1_FLAGS} \ |
594 |
+ ${INTEL_SSE4_2_FLAGS} \ |
595 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
596 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
597 |
+ -I$(srcdir)/erasure-code/jerasure \ |
598 |
+ -I$(srcdir)/erasure-code/shec |
599 |
+ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
600 |
+@@ -133,8 +88,6 @@ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \ |
601 |
+ ${INTEL_SSSE3_FLAGS} \ |
602 |
+ ${INTEL_SSE4_1_FLAGS} \ |
603 |
+ ${INTEL_SSE4_2_FLAGS} \ |
604 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
605 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
606 |
+ -I$(srcdir)/erasure-code/jerasure \ |
607 |
+ -I$(srcdir)/erasure-code/shec |
608 |
+ libec_shec_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS) |
609 |
+diff --git a/src/erasure-code/shec/determinant.c b/src/erasure-code/shec/determinant.c |
610 |
+index 15b62c9..bf5d290 100755 |
611 |
+--- a/src/erasure-code/shec/determinant.c |
612 |
++++ b/src/erasure-code/shec/determinant.c |
613 |
+@@ -19,7 +19,7 @@ |
614 |
+ #include <stdlib.h> |
615 |
+ #include <string.h> |
616 |
+ |
617 |
+-#include "jerasure/include/galois.h" |
618 |
++#include "galois.h" |
619 |
+ |
620 |
+ void print_matrix(int *mat, int dim) |
621 |
+ { |
622 |
+diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am |
623 |
+index bdce080..11895ae 100644 |
624 |
+--- a/src/test/erasure-code/Makefile.am |
625 |
++++ b/src/test/erasure-code/Makefile.am |
626 |
+@@ -166,12 +166,8 @@ check_TESTPROGRAMS += unittest_erasure_code |
627 |
+ unittest_erasure_code_jerasure_SOURCES = \ |
628 |
+ test/erasure-code/TestErasureCodeJerasure.cc \ |
629 |
+ ${jerasure_sources} |
630 |
+-unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) \ |
631 |
+- -Ierasure-code/jerasure/gf-complete/include \ |
632 |
+- -Ierasure-code/jerasure/jerasure/include |
633 |
+-unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) \ |
634 |
+- -Ierasure-code/jerasure/gf-complete/include \ |
635 |
+- -Ierasure-code/jerasure/jerasure/include |
636 |
++unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) |
637 |
++unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) |
638 |
+ unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) |
639 |
+ if LINUX |
640 |
+ unittest_erasure_code_jerasure_LDADD += -ldl |
641 |
+@@ -232,13 +228,9 @@ unittest_erasure_code_shec_SOURCES = \ |
642 |
+ test/erasure-code/TestErasureCodeShec.cc \ |
643 |
+ ${shec_sources} |
644 |
+ unittest_erasure_code_shec_CFLAGS = ${libec_shec_la_CFLAGS} \ |
645 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
646 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
647 |
+ -I$(srcdir)/erasure-code/jerasure \ |
648 |
+ -I$(srcdir)/erasure-code/shec |
649 |
+ unittest_erasure_code_shec_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ |
650 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
651 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
652 |
+ -I$(srcdir)/erasure-code/jerasure \ |
653 |
+ -I$(srcdir)/erasure-code/shec |
654 |
+ unittest_erasure_code_shec_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) |
655 |
+@@ -251,13 +243,9 @@ unittest_erasure_code_shec_all_SOURCES = \ |
656 |
+ test/erasure-code/TestErasureCodeShec_all.cc \ |
657 |
+ ${shec_sources} |
658 |
+ unittest_erasure_code_shec_all_CFLAGS = ${libec_shec_la_CFLAGS} \ |
659 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
660 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
661 |
+ -I$(srcdir)/erasure-code/jerasure \ |
662 |
+ -I$(srcdir)/erasure-code/shec |
663 |
+ unittest_erasure_code_shec_all_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ |
664 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
665 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
666 |
+ -I$(srcdir)/erasure-code/jerasure \ |
667 |
+ -I$(srcdir)/erasure-code/shec |
668 |
+ unittest_erasure_code_shec_all_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) |
669 |
+@@ -270,13 +258,9 @@ unittest_erasure_code_shec_thread_SOURCES = \ |
670 |
+ test/erasure-code/TestErasureCodeShec_thread.cc \ |
671 |
+ ${shec_sources} |
672 |
+ unittest_erasure_code_shec_thread_CFLAGS = ${libec_shec_la_CFLAGS} \ |
673 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
674 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
675 |
+ -I$(srcdir)/erasure-code/jerasure \ |
676 |
+ -I$(srcdir)/erasure-code/shec |
677 |
+ unittest_erasure_code_shec_thread_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ |
678 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
679 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
680 |
+ -I$(srcdir)/erasure-code/jerasure \ |
681 |
+ -I$(srcdir)/erasure-code/shec |
682 |
+ unittest_erasure_code_shec_thread_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) |
683 |
+@@ -289,13 +273,9 @@ unittest_erasure_code_shec_arguments_SOURCES = \ |
684 |
+ test/erasure-code/TestErasureCodeShec_arguments.cc \ |
685 |
+ ${shec_sources} |
686 |
+ unittest_erasure_code_shec_arguments_CFLAGS = ${libec_shec_la_CFLAGS} \ |
687 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
688 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
689 |
+ -I$(srcdir)/erasure-code/jerasure \ |
690 |
+ -I$(srcdir)/erasure-code/shec |
691 |
+ unittest_erasure_code_shec_arguments_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \ |
692 |
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \ |
693 |
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \ |
694 |
+ -I$(srcdir)/erasure-code/jerasure \ |
695 |
+ -I$(srcdir)/erasure-code/shec |
696 |
+ unittest_erasure_code_shec_arguments_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) |