packaging: lsb_release build and runtime dependency

The lsb_release executable is being run in multiple places, not least in
src/common/util.cc, which calls it via shell in the collect_sys_info() code
path.

This patch addresses this issue on SUSE- and Debian-derivatives, as well
as reinstating the dependency for RHEL/Fedora after it was dropped in
15600572265bed397fbd80bdd2b7d83a0e9bd918.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index d3e9cc0bd84af59e4153216e724d868d9b789442..a8f89186b328b943408180c8c3f441cc506bfdc8 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -158,7 +158,9 @@ BuildRequires:      gperftools-devel
 BuildRequires: mozilla-nss-devel
 BuildRequires: keyutils-devel
 BuildRequires: libatomic-ops-devel
-%else
+BuildRequires:  lsb-release
+%endif
+%if 0%{?fedora} || 0%{?rhel} 
 %if 0%{?_with_systemd}
 Requires:      systemd
 %endif
@@ -169,6 +171,7 @@ Requires(post):     chkconfig
 Requires(preun):       chkconfig
 Requires(preun):       initscripts
 BuildRequires: gperftools-devel
+BuildRequires:  redhat-lsb-core
 %endif
 # boost
 %if 0%{?fedora} || 0%{?rhel} 
@@ -236,6 +239,12 @@ Requires:      hdparm
 Requires:      cryptsetup
 Requires:      findutils
 Requires:      which
+%if 0%{?suse_version}
+Requires:      lsb-release
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+Requires:      redhat-lsb-core
+%endif
 %description base
 Base is the package that includes all the files shared amongst ceph servers
 

diff --git a/debian/control b/debian/control
index d4d31469db1700cbd03c64e7d6a88b50bfd40d8b..1d37d916cc9151e0fd5bcc7dcb292140c4ae4c66 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -84,6 +84,7 @@ Depends: binutils,
          gdisk,
          grep,
          logrotate,
+         lsb-release,
          parted,
          python,
          python-argparse,