From 68508e28adffae64a52ea4c0046fbe8537e0d093 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 25 Jun 2015 22:37:52 +0200 Subject: [PATCH] ceph.spec.in: use _udevrulesdir to eliminate conditionals The conditionals governing where 50-rbd.rules is installed were not doing the right thing on SUSE distros. Start using the %_udevrulesdir RPM macro, while taking care that it is defined and set to the right value. Use it to eliminate some conditionals around other udev rules files as well. http://tracker.ceph.com/issues/12166 Fixes: #12166 Signed-off-by: Nathan Cutler (cherry picked from commit 8aa758ee7a14e93ded1d55b4aca7a54aa47d7174) Conflicts: ceph.spec.in master spec file has diverged significantly from firefly --- ceph.spec.in | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index b1372aa422a5c..468493e7ba529 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -5,9 +5,12 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif +%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} + ################################################################################# # common ################################################################################# + Name: ceph Version: @VERSION@ Release: @RPM_RELEASE@%{?dist} @@ -352,13 +355,8 @@ chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config # udev rules -%if 0%{?rhel} >= 7 || 0%{?fedora} -install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/50-rbd.rules -install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules -%else -install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules -install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-ceph-partuuid-workaround.rules -%endif +install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT%{_udevrulesdir}/50-rbd.rules +install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT%{_udevrulesdir}/60-ceph-partuuid-workaround.rules %if (0%{?rhel} && 0%{?rhel} < 7) install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules @@ -477,13 +475,8 @@ fi %{_libdir}/ceph/erasure-code/libec_jerasure*.so* %{_libdir}/ceph/erasure-code/libec_test_jerasure*.so* %{_libdir}/ceph/erasure-code/libec_missing_entry_point.so* -%if 0%{?rhel} >= 7 || 0%{?fedora} -/usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules -/usr/lib/udev/rules.d/95-ceph-osd.rules -%else -/lib/udev/rules.d/60-ceph-partuuid-workaround.rules -/lib/udev/rules.d/95-ceph-osd.rules -%endif +%{_udevrulesdir}/60-ceph-partuuid-workaround.rules +%{_udevrulesdir}/95-ceph-osd.rules %config %{_sysconfdir}/bash_completion.d/ceph %config(noreplace) %{_sysconfdir}/logrotate.d/ceph %config(noreplace) %{_sysconfdir}/logrotate.d/radosgw @@ -543,6 +536,7 @@ fi %config %{_sysconfdir}/bash_completion.d/rbd %config(noreplace) %{_sysconfdir}/ceph/rbdmap %{_initrddir}/rbdmap +%{_udevrulesdir}/50-rbd.rules %postun -n ceph-common # Package removal cleanup -- 2.39.5