From: Loic Dachary <loic@dachary.org>
Date: Fri, 20 Dec 2013 16:05:45 +0000 (+0100)
Subject: packaging: erasure-code plugins go in /usr/lib/ceph
X-Git-Tag: v0.75~48^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af22b0a09b3eeac17f3d0b2aeb6c59d9883d79b9;p=ceph.git

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 47d207645f91..378a7a592b84 100644
--- 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 25e5c1d709eb..b7f16d3d4846 100644
--- 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 011307a6802f..6f6a17e9fad7 100644
--- 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 cb9db20d7345..9076062fc866 100644
--- 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