Merge pull request #198 from dalgaaf/wip-da-spec

Fix some install and rpm SPEC issues

Reviewed-by: Gary Lowell <gary.lowell@inktank.com>

4 files changed, 52 insertions, 55 deletions

diff --git a/ceph.spec.in b/ceph.spec.in
index 0a0f1e49dc8..fc4d5466db7 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -290,37 +290,29 @@ 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
 install -D src/init-radosgw $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-ln -sf ../../etc/init.d/ceph %{buildroot}/usr/sbin/rcceph
-ln -sf ../../etc/init.d/ceph-radosgw %{buildroot}/usr/sbin/rcceph-radosgw
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -sf ../../etc/init.d/ceph %{buildroot}/%{_sbindir}/rcceph
+ln -sf ../../etc/init.d/ceph-radosgw %{buildroot}/%{_sbindir}/rcceph-radosgw
 install -m 0644 -D src/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ceph
 install -m 0644 -D src/rgw/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/radosgw
 chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf
 chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/tmp/
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/ceph/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph/
 
 # udev rules
-install -D -m 644 udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules
-install -D -m 644 udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules
+install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules
+install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules
 
 #set up placeholder directories
-mkdir -p $RPM_BUILD_ROOT/etc/ceph
-mkdir -p $RPM_BUILD_ROOT/var/log/ceph
-mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/tmp
-mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/mon
-mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/osd
-mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/mds
-mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/bootstrap-osd
-mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/bootstrap-mds
-
-# Makefile puts these in sbin, but we want to package them in usr/sbin
-mv -f $RPM_BUILD_ROOT/sbin/ceph-disk $RPM_BUILD_ROOT/usr/sbin/ceph-disk
-mv -f $RPM_BUILD_ROOT/sbin/ceph-disk-activate $RPM_BUILD_ROOT/usr/sbin/ceph-disk-activate
-mv -f $RPM_BUILD_ROOT/sbin/ceph-disk-prepare $RPM_BUILD_ROOT/usr/sbin/ceph-disk-prepare
-mv -f $RPM_BUILD_ROOT/sbin/ceph-create-keys $RPM_BUILD_ROOT/usr/sbin/ceph-create-keys
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/ceph
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/tmp
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/mon
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/osd
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/mds
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-osd
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-mds
+
 
 %if %{defined suse_version}
 # Fedora seems to have some problems with this macro, use it only on SUSE
@@ -390,9 +382,23 @@ fi
 %{_bindir}/ceph-coverage
 %{_bindir}/ceph_mon_store_converter
 %{_initrddir}/ceph
+%{_sbindir}/ceph-disk
+%{_sbindir}/ceph-disk-activate
+%{_sbindir}/ceph-disk-prepare
+%{_sbindir}/ceph-create-keys
+%{_sbindir}/rcceph
 /sbin/mkcephfs
 /sbin/mount.ceph
+%dir %{_libdir}/rados-classes
+%{_libdir}/rados-classes/libcls_rbd.so*
+%{_libdir}/rados-classes/libcls_rgw.so*
+%{_libdir}/rados-classes/libcls_lock.so*
+%{_libdir}/rados-classes/libcls_kvs.so*
+%{_libdir}/rados-classes/libcls_refcount.so*
 %{_libdir}/ceph
+/lib/udev/rules.d/50-rbd.rules
+/lib/udev/rules.d/95-ceph-osd.rules
+%dir %{_sysconfdir}/ceph/
 %config %{_sysconfdir}/bash_completion.d/ceph
 %config %{_sysconfdir}/bash_completion.d/rados
 %config %{_sysconfdir}/bash_completion.d/radosgw-admin
@@ -420,34 +426,17 @@ fi
 %{_mandir}/man8/ceph-debugpack.8*
 %{_mandir}/man8/ceph-clsinfo.8.gz
 %{_mandir}/man8/librados-config.8.gz
+#set up placeholder directories
 %dir %{_localstatedir}/lib/ceph/
-%dir %{_localstatedir}/lib/ceph/tmp/
+%dir %{_localstatedir}/lib/ceph/tmp
+%dir %{_localstatedir}/lib/ceph/mon
+%dir %{_localstatedir}/lib/ceph/osd
+%dir %{_localstatedir}/lib/ceph/mds
+%dir %{_localstatedir}/lib/ceph/bootstrap-osd
+%dir %{_localstatedir}/lib/ceph/bootstrap-mds
 %dir %{_localstatedir}/log/ceph/
 %ghost %dir %{_localstatedir}/run/ceph/
