Skip to content

Commit

Permalink
script: subscription-manager support (part 2)
Browse files Browse the repository at this point in the history
Strip the .py suffix so that no pyc / pyo files are generated.
Do not install on CentOS.

http://tracker.ceph.com/issues/14972 Fixes: ceph#14972

Signed-off-by: Loic Dachary <loic@dachary.org>
  • Loading branch information
ldachary committed Mar 26, 2016
1 parent 1cbe2bd commit 0ab4813
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions ceph.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
--libexecdir=%{_libexecdir} \
--localstatedir=/var \
--sysconfdir=/etc \
%if 0%{?rhel}
%if 0%{?rhel} && ! 0%{?centos}
--enable-subman \
%endif
%if 0%{?_with_systemd}
Expand Down Expand Up @@ -1189,8 +1189,8 @@ fi
%{_mandir}/man8/ceph-clsinfo.8*
%{_mandir}/man8/ceph-disk.8*
%{_mandir}/man8/ceph-osd.8*
%if 0%{?rhel}
/etc/cron.hourly/subman.py
%if 0%{?rhel} && ! 0%{?centos}
/etc/cron.hourly/subman
%endif
%if 0%{?_with_systemd}
%{_unitdir}/ceph-osd@.service
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ AM_CONDITIONAL(ENABLE_SERVER, test "$enable_server" = "yes")
AC_ARG_ENABLE([subman],
[AS_HELP_STRING([--enable-subman], [enable subman])],
[],
[enable_subman=yes])
AM_CONDITIONAL([ENABLE_SUBMAN], test "$enable_subman" = "yes")
[enable_subman=no])
AM_CONDITIONAL([ENABLE_SUBMAN], test "x$enable_subman" != "xno")

# cython is required to build python bindings for libraries
if test x"$with_cython" = xyes; then
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ EXTRA_DIST += \
$(srcdir)/.git_version \
$(srcdir)/ceph-rbdnamer \
$(srcdir)/tools/ceph-monstore-update-crush.sh \
$(srcdir)/script/subman.py \
$(srcdir)/script/subman \
$(srcdir)/upstart/ceph-all.conf \
$(srcdir)/upstart/ceph-disk.conf \
$(srcdir)/upstart/ceph-mon.conf \
Expand Down Expand Up @@ -155,7 +155,7 @@ ceph_libexec_SCRIPTS = ceph_common.sh ceph-osd-prestart.sh

if ENABLE_SUBMAN
submandir = /etc/cron.hourly
subman_SCRIPTS = script/subman.py
subman_SCRIPTS = script/subman
endif

# tests to actually run on "make check"; if you need extra, non-test,
Expand Down
File renamed without changes.

0 comments on commit 0ab4813

Please sign in to comment.