1 |
commit: 7e701f402c195fc8e6851d2af9bbd56d65831558 |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 30 14:45:34 2012 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 30 14:45:34 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7e701f40 |
7 |
|
8 |
net-fs/cvmfs: now in main tree |
9 |
|
10 |
--- |
11 |
net-fs/cvmfs/ChangeLog | 16 -- |
12 |
net-fs/cvmfs/cvmfs-2.0.18.ebuild | 124 ----------- |
13 |
net-fs/cvmfs/files/cvmfs-2.0.18-autotools.patch | 215 -------------------- |
14 |
.../cvmfs/files/cvmfs-2.0.18-no-redhat-init.patch | 22 -- |
15 |
net-fs/cvmfs/files/cvmfs-2.0.18-openrc.patch | 82 -------- |
16 |
net-fs/cvmfs/files/cvmfs-2.0.18-spinlock.patch | 15 -- |
17 |
.../cvmfs/files/cvmfs-2.0.18-system-redirfs.patch | 16 -- |
18 |
net-fs/cvmfs/files/cvmfs.initd | 195 ------------------ |
19 |
net-fs/cvmfs/files/cvmfsd.initd | 191 ----------------- |
20 |
net-fs/cvmfs/metadata.xml | 22 -- |
21 |
10 files changed, 0 insertions(+), 898 deletions(-) |
22 |
|
23 |
diff --git a/net-fs/cvmfs/ChangeLog b/net-fs/cvmfs/ChangeLog |
24 |
deleted file mode 100644 |
25 |
index 30b13a0..0000000 |
26 |
--- a/net-fs/cvmfs/ChangeLog |
27 |
+++ /dev/null |
28 |
@@ -1,16 +0,0 @@ |
29 |
-# ChangeLog for net-fs/cvmfs |
30 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
31 |
-# $Header: $ |
32 |
- |
33 |
- 25 Jul 2012; Sébastien Fabbro <bicatali@g.o> cvmfs-2.0.18.ebuild, |
34 |
- files/cvmfs-2.0.18-openrc.patch, files/cvmfs.initd: |
35 |
- net-fs/cvmfs: fixed client init and setup, added config stage |
36 |
- |
37 |
-*cvmfs-2.0.18 (25 Jul 2012) |
38 |
- |
39 |
- 25 Jul 2012; Sébastien Fabbro <bicatali@g.o> +cvmfs-2.0.18.ebuild, |
40 |
- +files/cvmfs-2.0.18-autotools.patch, +files/cvmfs-2.0.18-no-redhat-init.patch, |
41 |
- +files/cvmfs-2.0.18-openrc.patch, +files/cvmfs-2.0.18-spinlock.patch, |
42 |
- +files/cvmfs-2.0.18-system-redirfs.patch, +files/cvmfs.initd, |
43 |
- +files/cvmfsd.confd, +files/cvmfsd.initd, +metadata.xml: |
44 |
- net-fs/cvmfs: Initial import, need more work |
45 |
|
46 |
diff --git a/net-fs/cvmfs/cvmfs-2.0.18.ebuild b/net-fs/cvmfs/cvmfs-2.0.18.ebuild |
47 |
deleted file mode 100644 |
48 |
index c84a8ff..0000000 |
49 |
--- a/net-fs/cvmfs/cvmfs-2.0.18.ebuild |
50 |
+++ /dev/null |
51 |
@@ -1,124 +0,0 @@ |
52 |
-# Copyright 1999-2012 Gentoo Foundation |
53 |
-# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: $ |
55 |
- |
56 |
-EAPI=4 |
57 |
- |
58 |
-inherit eutils autotools toolchain-funcs linux-mod |
59 |
- |
60 |
-DESCRIPTION="HTTP read-only file system for distributing software" |
61 |
-HOMEPAGE="http://cernvm.cern.ch/portal/filesystem" |
62 |
-SRC_URI="https://ecsft.cern.ch/dist/${PN}/${P}/${P}.tar.gz" |
63 |
- |
64 |
-LICENSE="BSD" |
65 |
-SLOT="0" |
66 |
- |
67 |
-KEYWORDS="~amd64 ~x86" |
68 |
-IUSE="+client doc openmp server" |
69 |
- |
70 |
-CDEPEND="dev-db/sqlite:3 |
71 |
- dev-libs/openssl |
72 |
- sys-libs/zlib |
73 |
- client? ( |
74 |
- dev-libs/jemalloc |
75 |
- net-misc/curl |
76 |
- sys-fs/fuse ) |
77 |
- server? ( >=sys-fs/redirfs-0.11 )" |
78 |
- |
79 |
-RDEPEND="${CDEPEND} |
80 |
- client? ( net-fs/autofs )" |
81 |
- |
82 |
-DEPEND="${CDEPEND} |
83 |
- virtual/pkgconfig |
84 |
- doc? ( app-doc/doxygen[dot] )" |
85 |
- |
86 |
- |
87 |
-# either client or server is required and are mutually exclusive |
88 |
-REQUIRED_USE="^^ ( client server )" |
89 |
- |
90 |
-pkg_setup() { |
91 |
- if use server && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp |
92 |
- then |
93 |
- ewarn "You are using a gcc without OpenMP capabilities" |
94 |
- die "Need an OpenMP capable compiler" |
95 |
- fi |
96 |
- if use server; then |
97 |
- MODULE_NAMES="cvmfsflt(misc:${S}/kernel/cvmfsflt/src)" |
98 |
- BUILD_PARAMS="-C ${KERNEL_DIR} M=${S}/kernel/cvmfsflt/src" |
99 |
- BUILD_TARGETS="cvmfsflt.ko" |
100 |
- linux-mod_pkg_setup |
101 |
- fi |
102 |
-} |
103 |
- |
104 |
-src_prepare() { |
105 |
- epatch \ |
106 |
- "${FILESDIR}"/${P}-autotools.patch \ |
107 |
- "${FILESDIR}"/${P}-no-redhat-init.patch \ |
108 |
- "${FILESDIR}"/${P}-system-redirfs.patch \ |
109 |
- "${FILESDIR}"/${P}-spinlock.patch \ |
110 |
- "${FILESDIR}"/${P}-openrc.patch |
111 |
- eautoreconf |
112 |
-} |
113 |
- |
114 |
-src_configure() { |
115 |
- econf \ |
116 |
- --disable-sqlite3-builtin \ |
117 |
- --disable-libcurl-builtin \ |
118 |
- --disable-zlib-builtin \ |
119 |
- --disable-jemalloc-builtin \ |
120 |
- $(use_enable client cvmfs) \ |
121 |
- $(use_enable client mount-scripts) \ |
122 |
- $(use_enable openmp) \ |
123 |
- $(use_enable server) |
124 |
-} |
125 |
- |
126 |
-src_compile() { |
127 |
- emake |
128 |
- use server && linux-mod_src_compile |
129 |
- use doc && doxygen doc/cvmfs.doxy |
130 |
-} |
131 |
- |
132 |
-src_install() { |
133 |
- default |
134 |
- # NEWS file is empty |
135 |
- rm "${ED}"/usr/share/doc/${PF}/{INSTALL,NEWS,COPYING} |
136 |
- |
137 |
- use client && newinitd "${FILESDIR}"/${PN}.initd ${PN} |
138 |
- if use server; then |
139 |
- linux-mod_src_install |
140 |
- newinitd "${FILESDIR}"/${PN}d.initd ${PN}d |
141 |
- newconfd "${FILESDIR}"/${PN}d.confd ${PN}d |
142 |
- fi |
143 |
- use doc && dohtml -r doc/html/* |
144 |
-} |
145 |
- |
146 |
-pkg_preinst() { |
147 |
- use server && linux-mod_pkg_preinst |
148 |
-} |
149 |
- |
150 |
-pkg_postinst() { |
151 |
- use server && linux-mod_pkg_postinst |
152 |
-} |
153 |
- |
154 |
-pkg_postrm() { |
155 |
- use server && linux-mod_pkg_postrm |
156 |
-} |
157 |
- |
158 |
-pkg_config() { |
159 |
- if use client; then |
160 |
- einfo "Setting up CernVM-FS client" |
161 |
- cvmfs_config setup |
162 |
- cat > ${EROOT}/etc/cvmfs/default.local <<-EOF |
163 |
- # Repositories to fetch example is for ATLAS |
164 |
- CVMFS_REPOSITORIES=atlas.cern.ch,atlas-condb.cern.ch,grid.cern.ch |
165 |
- # Local proxy settings, ex: http://cernvm.cern.ch/config/proxy.cgi |
166 |
- CVMFS_HTTP_PROXY="DIRECT" |
167 |
- # Where to keep the cvmfs cache |
168 |
- CVMFS_CACHE_BASE=${EROOT}/var/scratch/cvmfs |
169 |
- # Quota limit in Mb |
170 |
- CVMFS_QUOTA_LIMIT=10000 |
171 |
- EOF |
172 |
- einfo "Now edit ${EROOT}/etc/cvmfs/default.local and run" |
173 |
- einfo " ${EROOT}/usr/init.d/cvmfs restart" |
174 |
- fi |
175 |
-} |
176 |
|
177 |
diff --git a/net-fs/cvmfs/files/cvmfs-2.0.18-autotools.patch b/net-fs/cvmfs/files/cvmfs-2.0.18-autotools.patch |
178 |
deleted file mode 100644 |
179 |
index ef28e41..0000000 |
180 |
--- a/net-fs/cvmfs/files/cvmfs-2.0.18-autotools.patch |
181 |
+++ /dev/null |
182 |
@@ -1,215 +0,0 @@ |
183 |
-Patch for various autotools fixes: |
184 |
-* cleaner enable/disable functions |
185 |
-* allow to build against system jemalloc |
186 |
-* adapated to newer autoconf with standard macros |
187 |
-* use LDADD instead of LDFLAGS to respect user's flags |
188 |
- |
189 |
-bicatali@g.o 07/2012 |
190 |
- |
191 |
-diff -Nur cvmfs-2.0.18.orig/configure.ac cvmfs-2.0.18/configure.ac |
192 |
---- cvmfs-2.0.18.orig/configure.ac 2012-06-04 08:03:21.000000000 +0100 |
193 |
-+++ cvmfs-2.0.18/configure.ac 2012-07-23 22:12:37.000000000 +0100 |
194 |
-@@ -9,20 +9,22 @@ |
195 |
- AC_CONFIG_HEADER([config.h]) |
196 |
- AH_BOTTOM([#define CVMFS_PATCH_LEVEL "0"]) |
197 |
- |
198 |
--AC_ARG_ENABLE([cvmfs], AC_HELP_STRING([--disable-cvmfs], [Don't build the CernVM-FS FUSE module]), AC_SUBST([HAVE_CVMFS], [no])) |
199 |
--AC_ARG_ENABLE([server], AC_HELP_STRING([--disable-server], [Don't build writer's end programs]), AC_SUBST([HAVE_SERVER], [no])) |
200 |
--AC_ARG_ENABLE([sqlite3-builtin], AC_HELP_STRING([--enable-sqlite3-builtin], [Don't use system SQLite3]), AC_SUBST([USE_BUILTIN_SQLITE3], [yes])) |
201 |
--AC_ARG_ENABLE([libcurl-builtin], AC_HELP_STRING([--enable-libcurl-builtin], [Don't use system libcurl]), AC_SUBST([USE_BUILTIN_LIBCURL], [yes])) |
202 |
-+AC_ARG_ENABLE([cvmfs], AC_HELP_STRING([--disable-cvmfs], [Don't build the CernVM-FS FUSE module]), AC_SUBST([HAVE_CVMFS], [$enableval]),AC_SUBST([HAVE_CVMFS], [yes])) |
203 |
-+AC_ARG_ENABLE([server], AC_HELP_STRING([--disable-server], [Don't build writer's end programs]), AC_SUBST([HAVE_SERVER], [$enableval]),AC_SUBST([HAVE_SERVER], [yes])) |
204 |
-+AC_ARG_ENABLE([sqlite3-builtin], AC_HELP_STRING([--enable-sqlite3-builtin], [Don't use system SQLite3]), AC_SUBST([USE_BUILTIN_SQLITE3], [$enableval]),AC_SUBST([USE_BUILTIN_SQLITE3], [no])) |
205 |
-+AC_ARG_ENABLE([libcurl-builtin], AC_HELP_STRING([--enable-libcurl-builtin], [Don't use system libcurl]), AC_SUBST([USE_BUILTIN_LIBCURL], [$enableval]),AC_SUBST([USE_BUILTIN_LIBCURL], [no])) |
206 |
- dnl AC_ARG_ENABLE([libfuse-builtin], AC_HELP_STRING([--enable-libfuse-builtin], [Don't use system libfuse]), AC_SUBST([USE_BUILTIN_LIBFUSE], [yes])) |
207 |
--AC_ARG_ENABLE([zlib-builtin], AC_HELP_STRING([--enable-zlib-builtin], [Don't use system]), AC_SUBST([USE_BUILTIN_ZLIB], [yes])) |
208 |
--AC_ARG_ENABLE([kernel-module], AC_HELP_STRING([--enable-kernel-module], [Build the kernel module for the server part]), AC_SUBST([HAVE_KMODULE], [yes])) |
209 |
--AC_ARG_ENABLE([mount-scripts], AC_HELP_STRING([--enable-mount-scripts], [Install CernVM-FS mount tools in /etc and /sbin]), AC_SUBST([HAVE_MOUNTSCRIPTS], [yes])) |
210 |
-+AC_ARG_ENABLE([zlib-builtin], AC_HELP_STRING([--enable-zlib-builtin], [Don't use system]), AC_SUBST([USE_BUILTIN_ZLIB], [$enableval]),AC_SUBST([USE_BUILTIN_ZLIB], [no])) |
211 |
-+AC_ARG_ENABLE([jemalloc-builtin], AC_HELP_STRING([--enable-jemalloc-builtin], [Don't use system jemalloc]), AC_SUBST([USE_BUILTIN_JEMALLOC], [$enableval]),AC_SUBST([USE_BUILTIN_JEMALLOC], [no])) |
212 |
-+AC_ARG_ENABLE([kernel-module], AC_HELP_STRING([--enable-kernel-module], [Build the kernel module for the server part]), AC_SUBST([HAVE_KMODULE], [$enableval]),AC_SUBST([HAVE_KMODULE], [no])) |
213 |
-+AC_ARG_ENABLE([mount-scripts], AC_HELP_STRING([--enable-mount-scripts], [Install CernVM-FS mount tools in /etc and /sbin]), AC_SUBST([HAVE_MOUNTSCRIPTS], [$enableval]),AC_SUBST([HAVE_MOUNTSCRIPTS], [no])) |
214 |
- AM_CONDITIONAL([BUILD_CVMFS], [test x$HAVE_CVMFS != xno]) |
215 |
- AM_CONDITIONAL([BUILD_SERVER], [test x$HAVE_SERVER != xno]) |
216 |
- AM_CONDITIONAL([SYSTEM_SQLITE3], [test x$USE_BUILTIN_SQLITE3 != xyes]) |
217 |
- AM_CONDITIONAL([SYSTEM_LIBCURL], [test x$USE_BUILTIN_LIBCURL != xyes]) |
218 |
- AM_CONDITIONAL([SYSTEM_LIBFUSE], [test x != x]) |
219 |
- AM_CONDITIONAL([SYSTEM_ZLIB], [test x$USE_BUILTIN_ZLIB != xyes]) |
220 |
-+AM_CONDITIONAL([SYSTEM_JEMALLOC], [test x$USE_BUILTIN_JEMALLOC != xyes]) |
221 |
- AM_CONDITIONAL([BUILD_KMODULE], [test x$HAVE_KMODULE == xyes]) |
222 |
- AM_CONDITIONAL([BUILD_MEMCACHED], [test x$HAVE_MEMCACHED == xyes]) |
223 |
- AM_CONDITIONAL([BUILD_MOUNTSCRIPTS], [test x$HAVE_MOUNTSCRIPTS == xyes]) |
224 |
-@@ -35,6 +37,7 @@ |
225 |
- dnl AC_PROG_LIBTOOL |
226 |
- AC_PROG_MAKE_SET |
227 |
- AC_PROG_RANLIB |
228 |
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) |
229 |
- |
230 |
- CXXFLAGS="$CXXFLAGS -g -fno-exceptions -fno-strict-aliasing -fasynchronous-unwind-tables -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall \ |
231 |
- -D_REENTRANT -D__EXTENSIONS__ -D_LARGEFILE64_SOURCE -D__LARGE64_FILES" |
232 |
-@@ -70,7 +73,7 @@ |
233 |
- PKG_CHECK_MODULES([OPENSSL], [libcrypto >= 0.9.7a]) |
234 |
- |
235 |
- dnl Get OpenMP Options |
236 |
--gt_OPENMP() |
237 |
-+AC_OPENMP |
238 |
- |
239 |
- dnl Checks for libraries. |
240 |
- save_LIBS=$LIBS |
241 |
-@@ -86,6 +89,10 @@ |
242 |
- |
243 |
- AC_CHECK_LIB([rt], [sched_yield], ,[AC_MSG_ERROR(librt (Posix real time extensions) required)]) |
244 |
- |
245 |
-+if test x$USE_BUILTIN_JEMALLOC != xyes; then |
246 |
-+ AC_CHECK_LIB([jemalloc], [malloc], ,[AC_MSG_ERROR(jemalloc required)]) |
247 |
-+fi |
248 |
-+ |
249 |
- if test x$HAVE_CVMFS != xno; then |
250 |
- dnl if test x$USE_BUILTIN_LIBFUSE != xyes; then |
251 |
- dnl AC_CHECK_HEADERS([fuse.h fuse/fuse_opt.h],,[AC_MSG_ERROR(fuse headers required)],[#define _FILE_OFFSET_BITS 64]) |
252 |
-diff -Nur cvmfs-2.0.18.orig/cvmfs/src/Makefile.am cvmfs-2.0.18/cvmfs/src/Makefile.am |
253 |
---- cvmfs-2.0.18.orig/cvmfs/src/Makefile.am 2012-02-03 17:10:24.000000000 +0000 |
254 |
-+++ cvmfs-2.0.18/cvmfs/src/Makefile.am 2012-07-23 22:12:37.000000000 +0100 |
255 |
-@@ -224,6 +224,11 @@ |
256 |
- cvmfs_proxy_rtt_LDADD += $(LDFLAGS_ZLIB) |
257 |
- endif |
258 |
- |
259 |
-+if ! SYSTEM_JEMALLOC |
260 |
-+LDFLAGS_JEMALLOC = ../../jemalloc/src/lib/libjemalloc.a |
261 |
-+cvmfs2_debug_LDADD += $(LDFLAGS_JEMALLOC) |
262 |
-+cvmfs2_LDADD += $(LDFLAGS_JEMALLOC) |
263 |
-+endif |
264 |
- |
265 |
- CFLAGS_CVMFS2 = |
266 |
- if ! SYSTEM_SQLITE3 |
267 |
-@@ -238,16 +243,17 @@ |
268 |
- if ! SYSTEM_ZLIB |
269 |
- CFLAGS_CVMFS2 += -I../../zlib/src |
270 |
- endif |
271 |
--cvmfs2_debug_LDADD += ../../jemalloc/src/lib/libjemalloc.a |
272 |
--cvmfs2_LDADD += ../../jemalloc/src/lib/libjemalloc.a |
273 |
-+ |
274 |
- CFLAGS_CVMFS2 += $(PTHREAD_CFLAGS) $(CURL_CFLAGS) $(SQLITE_CFLAGS) $(OPENSSL_CFLAGS) $(FUSE_CFLAGS) -DCVMFS_CLIENT -DFUSE_CLIENT |
275 |
--LDFLAGS_CVMFS2 = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(CURL_LIBS) $(SQLITE_LIBS) $(OPENSSL_LIBS) $(FUSE_LIBS) $(Z_LIBS) -lrt -rdynamic |
276 |
-+LDFLAGS_CVMFS2 = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(CURL_LIBS) $(SQLITE_LIBS) $(OPENSSL_LIBS) $(FUSE_LIBS) $(Z_LIBS) -lrt |
277 |
- cvmfs2_debug_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_CVMFS2) -O0 |
278 |
- cvmfs2_debug_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_CVMFS2) -O0 |
279 |
--cvmfs2_debug_LDFLAGS = $(LDFLAGS_CVMFS2) |
280 |
-+cvmfs2_debug_LDFLAGS = -rdynamic |
281 |
-+cvmfs2_debug_LDADD += $(LDFLAGS_CVMFS2) |
282 |
- cvmfs2_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_CVMFS2) -DNDEBUGMSG |
283 |
- cvmfs2_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_CVMFS2) -DNDEBUGMSG |
284 |
--cvmfs2_LDFLAGS = $(LDFLAGS_CVMFS2) |
285 |
-+cvmfs2_LDFLAGS = -rdynamic |
286 |
-+cvmfs2_LDADD += $(LDFLAGS_CVMFS2) |
287 |
- |
288 |
- CFLAGS_LIBCVMFS_A = |
289 |
- if ! SYSTEM_SQLITE3 |
290 |
-@@ -277,7 +283,7 @@ |
291 |
- CFLAGS_FSCK += $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DCVMFS_CLIENT -DNDEBUGMSG |
292 |
- cvmfs_fsck_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_FSCK) |
293 |
- cvmfs_fsck_CFLAGS = $(CVMFS_CXFLAGS) $(CFLAGS_FSCK) |
294 |
--cvmfs_fsck_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) $(SQLITE_LIBS) $(Z_LIBS) |
295 |
-+cvmfs_fsck_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) $(SQLITE_LIBS) $(Z_LIBS) |
296 |
- |
297 |
- |
298 |
- CFLAGS_PROXYRTT = |
299 |
-@@ -286,11 +292,11 @@ |
300 |
- endif |
301 |
- CFLAGS_PROXYRTT += $(CURL_CFLAGS) -DCVMFS_CLIENT -DNDEBUGMSG |
302 |
- cvmfs_proxy_rtt_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_PROXYRTT) |
303 |
--cvmfs_proxy_rtt_LDFLAGS = $(CVMFS_LIBS) $(CURL_LIBS) |
304 |
-+cvmfs_proxy_rtt_LDADD += $(CVMFS_LIBS) $(CURL_LIBS) |
305 |
- |
306 |
- |
307 |
- testtracer_CXXFLAGS = $(CVMFS_CXXFLAGS) $(PTHREAD_CFLAGS) |
308 |
--testtracer_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) |
309 |
-+testtracer_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) |
310 |
- |
311 |
- CFLAGS_SYNC = |
312 |
- if ! SYSTEM_SQLITE3 |
313 |
-@@ -302,7 +308,7 @@ |
314 |
- CFLAGS_SYNC += $(PTHREAD_CFLAGS) $(OPENMP_CFLAGS) $(SQLITE_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG |
315 |
- cvmfs_sync_bin_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_SYNC) |
316 |
- cvmfs_sync_bin_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_SYNC) |
317 |
--cvmfs_sync_bin_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(SQLITE_LIBS) $(OPENSSL_LIBS) $(Z_LIBS) $(GOMP_LIBS) |
318 |
-+cvmfs_sync_bin_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(SQLITE_LIBS) $(OPENSSL_LIBS) $(Z_LIBS) $(GOMP_LIBS) |
319 |
- |
320 |
- |
321 |
- CFLAGS_CLGCMP = |
322 |
-@@ -315,7 +321,7 @@ |
323 |
- CFLAGS_CLGCMP += $(SQLITE_CFLAGS) $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG |
324 |
- cvmfs_clgcmp_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_CLGCMP) |
325 |
- cvmfs_clgcmp_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_CLGCMP) |
326 |
--cvmfs_clgcmp_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS) |
327 |
-+cvmfs_clgcmp_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS) |
328 |
- |
329 |
- |
330 |
- CFLAGS_LSCAT = |
331 |
-@@ -328,7 +334,7 @@ |
332 |
- CFLAGS_LSCAT += $(SQLITE_CFLAGS) $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG |
333 |
- cvmfs_lscat_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_LSCAT) |
334 |
- cvmfs_lscat_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_LSCAT) |
335 |
--cvmfs_lscat_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS) |
336 |
-+cvmfs_lscat_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS) |
337 |
- |
338 |
- CFLAGS_FIXINODES = |
339 |
- if ! SYSTEM_SQLITE3 |
340 |
-@@ -340,7 +346,7 @@ |
341 |
- CFLAGS_FIXINODES += $(SQLITE_CFLAGS) $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG |
342 |
- cvmfs_fixinodes_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_FIXINODES) |
343 |
- cvmfs_fixinodes_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_FIXINODES) |
344 |
--cvmfs_fixinodes_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS) |
345 |
-+cvmfs_fixinodes_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS) |
346 |
- |
347 |
- CFLAGS_SIGN = |
348 |
- if ! SYSTEM_ZLIB |
349 |
-@@ -349,7 +355,7 @@ |
350 |
- CFLAGS_SIGN += $(SQLITE_CFLAGS) $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG |
351 |
- cvmfs_sign_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_SIGN) |
352 |
- cvmfs_sign_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_SIGN) |
353 |
--cvmfs_sign_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(SQLITE_LIBS) $(Z_LIBS) $(OPENSSL_LIBS) |
354 |
-+cvmfs_sign_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(SQLITE_LIBS) $(Z_LIBS) $(OPENSSL_LIBS) |
355 |
- |
356 |
- CFLAGS_PULL = |
357 |
- if ! SYSTEM_SQLITE3 |
358 |
-@@ -364,13 +370,13 @@ |
359 |
- CFLAGS_PULL += $(SQLITE_CFLAGS) $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG |
360 |
- cvmfs_pull_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_PULL) |
361 |
- cvmfs_pull_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_PULL) |
362 |
--cvmfs_pull_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS) |
363 |
-+cvmfs_pull_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS) $(CURL_LIBS) |
364 |
- |
365 |
- |
366 |
- CFLAGS_SCRUB = $(OPENSSL_CFLAGS) -DNDEBUGMSG |
367 |
- cvmfs_scrub_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_SCRUB) |
368 |
- cvmfs_scrub_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_SCRUB) |
369 |
--cvmfs_scrub_LDFLAGS = $(CVMFS_LIBS) $(OPENSSL_LIBS) |
370 |
-+cvmfs_scrub_LDADD += $(CVMFS_LIBS) $(OPENSSL_LIBS) |
371 |
- |
372 |
- |
373 |
- CFLAGS_ZPIPE = |
374 |
-@@ -378,4 +384,4 @@ |
375 |
- CFLAGS_ZPIPE += -I../../zlib/src |
376 |
- endif |
377 |
- cvmfs_zpipe_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_ZPIPE) |
378 |
--cvmfs_zpipe_LDFLAGS = $(CVMFS_LIBS) $(Z_LIBS) |
379 |
-+cvmfs_zpipe_LDADD += $(CVMFS_LIBS) $(Z_LIBS) |
380 |
-diff -Nur cvmfs-2.0.18.orig/Makefile.am cvmfs-2.0.18/Makefile.am |
381 |
---- cvmfs-2.0.18.orig/Makefile.am 2012-02-07 17:04:54.000000000 +0000 |
382 |
-+++ cvmfs-2.0.18/Makefile.am 2012-07-23 22:12:37.000000000 +0100 |
383 |
-@@ -10,10 +10,13 @@ |
384 |
- if ! SYSTEM_ZLIB |
385 |
- SUBDIR_ZLIB = zlib |
386 |
- endif |
387 |
-+if ! SYSTEM_JEMALLOC |
388 |
-+ SUBDIR_JEMALLOC = jemalloc |
389 |
-+endif |
390 |
- if BUILD_KMODULE |
391 |
- SUBDIR_KMODULE = kernel |
392 |
- endif |
393 |
--SUBDIRS = $(SUBDIR_KMODULE) $(SUBDIR_SQLITE3) $(SUBDIR_ZLIB) $(SUBDIR_LIBCURL) $(SUBDIR_LIBFUSE) jemalloc cvmfs cvmfsd mount replica |
394 |
-+SUBDIRS = $(SUBDIR_KMODULE) $(SUBDIR_SQLITE3) $(SUBDIR_ZLIB) $(SUBDIR_LIBCURL) $(SUBDIR_LIBFUSE) $(SUBDIR_JEMALLOC) cvmfs cvmfsd mount replica |
395 |
- EXTRA_DIST = sign-whitelist add-ons rpm doc c-ares libcurl libfuse kernel jemalloc zlib mount replica |
396 |
- docdir = ${datadir}/doc/${PACKAGE}-${VERSION} |
397 |
- dist_doc_DATA = NEWS README ChangeLog AUTHORS INSTALL COPYING FAQ |
398 |
|
399 |
diff --git a/net-fs/cvmfs/files/cvmfs-2.0.18-no-redhat-init.patch b/net-fs/cvmfs/files/cvmfs-2.0.18-no-redhat-init.patch |
400 |
deleted file mode 100644 |
401 |
index 2769771..0000000 |
402 |
--- a/net-fs/cvmfs/files/cvmfs-2.0.18-no-redhat-init.patch |
403 |
+++ /dev/null |
404 |
@@ -1,22 +0,0 @@ |
405 |
-* Avoid forcing install of fedora/redhat init scripts |
406 |
-* Add a more general init script to adapt other distributions |
407 |
- |
408 |
-bicatali@g.o 07/2012 |
409 |
- |
410 |
---- cvmfs-2.0.18.orig/mount/Makefile.am |
411 |
-+++ cvmfs-2.0.18/mount/Makefile.am |
412 |
-@@ -2,14 +2,12 @@ |
413 |
- install-exec-hook: |
414 |
- test -z "$(DESTDIR)/etc" || mkdir -p "$(DESTDIR)/etc" |
415 |
- test -z "$(DESTDIR)/sbin" || mkdir -p "$(DESTDIR)/sbin" |
416 |
-- test -z "$(DESTDIR)/etc/rc.d/init.d" || mkdir -p "$(DESTDIR)/etc/rc.d/init.d" |
417 |
- test -z "$(DESTDIR)/etc/cvmfs" || mkdir -p "$(DESTDIR)/etc/cvmfs" |
418 |
- test -z "$(DESTDIR)/etc/cvmfs/config.d" || mkdir -p "$(DESTDIR)/etc/cvmfs/config.d" |
419 |
- test -z "$(DESTDIR)/etc/cvmfs/domain.d" || mkdir -p "$(DESTDIR)/etc/cvmfs/domain.d" |
420 |
- test -z "$(DESTDIR)/etc/cvmfs/keys" || mkdir -p "$(DESTDIR)/etc/cvmfs/keys" |
421 |
- install -c auto.cvmfs "$(DESTDIR)/etc/auto.cvmfs" |
422 |
- install -c mount.cvmfs "$(DESTDIR)/sbin/mount.cvmfs" |
423 |
-- install -c cvmfs.initd "$(DESTDIR)/etc/rc.d/init.d/cvmfs" |
424 |
- install -c -m 0644 config.sh "$(DESTDIR)/etc/cvmfs/config.sh" |
425 |
- install -c -m 0644 default.conf "$(DESTDIR)/etc/cvmfs/default.conf" |
426 |
- install -c -m 0644 domain.d/cern.ch.conf "$(DESTDIR)/etc/cvmfs/domain.d/cern.ch.conf" |
427 |
|
428 |
diff --git a/net-fs/cvmfs/files/cvmfs-2.0.18-openrc.patch b/net-fs/cvmfs/files/cvmfs-2.0.18-openrc.patch |
429 |
deleted file mode 100644 |
430 |
index df1f5e6..0000000 |
431 |
--- a/net-fs/cvmfs/files/cvmfs-2.0.18-openrc.patch |
432 |
+++ /dev/null |
433 |
@@ -1,82 +0,0 @@ |
434 |
-diff -Nur cvmfs-2.0.18.orig/cvmfs/src/cvmfs_config cvmfs-2.0.18/cvmfs/src/cvmfs_config |
435 |
---- cvmfs-2.0.18.orig/cvmfs/src/cvmfs_config 2012-05-05 15:16:19.000000000 +0100 |
436 |
-+++ cvmfs-2.0.18/cvmfs/src/cvmfs_config 2012-07-23 23:16:06.000000000 +0100 |
437 |
-@@ -16,9 +16,15 @@ |
438 |
- |
439 |
- if [ -x /sbin/service ]; then |
440 |
- service="/sbin/service" |
441 |
--else |
442 |
-+ chkconfig="/sbin/chkconfig" |
443 |
-+elif [ -x /usr/sbin/service ]; then |
444 |
- # Ubuntu |
445 |
- service="/usr/sbin/service" |
446 |
-+ chkconfig="/usr/sbin/chkconfig" |
447 |
-+elif [ -x /sbin/rc-service ]; then |
448 |
-+ # OpenRC |
449 |
-+ service="/sbin/rc-service" |
450 |
-+ chkconfig="/usr/bin/rc-config" |
451 |
- fi |
452 |
- |
453 |
- var_list="CVMFS_USER CVMFS_NFILES CVMFS_CACHE_BASE CVMFS_MOUNT_DIR CVMFS_QUOTA_LIMIT \ |
454 |
-@@ -116,9 +122,9 @@ |
455 |
- fi |
456 |
- |
457 |
- if [ $noservice -eq 0 ]; then |
458 |
-- /sbin/chkconfig --list cvmfs > /dev/null 2>&1 |
459 |
-+ $chkconfig --list cvmfs > /dev/null 2>&1 |
460 |
- if [ $? -ne 0 ]; then |
461 |
-- /sbin/chkconfig --add cvmfs |
462 |
-+ $chkconfig --add cvmfs |
463 |
- fi |
464 |
- fi |
465 |
- |
466 |
-@@ -580,8 +586,8 @@ |
467 |
- for cmd in 'uname -a' 'cat /etc/issue' 'hostname -f' 'ifconfig -a' 'cvmfs2 --version' \ |
468 |
- 'grep cvmfs2 /var/log/messages' 'grep cvmfs2 /var/log/syslog' \ |
469 |
- "eval find ${CVMFS_CACHE_BASE} -maxdepth 1 -exec ls -lah \{\} \;" \ |
470 |
-- 'service cvmfs probe' 'mount' 'df -h' 'ps -ef' \ |
471 |
-- 'service cvmfs status' 'cvmfs_config showconfig' \ |
472 |
-+ "${service}\ cvmfs\ probe" 'mount' 'df -h' 'ps -ef' \ |
473 |
-+ "${service}\ cvmfs\ status" 'cvmfs_config showconfig' \ |
474 |
- 'cvmfs_config chksetup' 'cvmfs_config stat -v' \ |
475 |
- 'cat /etc/fuse.conf' 'ls -la /usr/bin/fusermount' 'ls -la /bin/fusermount' \ |
476 |
- 'cat /etc/auto.master' 'cat /etc/sysconfig/autofs' 'cat /etc/fstab' |
477 |
-diff -Nur cvmfs-2.0.18.orig/cvmfs/src/cvmfs_server cvmfs-2.0.18/cvmfs/src/cvmfs_server |
478 |
---- cvmfs-2.0.18.orig/cvmfs/src/cvmfs_server 2011-11-30 11:26:55.000000000 +0000 |
479 |
-+++ cvmfs-2.0.18/cvmfs/src/cvmfs_server 2012-07-23 23:31:32.000000000 +0100 |
480 |
-@@ -1,5 +1,13 @@ |
481 |
- #!/bin/bash |
482 |
- |
483 |
-+service=$(type -P service) |
484 |
-+chconfig=$(type -P chkconfig) |
485 |
-+if [ -n ${service} ]; then |
486 |
-+ # OpenRC |
487 |
-+ service="rc-service" |
488 |
-+ chkconfig="echo > /dev/null" |
489 |
-+fi |
490 |
-+ |
491 |
- create_master_key() { |
492 |
- local name; name=$1 |
493 |
- master_key="/etc/cvmfs/keys/$name.masterkey" |
494 |
-@@ -161,8 +169,8 @@ |
495 |
- create_whitelist $name |
496 |
- |
497 |
- echo -n "Starting services... " |
498 |
-- service cvmfsd start > /dev/null |
499 |
-- chkconfig cvmfsd on |
500 |
-+ $service cvmfsd start > /dev/null |
501 |
-+ $chkconfig cvmfsd on |
502 |
- echo "New CernVM-FS repository for $name" > /cvmfs/${name}/empty |
503 |
- usermod -s /bin/bash cvmfs |
504 |
- publish $name > /dev/null |
505 |
-@@ -182,8 +190,8 @@ |
506 |
- |
507 |
- echo -n "Stopping services... " |
508 |
- usermod -s /sbin/nologin cvmfs |
509 |
-- service cvmfsd stop > /dev/null |
510 |
-- chkconfig cvmfsd off |
511 |
-+ $service cvmfsd stop > /dev/null |
512 |
-+ $chkconfig cvmfsd off |
513 |
- echo "done" |
514 |
- |
515 |
- echo -n "Unmounting CernVM-FS Area... " |
516 |
|
517 |
diff --git a/net-fs/cvmfs/files/cvmfs-2.0.18-spinlock.patch b/net-fs/cvmfs/files/cvmfs-2.0.18-spinlock.patch |
518 |
deleted file mode 100644 |
519 |
index 1456d02..0000000 |
520 |
--- a/net-fs/cvmfs/files/cvmfs-2.0.18-spinlock.patch |
521 |
+++ /dev/null |
522 |
@@ -1,15 +0,0 @@ |
523 |
-Use macro since SPIN_LOCK_UNLOCKED has been obsolete in kernel since 2007 |
524 |
- |
525 |
-bicatali@g.o 07/2012 |
526 |
- |
527 |
---- cvmfs-2.0.18.orig/kernel/cvmfsflt/src/cvmfsflt_data.c |
528 |
-+++ cvmfs-2.0.18/kernel/cvmfsflt/src/cvmfsflt_data.c |
529 |
-@@ -5,7 +5,7 @@ |
530 |
- int rbuf_head, rbuf_tail; /* Current positions in ring buffer */ |
531 |
- struct semaphore rbuf_full, rbuf_empty; /* semaphores for producer-consumer synchronization */ |
532 |
- struct cvmfsflt_logline *ll_current = NULL; |
533 |
--static spinlock_t rbuf_wlock = SPIN_LOCK_UNLOCKED; |
534 |
-+DEFINE_SPINLOCK(rbuf_wlock); |
535 |
- atomic_t cvmfsflt_noll = ATOMIC_INIT(0); /* number of loglines in the ring buffer */ |
536 |
- |
537 |
- |
538 |
|
539 |
diff --git a/net-fs/cvmfs/files/cvmfs-2.0.18-system-redirfs.patch b/net-fs/cvmfs/files/cvmfs-2.0.18-system-redirfs.patch |
540 |
deleted file mode 100644 |
541 |
index b26e63d..0000000 |
542 |
--- a/net-fs/cvmfs/files/cvmfs-2.0.18-system-redirfs.patch |
543 |
+++ /dev/null |
544 |
@@ -1,16 +0,0 @@ |
545 |
-use the installed redirfs instead of bundled one |
546 |
-(need an experimental 0.11 redirfs on 3.x kernels) |
547 |
- |
548 |
-bicatali@g.o 07/2012 |
549 |
- |
550 |
---- cvmfs-2.0.18.orig/kernel/cvmfsflt/src/cvmfsflt.h |
551 |
-+++ cvmfs-2.0.18/kernel/cvmfsflt/src/cvmfsflt.h |
552 |
-@@ -8,7 +8,7 @@ |
553 |
- #include <asm/uaccess.h> /* for put_user */ |
554 |
- #include <linux/slab.h> /* for kmalloc/kfree */ |
555 |
- |
556 |
--#include "redirfs.h" |
557 |
-+#include <linux/redirfs.h> |
558 |
- |
559 |
- |
560 |
- #define CVMFSFLT_VERSION "0.1" |
561 |
|
562 |
diff --git a/net-fs/cvmfs/files/cvmfs.initd b/net-fs/cvmfs/files/cvmfs.initd |
563 |
deleted file mode 100644 |
564 |
index 75f45b7..0000000 |
565 |
--- a/net-fs/cvmfs/files/cvmfs.initd |
566 |
+++ /dev/null |
567 |
@@ -1,195 +0,0 @@ |
568 |
-#!/sbin/runscript |
569 |
- |
570 |
-extra_commands="probe status" |
571 |
-extra_started_commands="reload flush restart_clean" |
572 |
-description="The CernVM-FS init script" |
573 |
- |
574 |
-init() { |
575 |
- # Initialization, read config |
576 |
- [ -x /etc/cernvm/config ] && /etc/cernvm/config |
577 |
- if [ -f /etc/cvmfs/config.sh ]; then |
578 |
- . /etc/cvmfs/config.sh |
579 |
- else |
580 |
- exit 1 |
581 |
- fi |
582 |
- |
583 |
- cvmfs_readconfig |
584 |
- [ -f /etc/cernvm/repositories.sh ] && . /etc/cernvm/repositories.sh |
585 |
- export LANG=C LC_ALL=C |
586 |
- [ -f /etc/cernvm/custom/init.sh ] && . /etc/cernvm/custom/init.sh |
587 |
-} |
588 |
- |
589 |
-depend() { |
590 |
- need net fuse autofs |
591 |
- after logger |
592 |
-} |
593 |
- |
594 |
-list_mounts() { |
595 |
- mount -t fuse | grep "^cvmfs2[[:space:]]" |
596 |
-} |
597 |
- |
598 |
-repository_status() { |
599 |
- local fqrn=$1 ret=0 pid |
600 |
- if list_mounts | grep ${CVMFS_MOUNT_DIR}/${fqrn} > /dev/null; then |
601 |
- pid=$(cvmfs-talk -c "${CVMFS_CACHE_BASE}" -i "${fqrn}" pid) |
602 |
- ret=$(echo ${pid} | grep ^[0-9]*$ > /dev/null) |
603 |
- if [ ${ret} -eq 0 ]; then |
604 |
- einfo "CernVM-FS mounted on ${CVMFS_MOUNT_DIR}/${fqrn} with pid ${pid}" |
605 |
- else |
606 |
- ewarn "CernVM-FS running with process ${pid}" |
607 |
- fi |
608 |
- else |
609 |
- einfo "CernVM-FS not mounted on ${CVMFS_MOUNT_DIR}/${fqrn}" |
610 |
- fi |
611 |
- return ${ret} |
612 |
-} |
613 |
- |
614 |
-repository_flush() { |
615 |
- local fqrn=$1 |
616 |
- ebegin "Flushing ${fqrn}" |
617 |
- stat ${CVMFS_MOUNT_DIR}/${fqrn}/. > /dev/null 2>&1 && \ |
618 |
- cvmfs-talk -c "${CVMFS_CACHE_BASE}" -i "${fqrn}" cleanup 0 > /dev/null |
619 |
- eend $? |
620 |
-} |
621 |
- |
622 |
-repository_reload() { |
623 |
- local fqrn=$1 ret=0 hosts |
624 |
- if cvmfs-talk -i ${fqrn} pid > /dev/null 2>&1; then |
625 |
- ebegin "Reloading ${fqrn}" |
626 |
- [[ $(cvmfs-talk -i ${fqrn} timeout set ${CVMFS_TIMEOUT} ${CVMFS_TIMEOUT_DIRECT} 2>&1) == OK ]] |
627 |
- ret=$((ret + $?)) |
628 |
- [[ $(cvmfs-talk -i ${fqrn} proxy set ${CVMFS_HTTP_PROXY} 2>&1) == OK ]] |
629 |
- ret=$((ret + $?)) |
630 |
- hosts=$(echo ${CVMFS_SERVER_URL} | sed -e "s/@org@/$(cvmfs_getorg ${fqrn})/g" -e "s/@fqrn@/${fqrn}/g") |
631 |
- [[ $(cvmfs-talk -i ${fqrn} host set ${hosts} 2>&1) == OK ]] |
632 |
- ret=$((ret + $?)) |
633 |
- [[ $(cvmfs-talk -i ${fqrn} max ttl set ${CVMFS_MAX_TTL:-0} 2>&1) == OK ]] |
634 |
- eend $? |
635 |
- ret=$((ret + $?)) |
636 |
- else |
637 |
- einfo "${frqn} not mounted" |
638 |
- fi |
639 |
- return ${ret} |
640 |
-} |
641 |
- |
642 |
-repository_wipe() { |
643 |
- local fqrn=$1 |
644 |
- ebegin "Wiping out ${CVMFS_CACHE_BASE}/${fqrn}" |
645 |
- [ ! -d "${CVMFS_CACHE_BASE}/${fqrn}" ] || rm -rf "${CVMFS_CACHE_BASE}/${fqrn}" |
646 |
- eend $? |
647 |
-} |
648 |
- |
649 |
-repository_probe() { |
650 |
- local fqrn=$1 |
651 |
- ebegin "Probing ${CVMFS_MOUNT_DIR}/${fqrn}" |
652 |
- df -P "${CVMFS_MOUNT_DIR}/${fqrn}" 2>&1 | grep -q ^cvmfs2 |
653 |
- eend $? |
654 |
-} |
655 |
- |
656 |
-cvmfs_action() { |
657 |
- local action=$1 org fqrn |
658 |
- for org in ${CVMFS_REPOSITORIES/,/ /}; do |
659 |
- case ${org} in |
660 |
- none) |
661 |
- ;; |
662 |
- *) |
663 |
- . /etc/cvmfs/config.sh |
664 |
- cvmfs_readconfig |
665 |
- fqrn=$(cvmfs_mkfqrn ${org}) |
666 |
- cvmfs_readconfig ${fqrn} |
667 |
- [[ $(type -t "${action}") == "function" ]] && ${action} ${fqrn} |
668 |
- ;; |
669 |
- esac |
670 |
- done |
671 |
-} |
672 |
- |
673 |
-start() { |
674 |
- ebegin "Starting CernVM-FS" |
675 |
- cvmfs_action repository_start |
676 |
- eend $? |
677 |
-} |
678 |
- |
679 |
-stop() { |
680 |
- local m ret=0 |
681 |
- # FIXME: do we need to unmount here or? |
682 |
- for m in $(list_mounts | awk '{print $3}'); do |
683 |
- ebegin "Unmounting ${m}" |
684 |
- umount ${m} 2>/dev/null |
685 |
- eend $? |
686 |
- if [ $? -ne 0 ]; then |
687 |
- ret=$((ret + $?)) |
688 |
- fuser -m -a -v ${m} |
689 |
- fi |
690 |
- done |
691 |
- if [ ${ret} -eq 0 ]; then |
692 |
- ebegin "Shutting down CernVM-FS" |
693 |
- cvmfs_action repository_stop |
694 |
- eend $? |
695 |
- ret=$((ret + $?)) |
696 |
- fi |
697 |
- return ${ret} |
698 |
-} |
699 |
- |
700 |
-status() { |
701 |
- ebegin "Checking status on CernVM-FS" |
702 |
- cvmfs_action repository_status |
703 |
- |
704 |
- local org processed repo ret=0 |
705 |
- |
706 |
- for org in ${CVMFS_REPOSITORIES/,/ /}; do |
707 |
- case ${org} in |
708 |
- none) |
709 |
- ;; |
710 |
- *) |
711 |
- . /etc/cvmfs/config.sh # start with fresh repository_... functions |
712 |
- cvmfs_readconfig |
713 |
- fqrn=$(cvmfs_mkfqrn ${org}) |
714 |
- processed="${fqrn} ${processed}" |
715 |
- cvmfs_readconfig ${fqrn} |
716 |
- |
717 |
- # in an action? |
718 |
- list_mounts | grep ${CVMFS_MOUNT_DIR}/${fqrn} > /dev/null |
719 |
- if [ $? -eq 0 ]; then |
720 |
- local pid=$(/usr/bin/cvmfs-talk -c "${CVMFS_CACHE_BASE}" -i "${fqrn}" pid) |
721 |
- if echo ${pid} | grep ^[0-9]*$ > /dev/null; then |
722 |
- einfo "CernVM-FS mounted on ${CVMFS_MOUNT_DIR}/${fqrn} with pid ${pid}" |
723 |
- else |
724 |
- ret=$((ret + $?)) |
725 |
- ewarn "CernVM-FS running with process ${pid}" |
726 |
- fi |
727 |
- else |
728 |
- einfo "CernVM-FS not mounted on ${CVMFS_MOUNT_DIR}/${fqrn}" |
729 |
- fi |
730 |
- ;; |
731 |
- esac |
732 |
- done |
733 |
- |
734 |
- for repo in $(list_mounts | awk '{print $3}'); do |
735 |
- repo=$(basename "${repo}") |
736 |
- echo "${processed}" | grep -q "${repo}" || \ |
737 |
- ewarn "CernVM-FS mounted on ${CVMFS_MOUNT_DIR}/${repo} (not in CVMFS_REPOSITORIES)" |
738 |
- done |
739 |
- eend ${ret} |
740 |
-} |
741 |
- |
742 |
-flush() { |
743 |
- cvmfs_action repository_flush |
744 |
-} |
745 |
- |
746 |
-reload() { |
747 |
- cvmfs_action repository_reload |
748 |
-} |
749 |
- |
750 |
-restart_clean() { |
751 |
- stop |
752 |
- local ret=$? |
753 |
- cvmfs_action repository_wipe |
754 |
- ret=$((ret + $?)) |
755 |
- [[ ${ret} == 0 ]] && start |
756 |
- ret=$((ret + $?)) |
757 |
- return ${ret} |
758 |
-} |
759 |
- |
760 |
-probe() { |
761 |
- cvmfs_action repository_probe |
762 |
-} |
763 |
|
764 |
diff --git a/net-fs/cvmfs/files/cvmfsd.confd b/net-fs/cvmfs/files/cvmfsd.confd |
765 |
deleted file mode 100644 |
766 |
index e69de29..0000000 |
767 |
|
768 |
diff --git a/net-fs/cvmfs/files/cvmfsd.initd b/net-fs/cvmfs/files/cvmfsd.initd |
769 |
deleted file mode 100644 |
770 |
index bc0c604..0000000 |
771 |
--- a/net-fs/cvmfs/files/cvmfsd.initd |
772 |
+++ /dev/null |
773 |
@@ -1,191 +0,0 @@ |
774 |
-#!/sbin/runscript |
775 |
- |
776 |
-. /etc/cvmfs/server.conf |
777 |
-[[ -f /etc/cvmfs/server.local ]] && . /etc/cvmfs/server.local |
778 |
- |
779 |
-extra_commands="checkconfig" |
780 |
-extra_started_commands="pause flush resume" |
781 |
- |
782 |
-description="Background daemon that writes the cvmfs character device into a log file" |
783 |
-description_checkconfig="Check configuration file validity" |
784 |
-description_pause="Pause the transactions (not a full stop)" |
785 |
-description_flush="Flush the CernVM-FS change log" |
786 |
-description_resume="Resume transactions after a pause" |
787 |
- |
788 |
-pidfile="/var/run/cvmfsd.pid" |
789 |
-subsysfile="/var/lock/subsys/cvmfsd" |
790 |
- |
791 |
-checkconfig() { |
792 |
- local var ret=0 |
793 |
- for var in SHADOW_DIR PUB_DIR LOG_FILE; do |
794 |
- eval value=\$$var |
795 |
- if [[ -z ${value} ]]; then |
796 |
- eerror "You need to set a value for ${var} in /etc/cvmfs/server.local" |
797 |
- ret=$((ret + $?)) |
798 |
- fi |
799 |
- done |
800 |
- return ${ret} |
801 |
-} |
802 |
- |
803 |
-depend() { |
804 |
- after localmount |
805 |
- use net |
806 |
-} |
807 |
- |
808 |
-# returns: 0 (stopped), 1 (running), 2 (paused) |
809 |
-check_status() { |
810 |
- if [ -f ${pidfile} ]; then |
811 |
- [ $(cat /sys/fs/redirfs/filters/cvmfsflt/lockdown) -eq 1 ] && return 2 |
812 |
- return 1 |
813 |
- fi |
814 |
- return 0 |
815 |
-} |
816 |
- |
817 |
-# FIXME: could we use start-stop-daemon instead of listen/unlisten? |
818 |
- |
819 |
-listen() { |
820 |
- ebegin "Starting journal writer" |
821 |
- nohup cat /dev/cvmfs >> "${LOG_FILE}" 2>/dev/null </dev/null & |
822 |
- [ $? -eq 0 ] && echo $! > ${pidfile} |
823 |
- eend $? |
824 |
-} |
825 |
- |
826 |
-unlisten() { |
827 |
- ebegin "Stopping journal writer" |
828 |
- local pid=$(cat ${pidfile}) |
829 |
- kill ${pid} |
830 |
- local killed=0 retries=0 |
831 |
- while [ ${killed} -eq 0 ]; do |
832 |
- sleep 1 |
833 |
- kill -0 ${pid} 2>/dev/null |
834 |
- killed=$? |
835 |
- retries=$((retries + 1)) |
836 |
- [ ${retries} -eq 3 ] && kill -9 ${pid} |
837 |
- done |
838 |
- eend $? |
839 |
-} |
840 |
- |
841 |
-start() { |
842 |
- checkconfig || return 1 |
843 |
- |
844 |
- if [ ! -d ${SHADOW_DIR} ]; then |
845 |
- eerror "Missing ${SHADOW_DIR}" |
846 |
- return 1 |
847 |
- fi |
848 |
- |
849 |
- if mkdir -p "$(echo "${LOG_FILE}" | grep -o '\([^\/]*\/\)*')"; then |
850 |
- eerror "Could not create file system journal in ${LOG_FILE}" |
851 |
- return 1 |
852 |
- fi |
853 |
- |
854 |
- ebegin "Loading cvmfsflt kernel module" |
855 |
- modprobe -q redirfs && modprobe -q cvmfsflt |
856 |
- eend $? || return 1 |
857 |
- |
858 |
- ebegin "Linking to character device" |
859 |
- rm -f /dev/cvmfs |
860 |
- mknod /dev/cvmfs c $(awk '/cvmfs/ {print $1}' /proc/devices) 0 > /dev/null 2>&1 |
861 |
- chmod 0600 /dev/cvmfs |
862 |
- eend $? || return 1 |
863 |
- |
864 |
- ebegin "Setting filter path to ${SHADOW_DIR}" |
865 |
- echo -n "a:i:${SHADOW_DIR}" > /sys/fs/redirfs/filters/cvmfsflt/paths |
866 |
- eend $? || return 1 |
867 |
- |
868 |
- listen || return 1 |
869 |
- ebegin "Starting CernVM-FS daemon" |
870 |
- touch ${subsysfile} |
871 |
- eend $? |
872 |
-} |
873 |
- |
874 |
- |
875 |
-pause() { |
876 |
- check_status |
877 |
- local ret=$? |
878 |
- if [ ${ret} -eq 0 ]; then |
879 |
- eerror "CernVM-FS daemon is stopped" |
880 |
- return 1 |
881 |
- fi |
882 |
- if [ ${ret} -eq 2 ]; then |
883 |
- ewarn "CernVM-FS daemon is already paused" |
884 |
- return 1 |
885 |
- fi |
886 |
- |
887 |
- ebegin "Locking down ${SHADOW_DIR}" |
888 |
- echo -n "1" > /sys/fs/redirfs/filters/cvmfsflt/lockdown |
889 |
- eend $? || return 1 |
890 |
- |
891 |
- ebegin "Waiting for pending operations on ${SHADOW_DIR}" |
892 |
- local nowops noll |
893 |
- while true; do |
894 |
- nowops=$(cat /sys/fs/redirfs/filters/cvmfsflt/nowops) |
895 |
- [ $? -ne 0 ] && eend 1 && return 1 |
896 |
- [ ${nowops} -eq 0 ] && break |
897 |
- sleep 1 |
898 |
- done |
899 |
- eend $? |
900 |
- |
901 |
- ebegin "Waiting for pending messages in call buffer" |
902 |
- local noll |
903 |
- while true; do |
904 |
- noll=$(cat /sys/fs/redirfs/filters/cvmfsflt/noll) |
905 |
- [ $? -ne 0 ] && eend 1 && return 1 |
906 |
- [ ${noll} -eq 0 ] && break |
907 |
- sleep 1 |
908 |
- done |
909 |
- eend $? || return 1 |
910 |
- unlisten || return 1 |
911 |
- mark_service_stopped cvmfsd |
912 |
-} |
913 |
- |
914 |
-resume() { |
915 |
- check_status |
916 |
- local ret=$? |
917 |
- if [ ${ret} -eq 0 ]; then |
918 |
- eerror "CernVM-FS daemon is stopped" |
919 |
- return 1 |
920 |
- fi |
921 |
- if [ $retval -eq 1 ]; then |
922 |
- ewarn "CernVM-FS daemon is already running" |
923 |
- return 1 |
924 |
- fi |
925 |
- |
926 |
- listen || return 1 |
927 |
- |
928 |
- ebegin "Open up ${SHADOW_DIR}" |
929 |
- echo -n "0" > /sys/fs/redirfs/filters/cvmfsflt/lockdown |
930 |
- eend $? || return 1 |
931 |
- mark_service_started cvmfsd |
932 |
-} |
933 |
- |
934 |
- |
935 |
-stop() { |
936 |
- check_status |
937 |
- local ret=$? |
938 |
- if [ ${ret} -eq 0 ]; then |
939 |
- ewarn "CernVM-FS daemon is already stopped" |
940 |
- return 2 |
941 |
- fi |
942 |
- |
943 |
- if [ ${ret} -eq 1 ]; then |
944 |
- pause |
945 |
- ret=$? |
946 |
- [ ${ret} -ne 0 ] && return ${ret} |
947 |
- fi |
948 |
- |
949 |
- ebegin "Unloading cvmfsflt kernel module" |
950 |
- echo -n "c\0" > /sys/fs/redirfs/filters/cvmfsflt/paths || ret=$((ret + 1)) |
951 |
- echo -n "1\0" > /sys/fs/redirfs/filters/cvmfsflt/unregister || ret=$((ret + 1)) |
952 |
- rmmod cvmfsflt || ret=$((ret + 1)) |
953 |
- eend ${ret} || return 1 |
954 |
- |
955 |
- ebegin "Shutting down CernVM-FS daemon" |
956 |
- rm -f ${pidfile} ${subsysfile} |
957 |
- eend $? |
958 |
-} |
959 |
- |
960 |
-flush() { |
961 |
- ebegin "Flushing CernVM-FS server file system change log" |
962 |
- cat /dev/null > "${LOG_FILE}" |
963 |
- eend $? |
964 |
-} |
965 |
|
966 |
diff --git a/net-fs/cvmfs/metadata.xml b/net-fs/cvmfs/metadata.xml |
967 |
deleted file mode 100644 |
968 |
index b33579e..0000000 |
969 |
--- a/net-fs/cvmfs/metadata.xml |
970 |
+++ /dev/null |
971 |
@@ -1,22 +0,0 @@ |
972 |
-<?xml version="1.0" encoding="UTF-8"?> |
973 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
974 |
-<pkgmetadata> |
975 |
-<maintainer> |
976 |
- <email>bicatali@g.o</email> |
977 |
-</maintainer> |
978 |
-<longdescription lang='en'> |
979 |
- The CernVM File System is a client-server file system developed to |
980 |
- deliver software stacks onto virtual machines in a fast, scalable, |
981 |
- and reliable way. CernVM-FS is implemented as a FUSE module. It |
982 |
- makes a specially prepared directory tree stored on a web server |
983 |
- look like a local read-only file system on the virtual |
984 |
- machine. CernVM-FS uses outgoing HTTP connections only, thereby it |
985 |
- avoids most of the firewall issues of other network file systems. It |
986 |
- transfers data file by file on demand, verifying the content by |
987 |
- SHA-1 keys. |
988 |
-</longdescription> |
989 |
-<use> |
990 |
- <flag name='client'>Install the cvmfs client programs and init script</flag> |
991 |
- <flag name='server'>Install the cvmfsd program and init script</flag> |
992 |
-</use> |
993 |
-</pkgmetadata> |