-%dir %{_sysconfdir}/ceph/
-/usr/sbin/rcceph
-%dir %{_libdir}/rados-classes
-%{_libdir}/rados-classes/libcls_rbd.so*
-%{_libdir}/rados-classes/libcls_rgw.so*
-%{_libdir}/rados-classes/libcls_lock.so*
-%{_libdir}/rados-classes/libcls_kvs.so*
-%{_libdir}/rados-classes/libcls_refcount.so*
-/usr/sbin/ceph-disk
-/usr/sbin/ceph-disk-activate
-/usr/sbin/ceph-disk-prepare
-/usr/sbin/ceph-create-keys
-/lib/udev/rules.d/95-ceph-osd.rules
 
-#set up placeholder directories
-%defattr(-,root,root,755)
-%dir /etc/ceph
-%dir /var/log/ceph
-%dir /var/lib/ceph/tmp
-%dir /var/lib/ceph/mon
-%dir /var/lib/ceph/osd
-%dir /var/lib/ceph/mds
-%dir /var/lib/ceph/bootstrap-osd
-%dir /var/lib/ceph/bootstrap-mds
 
 #################################################################################
 %files fuse
@@ -492,7 +481,7 @@ fi
 %{_bindir}/radosgw-admin
 %{_mandir}/man8/radosgw.8*
 %{_mandir}/man8/radosgw-admin.8*
-/usr/sbin/rcceph-radosgw
+%{_sbindir}/rcceph-radosgw
 
 %post radosgw
 /sbin/ldconfig
@@ -537,7 +526,6 @@ fi
 %files -n librbd1
 %defattr(-,root,root,-)
 %{_libdir}/librbd.so.*
-/lib/udev/rules.d/50-rbd.rules
 
 %post -n librbd1
 /sbin/ldconfig
@@ -593,6 +581,7 @@ fi
 %{_bindir}/ceph_test_cls_rbd
 %{_bindir}/ceph_test_cls_refcount
 %{_bindir}/ceph_test_cls_rgw
+%{_bindir}/ceph_test_cors
 %{_bindir}/ceph_test_filejournal
 %{_bindir}/ceph_test_filestore
 %{_bindir}/ceph_test_filestore_idempotent
@@ -629,6 +618,7 @@ fi
 %{_bindir}/ceph_test_rados_open_pools_parallel
 %{_bindir}/ceph_test_rados_watch_notify
 %{_bindir}/ceph_test_signal_handlers
+%{_bindir}/ceph_test_snap_mapper
 %{_bindir}/ceph_test_store_tool
 %{_bindir}/ceph_test_timers
 %{_bindir}/ceph_tpbench
diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index 5a6010ee361..3252d9eebfe 100644
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -21,6 +21,7 @@ usr/bin/ceph_test_cls_lock
 usr/bin/ceph_test_cls_rbd
 usr/bin/ceph_test_cls_refcount
 usr/bin/ceph_test_cls_rgw
+usr/bin/ceph_test_cors
 usr/bin/ceph_test_crypto
 usr/bin/ceph_test_filejournal
 usr/bin/ceph_test_filestore
@@ -55,6 +56,7 @@ usr/bin/ceph_test_rados_open_pools_parallel
 usr/bin/ceph_test_rados_watch_notify
 usr/bin/ceph_test_rewrite_latency
 usr/bin/ceph_test_signal_handlers
+usr/bin/ceph_test_snap_mapper
 usr/bin/ceph_test_store_tool
 usr/bin/ceph_test_stress_watch
 usr/bin/ceph_test_timers
diff --git a/debian/ceph.install b/debian/ceph.install
index 16f8ba295af..57bba905292 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -1,9 +1,9 @@
 etc/bash_completion.d/ceph
 lib/udev/rules.d/95-ceph-osd.rules
-sbin/ceph-create-keys usr/sbin/
-sbin/ceph-disk usr/sbin/
-sbin/ceph-disk-activate usr/sbin/
-sbin/ceph-disk-prepare usr/sbin/
+usr/sbin/ceph-create-keys
+usr/sbin/ceph-disk
+usr/sbin/ceph-disk-activate
+usr/sbin/ceph-disk-prepare
 sbin/mkcephfs
 usr/bin/ceph-clsinfo
 usr/bin/ceph-debugpack
diff --git a/src/Makefile.am b/src/Makefile.am
index 09f1e934b23..5fe7da683eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,12 +27,17 @@ bin_PROGRAMS =
 # like bin_PROGRAMS, but these targets are only built for debug builds
 bin_DEBUGPROGRAMS =
 sbin_PROGRAMS =
-sbin_SCRIPTS = \
+# like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
+ceph_sbindir = $(prefix)$(sbindir)
+ceph_sbin_SCRIPTS = \
 	ceph-disk \
 	ceph-disk-prepare \
 	ceph-disk-activate \
-	ceph-create-keys \
+	ceph-create-keys
+
+sbin_SCRIPTS = \
 	mount.fuse.ceph
+
 bin_SCRIPTS = ceph-run $(srcdir)/ceph-clsinfo ceph-debugpack ceph-rbdnamer
 dist_bin_SCRIPTS =
 # C/C++ tests to build will be appended to this