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>
(cherry picked from commit b87f4efb5689a8db77e06baf4f469afcd9df3677)

Conflicts:
	ceph.spec.in
             The jewel specfile has diverged considerably from hammer:
             systemd, package split, etc. This is more of a hand backport
             than a cherry-pick.

diff --git a/ceph.spec.in b/ceph.spec.in
index 3f9a126c4b63d66fe00e0918a352c72f82fe681e..79cd572a69d3a8810973b80e397391054d95878c 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -103,7 +103,10 @@ BuildRequires:     %insserv_prereq
 BuildRequires: mozilla-nss-devel
 BuildRequires: keyutils-devel
 BuildRequires: libatomic-ops-devel
-%else
+Requires:       lsb-release
+BuildRequires:  lsb-release
+%endif
+%if 0%{?fedora} || 0%{?rhel} 
 Requires:      gdisk
 BuildRequires: nss-devel
 BuildRequires: keyutils-libs-devel
@@ -114,6 +117,8 @@ Requires(preun):chkconfig
 Requires(preun):initscripts
 BuildRequires: gperftools-devel
 Requires:      python-flask
+Requires:       redhat-lsb-core
+BuildRequires:  redhat-lsb-core
 %endif
 # lttng and babeltrace for rbd-replay-prep
 %if 0%{?_with_lttng}

diff --git a/debian/control b/debian/control
index 535da30f9c0cd656f963b92554b90e86e1f5bd42..2289ca304519057b8966a20a67e624fc4d423106 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -66,6 +66,7 @@ Depends: binutils,
          cryptsetup-bin | cryptsetup,
          gdisk,
          logrotate,
+         lsb-release,
          parted,
          python,
          python-argparse,