From: Kefu Chai Date: Wed, 13 Feb 2019 11:25:23 +0000 (+0800) Subject: rpm,deb: remove btrfs-tools as a build-dependency X-Git-Tag: v14.1.0~32^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01c9e2a63207def7c1310a432b35069e60038f6e;p=ceph.git rpm,deb: remove btrfs-tools as a build-dependency this change reverts 7d48d21a we are using bluestore for testing by default on GNU/Linux now. and on FreeBSD, install-deps.sh does not look at spec.in or d/control. Signed-off-by: Kefu Chai --- diff --git a/ceph.spec.in b/ceph.spec.in index 482808d4142..d0b8747a589 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -219,7 +219,6 @@ BuildRequires: systemd PreReq: %fillup_prereq BuildRequires: net-tools BuildRequires: libbz2-devel -BuildRequires: btrfsprogs BuildRequires: mozilla-nss-devel BuildRequires: keyutils-devel BuildRequires: libopenssl-devel @@ -238,7 +237,6 @@ BuildRequires: liblz4-devel >= 1.7 %if 0%{?fedora} || 0%{?rhel} Requires: systemd BuildRequires: boost-random -BuildRequires: btrfs-progs BuildRequires: nss-devel BuildRequires: keyutils-libs-devel BuildRequires: libibverbs-devel diff --git a/debian/control b/debian/control index f9d293787a0..d4ba1286b5f 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,7 @@ Vcs-Browser: https://github.com/ceph/ceph Maintainer: Ceph Maintainers Uploaders: Ken Dreyer , Alfredo Deza , -Build-Depends: btrfs-tools, - cmake (>= 3.5), +Build-Depends: cmake (>= 3.5), cpio, cryptsetup-bin | cryptsetup, cython,