From 5726463368ddcc688e6308d22992568ba4c0da32 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 26 Feb 2016 18:30:49 +0100 Subject: [PATCH] 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 (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. --- ceph.spec.in | 7 ++++++- debian/control | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index 3f9a126c4b63d..79cd572a69d3a 100644 --- 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 535da30f9c0cd..2289ca3045190 100644 --- a/debian/control +++ b/debian/control @@ -66,6 +66,7 @@ Depends: binutils, cryptsetup-bin | cryptsetup, gdisk, logrotate, + lsb-release, parted, python, python-argparse, -- 2.39.5