Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rpm,debian: Ensure all ceph-disk runtime dependencies are declared for ceph-base #21356

Merged
merged 2 commits into from
Apr 13, 2018
Merged

rpm,debian: Ensure all ceph-disk runtime dependencies are declared for ceph-base #21356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e23a12c
build/ops: rpm: move sgdisk-providing dep to ceph-base
smithfarm Apr 11, 2018
acf6423
build/ops: move parted runtime dependency to ceph-base
smithfarm Apr 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions ceph.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,14 +290,19 @@ Requires: cryptsetup
Requires: findutils
Requires: grep
Requires: logrotate
Requires: parted
Requires: psmisc
Requires: python%{_python_buildid}-requests
Requires: python%{_python_buildid}-setuptools
Requires: util-linux
Requires: xfsprogs
Requires: which
%if 0%{?fedora} || 0%{?rhel}
Requires: gdisk
%endif
%if 0%{?suse_version}
Recommends: chrony
Requires: gptfdisk
%endif
%description base
Base is the package that includes all the files shared amongst ceph servers
Expand Down Expand Up @@ -469,14 +474,6 @@ Summary: Ceph Object Storage Daemon
Group: System/Filesystems
%endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
# for sgdisk, used by ceph-disk
%if 0%{?fedora} || 0%{?rhel}
Requires: gdisk
%endif
%if 0%{?suse_version}
Requires: gptfdisk
%endif
Requires: parted
Requires: lvm2
%description osd
ceph-osd is the object storage daemon for the Ceph distributed file
Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ Depends: binutils,
gdisk,
grep,
logrotate,
parted,
psmisc,
xfsprogs,
${misc:Depends},
Expand Down Expand Up @@ -239,7 +240,6 @@ Description: debugging symbols for ceph-mon
Package: ceph-osd
Architecture: linux-any
Depends: ceph-base (= ${binary:Version}),
parted,
lvm2,
${misc:Depends},
${python:Depends},
Expand Down