mirror of
https://git.proxmox.com/git/ceph.git
synced 2025-04-28 17:56:28 +00:00
0d0a03a08f
basically just some context or line number changes Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
138 lines
4.6 KiB
Diff
138 lines
4.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
Date: Tue, 2 Jun 2020 17:20:44 +0200
|
|
Subject: [PATCH] d/control: move python dependencies over to python3
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
debian/control | 24 ++++++++++++------------
|
|
debian/rules | 10 ------------
|
|
2 files changed, 12 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/debian/control b/debian/control
|
|
index c93aa3c21..aa8edb3d2 100644
|
|
--- a/debian/control
|
|
+++ b/debian/control
|
|
@@ -137,7 +137,7 @@ Depends: binutils,
|
|
parted,
|
|
psmisc,
|
|
${misc:Depends},
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
${shlibs:Depends},
|
|
Recommends: btrfs-tools,
|
|
ceph-mds (= ${binary:Version}),
|
|
@@ -185,7 +185,7 @@ Package: cephadm
|
|
Architecture: linux-any
|
|
Recommends: podman (>= 2.0.2) | docker.io
|
|
Depends: lvm2,
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
Description: cephadm utility to bootstrap ceph daemons with systemd and containers
|
|
Ceph is a massively scalable, open-source, distributed
|
|
storage system that runs on commodity hardware and delivers object,
|
|
@@ -239,8 +239,9 @@ Depends: ceph-base (= ${binary:Version}),
|
|
python3-werkzeug,
|
|
libsqlite3-mod-ceph (= ${binary:Version}),
|
|
librados2 (= ${binary:Version}),
|
|
+ python3-yaml,
|
|
${misc:Depends},
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
${shlibs:Depends},
|
|
Suggests: ceph-mgr-dashboard,
|
|
ceph-mgr-diskprediction-local,
|
|
@@ -267,7 +267,7 @@ Depends: ceph-mgr (= ${binary:Version}),
|
|
python3-werkzeug,
|
|
python3-routes,
|
|
${misc:Depends},
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
${shlibs:Depends},
|
|
Description: dashboard module for ceph-mgr
|
|
Ceph is a massively scalable, open-source, distributed
|
|
@@ -288,7 +288,7 @@ Depends: ceph-mgr (= ${binary:Version}),
|
|
python3-scipy,
|
|
python3-sklearn,
|
|
${misc:Depends},
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
${shlibs:Depends},
|
|
Description: diskprediction-local module for ceph-mgr
|
|
Ceph is a massively scalable, open-source, distributed
|
|
@@ -301,7 +301,7 @@ Description: diskprediction-local module for ceph-mgr
|
|
Package: ceph-mgr-modules-core
|
|
Architecture: all
|
|
Depends: ${misc:Depends},
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
${shlibs:Depends},
|
|
python3-dateutil,
|
|
python3-openssl,
|
|
@@ -320,7 +320,7 @@ Depends: ceph-mgr (= ${binary:Version}),
|
|
Depends: ceph-mgr (= ${binary:Version}),
|
|
python3-jsonpatch
|
|
${misc:Depends},
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
${shlibs:Depends},
|
|
Description: rook module for ceph-mgr
|
|
Ceph is a massively scalable, open-source, distributed
|
|
@@ -336,7 +336,7 @@ Architecture: all
|
|
Depends: ceph-mgr (= ${binary:Version}),
|
|
python3-kubernetes,
|
|
${misc:Depends},
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
Description: kubernetes events module for ceph-mgr
|
|
Ceph is a massively scalable, open-source, distributed
|
|
storage system that runs on commodity hardware and delivers object,
|
|
@@ -351,7 +351,7 @@ Depends: ceph-mgr (= ${binary:Version}),
|
|
Depends: ceph-mgr (= ${binary:Version}),
|
|
cephadm,
|
|
${misc:Depends},
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
openssh-client,
|
|
python3-jinja2,
|
|
python3-cherrypy3,
|
|
@@ -413,7 +413,7 @@ Depends: ceph-base (= ${binary:Version}),
|
|
Depends: ceph-base (= ${binary:Version}),
|
|
sudo,
|
|
${misc:Depends},
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
${shlibs:Depends},
|
|
Replaces: ceph (<< 10),
|
|
ceph-test (<< 12.2.2-14),
|
|
@@ -646,7 +646,7 @@ Depends: librbd1 (= ${binary:Version}),
|
|
python3-rbd (= ${binary:Version}),
|
|
python3-rgw (= ${binary:Version}),
|
|
${misc:Depends},
|
|
- ${python:Depends},
|
|
+ ${python3:Depends},
|
|
${shlibs:Depends},
|
|
Conflicts: ceph-client-tools,
|
|
Replaces: ceph (<< 10),
|
|
diff --git a/debian/rules b/debian/rules
|
|
index c93aa3c21..aa8edb3d2 100755
|
|
--- a/debian/rules
|
|
+++ b/debian/rules
|
|
@@ -141,16 +141,6 @@
|
|
override_dh_shlibdeps:
|
|
dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor --exclude=ceph_crypto
|
|
|
|
-override_dh_python3:
|
|
- for binding in rados cephfs rbd rgw; do \
|
|
- dh_python3 -p python3-$$binding; \
|
|
- done
|
|
- dh_python3 -p python3-ceph-argparse
|
|
- dh_python3 -p python3-ceph-common
|
|
- dh_python3 -p cephfs-shell
|
|
- dh_python3 -p cephfs-top
|
|
- dh_python3 -p cephadm
|
|
-
|
|
# do not run tests
|
|
override_dh_auto_test:
|
|
|