Merge PR ceph#24707 into master

* refs/pull/24707/head: build/ops: drop sgdisk build/runtime dependencies Reviewed-by: Tim Serong <[email protected]> Reviewed-by: Kefu Chai <[email protected]> Reviewed-by: Jan Fajerski <[email protected]>
salieri11 · Oct 24, 2018 · 82acec1 · 82acec1
2 parents 2ff2a1a + 7349218
commit 82acec1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/.githubmap b/.githubmap
@@ -84,3 +84,4 @@ myoungwon Myoungwon Oh <[email protected]>
 dillaman Jason Dillaman <[email protected]>
 batrick Patrick Donnelly <[email protected]>
 noahdesu Noah Watkins <[email protected]>
+tserong Tim Serong <[email protected]>
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -340,7 +340,6 @@ Requires:      util-linux
 Requires:      xfsprogs
 Requires:      which
 %if 0%{?fedora} || 0%{?rhel}
-Requires:      gdisk
 # The following is necessary due to tracker 36508 and can be removed once the
 # associated upstream bugs are resolved.
 %if 0%{with tcmalloc}
@@ -349,7 +348,6 @@ Requires:      gperftools-libs >= 2.6.1
 %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

diff --git a/debian/control b/debian/control
@@ -19,7 +19,6 @@ Build-Depends: bc,
                dh-exec,
                dh-python,
                dh-systemd,
-               gdisk,
                git,
                gperf,
                javahelper,
@@ -97,7 +96,6 @@ Depends: binutils,
          debianutils,
          e2fsprogs,
          findutils,
-         gdisk,
          grep,
          logrotate,
          parted,