From: Gary Lowell <glowell@inktank.com>
Date: Mon, 4 Feb 2013 20:56:01 +0000 (-0800)
Subject: install:  remove perl dependency
X-Git-Tag: v0.58~138^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a6924a5621e3eb40b8631119de9c7a349300c53;p=ceph.git

install:  remove perl dependency

Change the filter in logrotate to use sed instead of perl, and remove the
package dependency on perl.

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 7efb9889a740..a701abddf3c0 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -24,7 +24,6 @@ Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
 Requires:	librbd1 = %{version}-%{release}
 Requires:	librados2 = %{version}-%{release}
 Requires:	libcephfs1 = %{version}-%{release}
-Requires:	perl
 Requires:	python
 Requires(post):	binutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/debian/control b/debian/control
index 5f71995a9322..e79cbbd22929 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Standards-Version: 3.9.3
 
 Package: ceph
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python, xfsprogs, perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python, xfsprogs
 Recommends: ceph-mds, librados2, librbd1, btrfs-tools, gdisk, parted
 Description: distributed storage and file system
  Ceph is a distributed storage system designed to provide excellent
diff --git a/src/logrotate.conf b/src/logrotate.conf
index 9af310413d9a..0a4a5a2422a4 100644
--- a/src/logrotate.conf
+++ b/src/logrotate.conf
@@ -15,7 +15,7 @@
             #   https://bugs.launchpad.net/upstart/+bug/1012938
             for type in mon osd mds; do
 		initctl list \
-		    | perl -ne 'print "$+{service} cluster=$+{cluster} id=$+{id}\n" if m{^(?<service>ceph-(mon|osd|mds)+)\s+\((?<cluster>[^/)]+)/(?<id>[^)]+)\) start/}' \
+		    | sed -n 's/^\(ceph-\(mon\|osd\|mds\)\+\)[ \t]\+(\([^ \/]\+\)\/\([^ \/]\+\))[ \t]\+start\/.*$/\1 cluster=\3 id=\4/p' \
 		    | while read l; do
 		    initctl reload -- $l 2>/dev/null || :
 		done