packaging: erasure-code plugins go in /usr/lib/ceph

Install the plugins in /usr/lib/ceph/erasure-code instead of
/usr/lib/erasure-code to comply with FHS : "Applications may use a
single subdirectory under /usr/lib."

http://refspecs.linuxfoundation.org/FHS_2.3/fhs-2.3.html

The debian package is modified to install the plugins as part of the
ceph package which also ships rados-classes.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/ceph.spec.in b/ceph.spec.in
index 47d207645f91d3b1c8b2c2f0d1cebaf1320fca87..378a7a592b845c9ed37f704809cdc829d10fe2e4 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -426,14 +426,13 @@ fi
 %{_libdir}/rados-classes/libcls_replica_log.so*
 %{_libdir}/rados-classes/libcls_statelog.so*
 %{_libdir}/rados-classes/libcls_version.so*
-%dir %{_libdir}/erasure-code
-%{_libdir}/erasure-code/libec_example.so*
-%{_libdir}/erasure-code/libec_fail_to_initialize.so*
-%{_libdir}/erasure-code/libec_fail_to_register.so*
-%{_libdir}/erasure-code/libec_hangs.so*
-%{_libdir}/erasure-code/libec_jerasure.so*
-%{_libdir}/erasure-code/libec_missing_entry_point.so*
-%{_libdir}/ceph
+%dir %{_libdir}/ceph/erasure-code
+%{_libdir}/ceph/erasure-code/libec_example.so*
+%{_libdir}/ceph/erasure-code/libec_fail_to_initialize.so*
+%{_libdir}/ceph/erasure-code/libec_fail_to_register.so*
+%{_libdir}/ceph/erasure-code/libec_hangs.so*
+%{_libdir}/ceph/erasure-code/libec_jerasure.so*
+%{_libdir}/ceph/erasure-code/libec_missing_entry_point.so*
 /lib/udev/rules.d/50-rbd.rules
 /lib/udev/rules.d/60-ceph-partuuid-workaround.rules
 /lib/udev/rules.d/95-ceph-osd.rules

diff --git a/debian/ceph.install b/debian/ceph.install
index 25e5c1d709eb01ebe5e790349e2a4fa4c7d02ac7..b7f16d3d484679fcc1b07a15557d3ef22be8dd45 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -16,6 +16,7 @@ usr/bin/crushtool
 usr/bin/monmaptool
 usr/bin/osdmaptool
 usr/lib/ceph/ceph_common.sh
+usr/lib/ceph/erasure-code/*
 usr/lib/rados-classes/*
 usr/share/doc/ceph/sample.ceph.conf
 usr/share/doc/ceph/sample.fetch_config

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 011307a6802f7ee68a02ce6eac6af58f230c92d0..6f6a17e9fad74ab6d7b602191c85be8b6af64890 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -54,7 +54,8 @@ AM_COMMON_CPPFLAGS = \
        -D_THREAD_SAFE \
        -D__STDC_FORMAT_MACROS \
        -D_GNU_SOURCE \
-       -DCEPH_LIBDIR=\"${libdir}\"
+       -DCEPH_LIBDIR=\"${libdir}\" \
+       -DCEPH_PKGLIBDIR=\"${pkglibdir}\"
 
 AM_COMMON_CFLAGS = \
        -Wall \

diff --git a/src/osd/Makefile.am b/src/osd/Makefile.am
index cb9db20d7345ee859a30ede3f139bbc5adcabccc..9076062fc86680ee882555e68c73048ffb574ff2 100644 (file)
--- a/src/osd/Makefile.am
+++ b/src/osd/Makefile.am
@@ -1,5 +1,5 @@
 ## erasure code plugins
-erasure_codelibdir = $(libdir)/erasure-code
+erasure_codelibdir = $(pkglibdir)/erasure-code
 erasure_codelib_LTLIBRARIES =  
 
 include osd/ErasureCodePluginJerasure/Makefile.am