Remove dependency on sdparm/hdparm

The code requiring a dependency on hdparm has been removed so we can remove it
as a dependency.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 9ba1fd82937307fc4fb746e3e55711d8224ec767..b1391fa01e9903fbf01e3d7a91bdbd127ffa611b 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -103,7 +103,6 @@ BuildRequires:      gdbm
 %if 0%{with tcmalloc}
 BuildRequires: gperftools-devel
 %endif
-BuildRequires: hdparm
 BuildRequires:  jq
 BuildRequires: leveldb-devel > 1.2
 BuildRequires: libaio-devel
@@ -227,7 +226,6 @@ Requires:      grep
 Requires:      xfsprogs
 Requires:      logrotate
 Requires:      util-linux
-Requires:      hdparm
 Requires:      cryptsetup
 Requires:      findutils
 Requires:      which

diff --git a/debian/control b/debian/control
index 27b56f2ca9c7c72e4d066c057189d8bdf914c83a..bc9f19aecb1deeb1e7ae5b484936447a67b75b74 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,6 @@ Build-Depends: btrfs-tools,
                python3-all-dev,
                python3-setuptools,
                virtualenv | python-virtualenv,
-               sdparm | hdparm,
                uuid-runtime,
                valgrind,
                xfslibs-dev,
@@ -92,7 +91,6 @@ Depends: binutils,
          logrotate,
          lsb-release,
          ${python:Depends},
-         sdparm | hdparm,
          xfsprogs,
          ${misc:Depends},
          ${shlibs:Depends}

diff --git a/src/test/centos-6/Dockerfile.in b/src/test/centos-6/Dockerfile.in
index 6caf951b50a81374f93be88b32b64f31cbe35a81..b3f44791d0a954464bd5e57ba73e3a3407b32612 100644 (file)
--- a/src/test/centos-6/Dockerfile.in
+++ b/src/test/centos-6/Dockerfile.in
@@ -26,5 +26,5 @@ RUN yum install -y yum-utils && yum-config-manager --add-repo https://dl.fedorap
 RUN yum install -y which ; cd /root ; ./install-deps.sh
 # development tools
 # nc is required to run make check on firefly only (giant+ do not use nc)
-RUN yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx hdparm jq sudo xmlstarlet parted nc
+RUN yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx jq sudo xmlstarlet parted nc
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi

diff --git a/src/test/centos-7/Dockerfile.in b/src/test/centos-7/Dockerfile.in
index 7562f860211e3a9206671beee3578f6d765fa5e2..0e06cfa6c72b8421ec8c8a8af2e8d3ef857391b8 100644 (file)
--- a/src/test/centos-7/Dockerfile.in
+++ b/src/test/centos-7/Dockerfile.in
@@ -29,5 +29,5 @@ RUN yum install -y yum-utils && yum-config-manager --add-repo https://dl.fedorap
 RUN cd /root ; ./install-deps.sh
 # development tools
 # nc is required to run make check on firefly only (giant+ do not use nc)
-RUN yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx hdparm jq sudo xmlstarlet parted nc
+RUN yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx jq sudo xmlstarlet parted nc
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi

diff --git a/src/test/debian-jessie/Dockerfile.in b/src/test/debian-jessie/Dockerfile.in
index 9735716f793eab5096fc6b11024817933cf2e562..a27526aedccc0312789b65331db307cfff545c67 100644 (file)
--- a/src/test/debian-jessie/Dockerfile.in
+++ b/src/test/debian-jessie/Dockerfile.in
@@ -27,5 +27,5 @@ RUN apt-get update
 # build dependencies
 RUN cd /root ; ./install-deps.sh
 # development tools
-RUN apt-get install -y sudo ccache valgrind gdb python-virtualenv gdisk kpartx hdparm jq xmlstarlet
+RUN apt-get install -y sudo ccache valgrind gdb python-virtualenv gdisk kpartx jq xmlstarlet
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi

