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