From: Brad Hubbard <bhubbard@redhat.com>
Date: Wed, 14 Sep 2016 11:33:36 +0000 (+1000)
Subject: Remove dependency on sdparm/hdparm
X-Git-Tag: v11.0.1~149^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e71cd2c81756ddc7557c91eefdb9ff7ee70e15c;p=ceph.git

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 9ba1fd8293730..b1391fa01e990 100644
--- 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 27b56f2ca9c7c..bc9f19aecb1de 100644
--- 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 6caf951b50a81..b3f44791d0a95 100644
--- 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 7562f860211e3..0e06cfa6c72b8 100644
--- 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 9735716f793ea..a27526aedccc0 100644
--- 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 7e01fab65aba5..8c64a05294421 100644
--- 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 20eb1814f5199..26402d77a964e 100644
--- 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 5a1c6a16fe653..738bb66c1849e 100644
--- 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 51b47ad4ae49a..a2c214c3230ba 100644
--- 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 116fc5dadc36b..1f006663967ef 100644
--- 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