Skip to content

Commit

Permalink
packaging: lsb_release build and runtime dependency
Browse files Browse the repository at this point in the history
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
1560057.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
  • Loading branch information
smithfarm committed Mar 1, 2016
1 parent 1a84b8c commit b87f4ef
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
11 changes: 10 additions & 1 deletion ceph.spec.in
Expand Up @@ -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
Expand All @@ -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}
Expand Down Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions debian/control
Expand Up @@ -84,6 +84,7 @@ Depends: binutils,
gdisk,
grep,
logrotate,
lsb-release,
parted,
python,
python-argparse,
Expand Down

0 comments on commit b87f4ef

Please sign in to comment.