Compare commits

..

4 Commits

Author SHA1 Message Date
Fedora Release Engineering c5cb23e3c0 dist-git conversion 2010-07-28 11:33:31 +00:00
Josef Bacik 23d404f669 - update to 0.20.2 2010-07-06 18:56:22 +00:00
Josef Bacik b54c831ea5 Initial import (#563318) 2010-05-07 18:29:09 +00:00
Jason ティビツ c77bf31040 Initialize branch F-13 for ceph 2010-04-29 02:14:44 +00:00
5 changed files with 110 additions and 206 deletions
+1 -7
View File
@@ -1,7 +1 @@
ceph-0.20.tar.gz
/ceph-0.21.3.tar.gz
/ceph-0.25.1.tar.gz
/ceph-0.26.tar.gz
/ceph-0.31.tar.gz
/ceph-0.37.tar.gz
/ceph-0.39.tar.gz
ceph-0.20.2.tar.gz
+49 -4
View File
@@ -1,9 +1,9 @@
--- ceph-0.21.1/src/init-ceph.in.orig 2010-07-29 15:16:49.000000000 -0500
+++ ceph-0.21.1/src/init-ceph.in 2010-08-26 14:58:25.328581937 -0500
@@ -1,11 +1,11 @@
diff -up ceph-0.20/src/init-ceph.in.init ceph-0.20/src/init-ceph.in
--- ceph-0.20/src/init-ceph.in.init 2010-04-22 16:11:34.000000000 -0400
+++ ceph-0.20/src/init-ceph.in 2010-05-05 15:37:11.185677759 -0400
@@ -1,10 +1,11 @@
#!/bin/sh
# Start/stop ceph daemons
-# chkconfig: 2345 60 80
+# chkconfig: - 60 80
### BEGIN INIT INFO
@@ -15,3 +15,48 @@
# Required-Start: $remote_fs $named $network $time
# Required-Stop: $remote_fs $named $network $time
# Short-Description: Start Ceph distributed file system daemons at boot time
@@ -28,6 +29,8 @@ else
fi
fi
+lockfile=/var/lock/subsys/ceph
+
usage_exit() {
echo "usage: $0 [options] {start|stop|restart} [mon|osd|mds]..."
printf "\t-c ceph.conf\n"
@@ -244,6 +247,7 @@ for name in $what; do
[ -n "$pre_start" ] && do_cmd "$pre_start"
do_cmd "$cmd" $runarg
[ -n "$post_start" ] && do_cmd "$post_start"
+ [ "$?" = 0 ] && touch $lockfile
;;
stop)
@@ -252,19 +256,27 @@ for name in $what; do
[ -n "$pre_stop" ] && do_cmd "$pre_stop"
stop_daemon $name c$type $pid_file
[ -n "$post_stop" ] && do_cmd "$post_stop"
+ [ "$?" = 0 ] && rm -f $lockfile
;;
+ status)
+ pid=`cat $pid_file`
+ ps $pid &> /dev/null
+ exit $?
+ ;;
forcestop)
get_conf pre_forcestop "" "pre forcestop command"
get_conf post_forcestop "" "post forcestop command"
[ -n "$pre_forcestop" ] && do_cmd "$pre_forcestop"
stop_daemon $name c$type $pid_file -9
[ -n "$post_forcestop" ] && do_cmd "$post_forcestop"
+ [ "$?" = 0 ] && rm -f $lockfile
;;
killall)
echo "killall c$type on $host"
do_cmd "pkill ^c$type || true"
+ [ "$?" = 0 ] && rm -f $lockfile
;;
force-reload | reload)
-11
View File
@@ -1,11 +0,0 @@
--- ./src/logrotate.conf.new 2012-01-11 18:23:10.597593501 -0500
+++ ./src/logrotate.conf 2012-01-11 18:23:26.808390838 -0500
@@ -4,7 +4,7 @@
compress
sharedscripts
postrotate
- invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
+ service ceph reload >/dev/null 2>/dev/null || true
endscript
missingok
}
+59 -183
View File
@@ -1,6 +1,6 @@
Name: ceph
Version: 0.39
Release: 2%{?dist}
Version: 0.20.2
Release: 1%{?dist}
Summary: User space components of the Ceph file system
License: LGPLv2
Group: System Environment/Base
@@ -8,18 +8,11 @@ URL: http://ceph.newdream.net/
Source: http://ceph.newdream.net/download/%{name}-%{version}.tar.gz
Patch0: ceph-init-fix.patch
Patch1: ceph.logrotate.patch
BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel,
BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm,
# google-perftools is not available on these:
%ifnarch ppc64 s390 s390x
BuildRequires: gperftools-devel
%endif
BuildRequires: cryptopp-devel, libatomic_ops-devel, gcc-c++
BuildRequires: pkgconfig, libcurl-devel, keyutils-libs-devel
BuildRequires: gtkmm24-devel, gtk2-devel, libuuid, libuuid-devel
BuildRequires: libedit-devel, fuse-devel, git, perl, perl-devel, gdbm,
BuildRequires: openssl-devel, libatomic_ops-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig, binutils, libedit
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
@@ -43,67 +36,38 @@ Requires: %{name} = %{version}-%{release}
%description devel
This package contains the headers needed to develop programs that use Ceph.
%package radosgw
Summary: rados REST gateway
Group: Development/Libraries
Requires: mod_fcgid
BuildRequires: fcgi-devel
BuildRequires: expat-devel
%description radosgw
radosgw is an S3 HTTP REST gateway for the RADOS object store. It is
implemented as a FastCGI module using libfcgi, and can be used in
conjunction with any FastCGI capable web server.
%package obsync
Summary: synchronize data between cloud object storage providers or a local directory
Group: Productivity/Networking/Other
License: LGPLv2
Requires: python, python-boto
%description obsync
obsync is a tool to synchronize objects between cloud object
storage providers, such as Amazon S3 (or compatible services), a
Ceph RADOS cluster, or a local directory.
%package gcephtool
Summary: Ceph graphical monitoring tool
Group: System Environment/Base
License: LGPLv2
Requires: gtk2 gtkmm24
BuildRequires: gtk2-devel gtkmm24-devel
%description gcephtool
gcephtool is a graphical monitor for the clusters running the Ceph distributed
file system.
%prep
%setup -q
%patch0 -p1 -b .init
%patch1 -p0
chmod 0644 src/common/Mutex.h
%build
./autogen.sh
%{configure} --prefix=/usr --sbindir=/sbin \
--localstatedir=/var --sysconfdir=/etc \
%ifarch ppc64 s390 s390x
--without-tcmalloc \
%endif
--without-hadoop --with-radosgw --with-gtk2
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
%configure --without-hadoop --without-debug
make CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf
install -m 0644 -D src/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ceph
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/tmp/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/stat
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
install -D src/init-ceph $RPM_BUILD_ROOT%{_initddir}/ceph
chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/ceph/sample.ceph.conf
# remove debug binaries
rm -f $RPM_BUILD_ROOT%{_bindir}/dumpjournal
rm -f $RPM_BUILD_ROOT%{_bindir}/dupstore
rm -f $RPM_BUILD_ROOT%{_bindir}/radosacl
rm -f $RPM_BUILD_ROOT%{_bindir}/streamtest
rm -f $RPM_BUILD_ROOT%{_bindir}/test_ioctls
rm -f $RPM_BUILD_ROOT%{_bindir}/test_trans
rm -f $RPM_BUILD_ROOT%{_bindir}/testceph
rm -f $RPM_BUILD_ROOT%{_bindir}/testcrypto
rm -f $RPM_BUILD_ROOT%{_bindir}/testkeys
rm -f $RPM_BUILD_ROOT%{_bindir}/testmsgr
rm -f $RPM_BUILD_ROOT%{_bindir}/testrados
rm -f $RPM_BUILD_ROOT%{_bindir}/testradospp
%clean
rm -rf $RPM_BUILD_ROOT
@@ -126,79 +90,59 @@ fi
%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_sysconfdir}/ceph
%{_bindir}/ceph
%{_bindir}/cephfs
%{_bindir}/ceph-conf
%{_bindir}/ceph-clsinfo
%{_bindir}/cconf
%{_bindir}/crushtool
%{_bindir}/monmaptool
%{_bindir}/osdmaptool
%{_bindir}/ceph-authtool
%{_bindir}/ceph-syn
%{_bindir}/ceph-run
%{_bindir}/ceph-mon
%{_bindir}/ceph-mds
%{_bindir}/ceph-osd
%{_bindir}/ceph-rbdnamer
%{_bindir}/librados-config
%{_bindir}/cauthtool
%{_bindir}/csyn
%{_bindir}/crun
%{_bindir}/cmon
%{_bindir}/cmds
%{_bindir}/cosd
%{_bindir}/mkmonfs
%{_bindir}/rados
%{_bindir}/rbd
%{_bindir}/ceph-debugpack
%{_bindir}/ceph-coverage
%{_initrddir}/ceph
%{_libdir}/libcephfs.so.*
%{_bindir}/rbdtool
%{_bindir}/psim
%{_initddir}/ceph
%{_libdir}/libceph.so.*
%{_libdir}/libcrush.so.*
%{_libdir}/librados.so.*
%{_libdir}/librbd.so.*
%{_libdir}/librgw.so.*
%{_libdir}/rados-classes/libcls_rbd.so.*
%{_libdir}/rados-classes/libcls_rgw.so*
/sbin/mkcephfs
%{_sbindir}/mkcephfs
/sbin/mount.ceph
%{_libdir}/ceph
%{_docdir}/ceph/sample.ceph.conf
%{_docdir}/ceph/sample.fetch_config
%config(noreplace) %{_sysconfdir}/logrotate.d/ceph
%config(noreplace) %{_sysconfdir}/bash_completion.d/rados
%config(noreplace) %{_sysconfdir}/bash_completion.d/ceph
%config(noreplace) %{_sysconfdir}/bash_completion.d/rbd
%{_mandir}/man8/ceph-mon.8*
%{_mandir}/man8/ceph-mds.8*
%{_mandir}/man8/ceph-osd.8*
%config(noreplace) %{_sysconfdir}/ceph/sample.ceph.conf
%config(noreplace) %{_sysconfdir}/ceph/sample.fetch_config
%{_mandir}/man8/cmon.8*
%{_mandir}/man8/cmds.8*
%{_mandir}/man8/cosd.8*
%{_mandir}/man8/mkcephfs.8*
%{_mandir}/man8/ceph-run.8*
%{_mandir}/man8/ceph-syn.8*
%{_mandir}/man8/mkmonfs.8*
%{_mandir}/man8/crun.8*
%{_mandir}/man8/csyn.8*
%{_mandir}/man8/crushtool.8*
%{_mandir}/man8/osdmaptool.8*
%{_mandir}/man8/monmaptool.8*
%{_mandir}/man8/ceph-conf.8*
%{_mandir}/man8/cconf.8*
%{_mandir}/man8/ceph.8*
%{_mandir}/man8/cephfs.8*
%{_mandir}/man8/mount.ceph.8*
%{_mandir}/man8/radosgw.8*
%{_mandir}/man8/radosgw-admin.8*
%{_mandir}/man8/radosgw_admin.8*
%{_mandir}/man8/rados.8*
%{_mandir}/man8/rbd.8*
%{_mandir}/man8/ceph-authtool.8*
%{_mandir}/man8/ceph-debugpack.8*
%{_mandir}/man8/ceph-clsinfo.8.gz
%{python_sitelib}/rados.py*
%{python_sitelib}/rgw.py*
%{python_sitelib}/rbd.py*
%dir %{_localstatedir}/lib/ceph/
%dir %{_localstatedir}/lib/ceph/tmp/
%dir %{_localstatedir}/log/ceph/
%{_mandir}/man8/rbdtool.8*
%{_mandir}/man8/cauthtool.8*
%files fuse
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/ceph-fuse
%{_mandir}/man8/ceph-fuse.8*
%{_bindir}/cfuse
%{_mandir}/man8/cfuse.8*
%files devel
%defattr(-,root,root,-)
%doc COPYING
%{_includedir}/cephfs/libcephfs.h
%{_includedir}/ceph/libceph.h
%{_includedir}/crush/crush.h
%{_includedir}/crush/hash.h
%{_includedir}/crush/mapper.h
@@ -206,84 +150,16 @@ fi
%{_includedir}/rados/librados.h
%{_includedir}/rados/librados.hpp
%{_includedir}/rados/buffer.h
%{_includedir}/rados/atomic.h
%{_includedir}/rados/page.h
%{_includedir}/rados/crc32c.h
%{_includedir}/rados/librgw.h
%{_includedir}/rbd/librbd.h
%{_includedir}/rbd/librbd.hpp
%{_libdir}/libcephfs.so
%{_includedir}/rados/Spinlock.h
%{_includedir}/rados/assert.h
%{_libdir}/libceph.so
%{_libdir}/libcrush.so
%{_libdir}/librados.so
%{_libdir}/librgw.so
%{_libdir}/librbd.so*
%{_libdir}/rados-classes/libcls_rbd.so
%{_mandir}/man8/librados-config.8*
%files gcephtool
%defattr(-,root,root,-)
%{_bindir}/gceph
%{_datadir}/ceph_tool/gui_resources/*
%files radosgw
%defattr(-,root,root,-)
%{_bindir}/radosgw
%{_bindir}/radosgw-admin
%{_sysconfdir}/bash_completion.d/radosgw-admin
%files obsync
%defattr(-,root,root,-)
%{_bindir}/obsync
%{_bindir}/boto_tool
%changelog
* Thu Feb 16 2012 Tom Callaway <spot@fedoraproject.org> 0.39-2
- rebuild against gperftools
* Sat Dec 03 2011 David Nalley <david@gnsa.us> 0.38-1
- updating to upstream 0.39
* Sat Nov 05 2011 David Nalley <david@gnsa.us> 0.37-1
- create /etc/ceph - bug 745462
- upgrading to 0.37, fixing 745460, 691033
- fixing various logrotate bugs 748930, 747101
* Fri Aug 19 2011 Dan Horák <dan[at]danny.cz> 0.31-4
- google-perftools not available also on s390(x)
* Mon Jul 25 2011 Karsten Hopp <karsten@redhat.com> 0.31-3
- build without tcmalloc on ppc64, BR google-perftools is not available there
* Tue Jul 12 2011 Josef Bacik <josef@toxicpanda.com> 0.31-2
- Remove curl/types.h include since we don't use it anymore
* Tue Jul 12 2011 Josef Bacik <josef@toxicpanda.com> 0.31-1
- Update to 0.31
* Tue Apr 5 2011 Josef Bacik <josef@toxicpanda.com> 0.26-2
- Add the compile fix patch
* Tue Apr 5 2011 Josef Bacik <josef@toxicpanda.com> 0.26
- Update to 0.26
* Tue Mar 22 2011 Josef Bacik <josef@toxicpanda.com> 0.25.1-1
- Update to 0.25.1
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.21.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Sep 29 2010 Steven Pritchard <steve@kspei.com> 0.21.3-1
- Update to 0.21.3.
* Mon Aug 30 2010 Steven Pritchard <steve@kspei.com> 0.21.2-1
- Update to 0.21.2.
* Thu Aug 26 2010 Steven Pritchard <steve@kspei.com> 0.21.1-1
- Update to 0.21.1.
- Sample configs moved to /usr/share/doc/ceph/.
- Added cclass, rbd, and cclsinfo.
- Dropped mkmonfs and rbdtool.
- mkcephfs moved to /sbin.
- Add libcls_rbd.so.
* Tue Jul 6 2010 Josef Bacik <josef@toxicpanda.com> 0.20.2-1
- update to 0.20.2
+1 -1
View File
@@ -1 +1 @@
8dcc078604c54d10085b6990ef554738 ceph-0.39.tar.gz
74e6f398d320bf1dd46db91210198dd9 ceph-0.20.2.tar.gz