]>
Commit | Line | Data |
---|---|---|
c07b793c TL |
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 ++++++++++++------------ | |
be11c882 TL |
9 | debian/rules | 10 ------------ |
10 | 2 files changed, 12 insertions(+), 22 deletions(-) | |
c07b793c TL |
11 | |
12 | diff --git a/debian/control b/debian/control | |
13 | index c93aa3c21..aa8edb3d2 100644 | |
14 | --- a/debian/control | |
15 | +++ b/debian/control | |
16 | @@ -126,7 +126,7 @@ Depends: binutils, | |
17 | psmisc, | |
18 | xfsprogs, | |
19 | ${misc:Depends}, | |
20 | - ${python:Depends}, | |
21 | + ${python3:Depends}, | |
22 | ${shlibs:Depends}, | |
23 | Recommends: btrfs-tools, | |
24 | ceph-mds (= ${binary:Version}), | |
25 | @@ -172,7 +172,7 @@ Package: cephadm | |
26 | Architecture: linux-any | |
27 | Recommends: podman | 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 | @@ -223,7 +223,7 @@ Depends: ceph-base (= ${binary:Version}), | |
35 | python3-requests, | |
36 | python3-werkzeug, | |
37 | ${misc:Depends}, | |
38 | - ${python:Depends}, | |
39 | + ${python3:Depends}, | |
40 | ${shlibs:Depends}, | |
41 | Suggests: ceph-mgr-dashboard, | |
42 | ceph-mgr-diskprediction-local, | |
43 | @@ -250,7 +250,7 @@ Depends: ceph-mgr (= ${binary:Version}), | |
44 | python3-werkzeug, | |
45 | python3-routes, | |
46 | ${misc:Depends}, | |
47 | - ${python:Depends}, | |
48 | + ${python3:Depends}, | |
49 | ${shlibs:Depends}, | |
50 | Description: dashboard module for ceph-mgr | |
51 | Ceph is a massively scalable, open-source, distributed | |
52 | @@ -271,7 +271,7 @@ Depends: ceph-mgr (= ${binary:Version}), | |
53 | python3-scipy, | |
54 | python3-sklearn, | |
55 | ${misc:Depends}, | |
56 | - ${python:Depends}, | |
57 | + ${python3:Depends}, | |
58 | ${shlibs:Depends}, | |
59 | Description: diskprediction-local module for ceph-mgr | |
60 | Ceph is a massively scalable, open-source, distributed | |
61 | @@ -285,7 +285,7 @@ Package: ceph-mgr-diskprediction-cloud | |
62 | Architecture: all | |
63 | Depends: ceph-mgr (= ${binary:Version}), | |
64 | ${misc:Depends}, | |
65 | - ${python:Depends}, | |
66 | + ${python3:Depends}, | |
67 | ${shlibs:Depends}, | |
68 | Description: diskprediction-cloud module for ceph-mgr | |
69 | Ceph is a massively scalable, open-source, distributed | |
70 | @@ -298,7 +298,7 @@ Description: diskprediction-cloud module for ceph-mgr | |
71 | Package: ceph-mgr-modules-core | |
72 | Architecture: all | |
73 | Depends: ${misc:Depends}, | |
74 | - ${python:Depends}, | |
75 | + ${python3:Depends}, | |
76 | ${shlibs:Depends}, | |
77 | python3-dateutil, | |
78 | python3-openssl, | |
79 | @@ -319,7 +319,7 @@ Depends: ceph-mgr (= ${binary:Version}), | |
80 | python3-six, | |
81 | python3-jsonpatch | |
82 | ${misc:Depends}, | |
83 | - ${python:Depends}, | |
84 | + ${python3:Depends}, | |
85 | ${shlibs:Depends}, | |
86 | Description: rook module for ceph-mgr | |
87 | Ceph is a massively scalable, open-source, distributed | |
88 | @@ -335,7 +335,7 @@ Architecture: all | |
89 | Depends: ceph-mgr (= ${binary:Version}), | |
90 | python3-kubernetes, | |
91 | ${misc:Depends}, | |
92 | - ${python:Depends}, | |
93 | + ${python3:Depends}, | |
94 | Description: kubernetes events module for ceph-mgr | |
95 | Ceph is a massively scalable, open-source, distributed | |
96 | storage system that runs on commodity hardware and delivers object, | |
97 | @@ -351,7 +351,7 @@ Depends: ceph-mgr (= ${binary:Version}), | |
98 | cephadm, | |
99 | python3-six, | |
100 | ${misc:Depends}, | |
101 | - ${python:Depends}, | |
102 | + ${python3:Depends}, | |
103 | openssh-client | |
104 | Description: cephadm orchestrator module for ceph-mgr | |
105 | Ceph is a massively scalable, open-source, distributed | |
106 | @@ -411,7 +411,7 @@ Depends: ceph-base (= ${binary:Version}), | |
107 | lvm2, | |
108 | sudo, | |
109 | ${misc:Depends}, | |
110 | - ${python:Depends}, | |
111 | + ${python3:Depends}, | |
112 | ${shlibs:Depends}, | |
113 | Replaces: ceph (<< 10), ceph-test (<< 12.2.2-14) | |
114 | Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14) | |
115 | @@ -591,7 +591,7 @@ Depends: librbd1 (= ${binary:Version}), | |
116 | python3-rbd (= ${binary:Version}), | |
117 | python3-rgw (= ${binary:Version}), | |
118 | ${misc:Depends}, | |
119 | - ${python:Depends}, | |
120 | + ${python3:Depends}, | |
121 | ${shlibs:Depends}, | |
122 | Conflicts: ceph-client-tools, | |
123 | Replaces: ceph (<< 10), | |
be11c882 TL |
124 | diff --git a/debian/rules b/debian/rules |
125 | index c93aa3c21..aa8edb3d2 100755 | |
126 | --- a/debian/rules | |
127 | +++ b/debian/rules | |
128 | @@ -128,15 +128,6 @@ | |
129 | override_dh_shlibdeps: | |
130 | dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor | |
131 | ||
132 | -override_dh_python3: | |
133 | - for binding in rados cephfs rbd rgw; do \ | |
134 | - dh_python3 -p python3-$$binding; \ | |
135 | - done | |
136 | - dh_python3 -p python3-ceph-argparse | |
137 | - dh_python3 -p python3-ceph-common | |
138 | - dh_python3 -p cephfs-shell | |
139 | - dh_python3 -p cephadm | |
140 | - | |
141 | # do not run tests | |
142 | override_dh_auto_test: | |
143 |