patches/0013-d-control-move-python-dependencies-over-to-python3.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Thomas Lamprecht <t.lamprecht@proxmox.com>
   3 Date: Tue, 2 Jun 2020 17:20:44 +0200
   4 Subject: [PATCH] d/control: move python dependencies over to python3
   5
   6 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
   7 ---
   8  debian/control | 24 ++++++++++++------------
   9  debian/rules   | 10 ------------
  10  2 files changed, 12 insertions(+), 22 deletions(-)
  11
  12 diff --git a/debian/control b/debian/control
  13 index c93aa3c21..aa8edb3d2 100644
  14 --- a/debian/control
  15 +++ b/debian/control
  16 @@ -137,7 +137,7 @@ Depends: binutils,
  17           parted,
  18           psmisc,
  19           ${misc:Depends},
  20 -         ${python:Depends},
  21 +         ${python3:Depends},
  22           ${shlibs:Depends},
  23  Recommends: btrfs-tools,
  24              ceph-mds (= ${binary:Version}),
  25 @@ -185,7 +185,7 @@ Package: cephadm
  26  Architecture: linux-any
  27  Recommends: podman (>= 2.0.2) | docker.io
  28  Depends: lvm2,
  29 -        ${python:Depends},
  30 +        ${python3:Depends},
  31  Description: cephadm utility to bootstrap ceph daemons with systemd and containers
  32   Ceph is a massively scalable, open-source, distributed
  33   storage system that runs on commodity hardware and delivers object,
  34 @@ -239,8 +239,9 @@ Depends: ceph-base (= ${binary:Version}),
  35           python3-werkzeug,
  36           libsqlite3-mod-ceph (= ${binary:Version}),
  37           librados2 (= ${binary:Version}),
  38 +         python3-yaml,
  39           ${misc:Depends},
  40 -         ${python:Depends},
  41 +         ${python3:Depends},
  42           ${shlibs:Depends},
  43  Suggests: ceph-mgr-dashboard,
  44            ceph-mgr-diskprediction-local,
  45 @@ -267,7 +267,7 @@ Depends: ceph-mgr (= ${binary:Version}),
  46           python3-werkzeug,
  47           python3-routes,
  48           ${misc:Depends},
  49 -         ${python:Depends},
  50 +         ${python3:Depends},
  51           ${shlibs:Depends},
  52  Description: dashboard module for ceph-mgr
  53   Ceph is a massively scalable, open-source, distributed
  54 @@ -288,7 +288,7 @@ Depends: ceph-mgr (= ${binary:Version}),
  55           python3-scipy,
  56           python3-sklearn,
  57           ${misc:Depends},
  58 -         ${python:Depends},
  59 +         ${python3:Depends},
  60           ${shlibs:Depends},
  61  Description: diskprediction-local module for ceph-mgr
  62   Ceph is a massively scalable, open-source, distributed
  63 @@ -301,7 +301,7 @@ Description: diskprediction-local module for ceph-mgr
  64  Package: ceph-mgr-modules-core
  65  Architecture: all
  66  Depends: ${misc:Depends},
  67 -         ${python:Depends},
  68 +         ${python3:Depends},
  69           ${shlibs:Depends},
  70           python3-dateutil,
  71           python3-openssl,
  72 @@ -320,7 +320,7 @@ Depends: ceph-mgr (= ${binary:Version}),
  73  Depends: ceph-mgr (= ${binary:Version}),
  74           python3-jsonpatch
  75           ${misc:Depends},
  76 -         ${python:Depends},
  77 +         ${python3:Depends},
  78           ${shlibs:Depends},
  79  Description: rook module for ceph-mgr
  80   Ceph is a massively scalable, open-source, distributed
  81 @@ -336,7 +336,7 @@ Architecture: all
  82  Depends: ceph-mgr (= ${binary:Version}),
  83           python3-kubernetes,
  84           ${misc:Depends},
  85 -         ${python:Depends},
  86 +         ${python3:Depends},
  87  Description: kubernetes events module for ceph-mgr
  88   Ceph is a massively scalable, open-source, distributed
  89   storage system that runs on commodity hardware and delivers object,
  90 @@ -351,7 +351,7 @@ Depends: ceph-mgr (= ${binary:Version}),
  91  Depends: ceph-mgr (= ${binary:Version}),
  92          cephadm,
  93           ${misc:Depends},
  94 -         ${python:Depends},
  95 +         ${python3:Depends},
  96           openssh-client,
  97           python3-jinja2,
  98           python3-cherrypy3,
  99 @@ -413,7 +413,7 @@ Depends: ceph-base (= ${binary:Version}),
 100  Depends: ceph-base (= ${binary:Version}),
 101           sudo,
 102           ${misc:Depends},
 103 -         ${python:Depends},
 104 +         ${python3:Depends},
 105           ${shlibs:Depends},
 106  Replaces: ceph (<< 10),
 107            ceph-test (<< 12.2.2-14),
 108 @@ -646,7 +646,7 @@ Depends: librbd1 (= ${binary:Version}),
 109           python3-rbd (= ${binary:Version}),
 110           python3-rgw (= ${binary:Version}),
 111           ${misc:Depends},
 112 -         ${python:Depends},
 113 +         ${python3:Depends},
 114           ${shlibs:Depends},
 115  Conflicts: ceph-client-tools,
 116  Replaces: ceph (<< 10),
 117 diff --git a/debian/rules b/debian/rules
 118 index c93aa3c21..aa8edb3d2 100755
 119 --- a/debian/rules
 120 +++ b/debian/rules
 121 @@ -141,16 +141,6 @@
 122  override_dh_shlibdeps:
 123         dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor --exclude=ceph_crypto
 124
 125 -override_dh_python3:
 126 -       for binding in rados cephfs rbd rgw; do \
 127 -         dh_python3 -p python3-$$binding;      \
 128 -       done
 129 -       dh_python3 -p python3-ceph-argparse
 130 -       dh_python3 -p python3-ceph-common
 131 -       dh_python3 -p cephfs-shell
 132 -       dh_python3 -p cephfs-top
 133 -       dh_python3 -p cephadm
 134 -
 135  # do not run tests
 136  override_dh_auto_test:
 137