diff --git a/src/test/fedora-21/Dockerfile.in b/src/test/fedora-21/Dockerfile.in
index 7e01fab65aba50e1cd94a6e52f962541339ea8bf..8c64a0529442189c51951255c03e7f2324d1c483 100644 (file)
--- a/src/test/fedora-21/Dockerfile.in
+++ b/src/test/fedora-21/Dockerfile.in
@@ -25,5 +25,5 @@ COPY ceph.spec.in /root/
 RUN yum install -y which ; cd /root ; ./install-deps.sh
 # development tools
 # nc is required to run make check on firefly only (giant+ do not use nc)
-RUN yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx hdparm jq sudo xmlstarlet parted nc
+RUN yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx jq sudo xmlstarlet parted nc
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi

diff --git a/src/test/opensuse-13.2/Dockerfile.in b/src/test/opensuse-13.2/Dockerfile.in
index 20eb1814f51996105766ce65dc7df91ad0f8e479..26402d77a964e07f358d58315c2bbaecb3b3743c 100644 (file)
--- a/src/test/opensuse-13.2/Dockerfile.in
+++ b/src/test/opensuse-13.2/Dockerfile.in
@@ -26,5 +26,5 @@ COPY ceph.spec.in /root/
 RUN cd /root ; ./install-deps.sh
 # development tools
 # nc (ncat) is required to run make check on firefly only (giant+ do not use nc)
-RUN zypper --non-interactive install ccache valgrind gdb git python-virtualenv gdisk kpartx hdparm ncat sudo xmlstarlet parted
+RUN zypper --non-interactive install ccache valgrind gdb git python-virtualenv gdisk kpartx ncat sudo xmlstarlet parted
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi

diff --git a/src/test/ubuntu-12.04/Dockerfile.in b/src/test/ubuntu-12.04/Dockerfile.in
index 5a1c6a16fe6537fc772523a1f3052a1d6046cfba..738bb66c1849e6b58a2cd3446f0de8b8f4c5ec94 100644 (file)
--- a/src/test/ubuntu-12.04/Dockerfile.in
+++ b/src/test/ubuntu-12.04/Dockerfile.in
@@ -27,5 +27,5 @@ RUN apt-get update
 # build dependencies
 RUN cd /root ; ./install-deps.sh
 # development tools
-RUN apt-get install -y sudo ccache valgrind gdb python-virtualenv gdisk kpartx hdparm xmlstarlet
+RUN apt-get install -y sudo ccache valgrind gdb python-virtualenv gdisk kpartx xmlstarlet
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi

diff --git a/src/test/ubuntu-14.04/Dockerfile.in b/src/test/ubuntu-14.04/Dockerfile.in
index 51b47ad4ae49a837b7e11f4e57519fc8541cefb3..a2c214c3230babbb34f26d8e76a0823a4facbdd5 100644 (file)
--- a/src/test/ubuntu-14.04/Dockerfile.in
+++ b/src/test/ubuntu-14.04/Dockerfile.in
@@ -27,5 +27,5 @@ RUN apt-get update
 # build dependencies
 RUN cd /root ; ./install-deps.sh
 # development tools
-RUN apt-get install -y ccache valgrind gdb python-virtualenv gdisk kpartx hdparm jq xmlstarlet
+RUN apt-get install -y ccache valgrind gdb python-virtualenv gdisk kpartx jq xmlstarlet
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi

diff --git a/src/test/ubuntu-16.04/Dockerfile.in b/src/test/ubuntu-16.04/Dockerfile.in
index 116fc5dadc36b3b1e7fc538725fba6207410ba60..1f006663967ef7ca7d6d271640a58708bfda6afe 100644 (file)
--- a/src/test/ubuntu-16.04/Dockerfile.in
+++ b/src/test/ubuntu-16.04/Dockerfile.in
@@ -27,5 +27,5 @@ RUN apt-get update
 # build dependencies
 RUN cd /root ; ./install-deps.sh
 # development tools
-RUN apt-get install -y ccache valgrind gdb python-virtualenv gdisk kpartx hdparm jq xmlstarlet sudo
+RUN apt-get install -y ccache valgrind gdb python-virtualenv gdisk kpartx jq xmlstarlet sudo
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi