proxmox-mirrors/ceph
1
0
Fork 0
mirror of https://git.proxmox.com/git/ceph.git synced 2025-04-29 06:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update patches for 16.2.11

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-01-27 11:32:26 +01:00
parent e8875651b9
commit aa8264ca71
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/0006-debian-control-add-break-libpvestorage-perl.patch
View File

@ -11,7 +11,7 @@ diff --git a/debian/control b/debian/control
index 83dc414788..1cfa2250de 100644 index 83dc414788..1cfa2250de 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -153,6 +153,7 @@ Replaces: ceph (<< 10), @@ -154,6 +154,7 @@ Replaces: ceph (<< 10),
Breaks: ceph (<< 10), Breaks: ceph (<< 10),
ceph-test (<< 12.2.2-14), ceph-test (<< 12.2.2-14),
python-ceph (<< 0.92-1223), python-ceph (<< 0.92-1223),
@ -19,7 +19,7 @@ index 83dc414788..1cfa2250de 100644
Description: common ceph daemon libraries and management tools Description: common ceph daemon libraries and management tools
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
storage system that runs on commodity hardware and delivers object, storage system that runs on commodity hardware and delivers object,
@@ -634,6 +634,7 @@ Breaks: ceph (<< 10), @@ -632,6 +632,7 @@ Breaks: ceph (<< 10),
ceph-test (<< 9.0.3-1646), ceph-test (<< 9.0.3-1646),
librbd1 (<< 0.92-1238), librbd1 (<< 0.92-1238),
python-ceph (<< 0.92-1223), python-ceph (<< 0.92-1223),

2
patches/0011-only-suggest-mgr-plugins.patch
View File

@ -15,7 +15,7 @@ diff --git a/debian/control b/debian/control
index e7a01c6ff8..692705c4c4 100644 index e7a01c6ff8..692705c4c4 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -239,11 +239,11 @@ Depends: ceph-base (= ${binary:Version}), @@ -241,11 +241,11 @@ Depends: ceph-base (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
${python:Depends}, ${python:Depends},
${shlibs:Depends}, ${shlibs:Depends},

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

@ -13,7 +13,7 @@ diff --git a/debian/control b/debian/control
index c93aa3c21..aa8edb3d2 100644 index c93aa3c21..aa8edb3d2 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -138,7 +138,7 @@ Depends: binutils, @@ -137,7 +137,7 @@ Depends: binutils,
psmisc, psmisc,
xfsprogs, xfsprogs,
${misc:Depends}, ${misc:Depends},
@ -22,7 +22,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Recommends: btrfs-tools, Recommends: btrfs-tools,
ceph-mds (= ${binary:Version}), ceph-mds (= ${binary:Version}),
@@ -184,7 +184,7 @@ Package: cephadm @@ -185,7 +185,7 @@ Package: cephadm
Architecture: linux-any Architecture: linux-any
Recommends: podman (>= 2.0.2) | docker.io Recommends: podman (>= 2.0.2) | docker.io
Depends: lvm2, Depends: lvm2,
@ -31,17 +31,19 @@ index c93aa3c21..aa8edb3d2 100644
Description: cephadm utility to bootstrap ceph daemons with systemd and containers Description: cephadm utility to bootstrap ceph daemons with systemd and containers
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
storage system that runs on commodity hardware and delivers object, storage system that runs on commodity hardware and delivers object,
@@ -237,7 +237,8 @@ Depends: ceph-base (= ${binary:Version}), @@ -237,9 +237,10 @@ Depends: ceph-base (= ${binary:Version}),
python3-requests, python3-requests,
python3-werkzeug, python3-werkzeug,
+ python3-yaml, + python3-yaml,
libsqlite3-mod-ceph (= ${binary:Version}),
librados2 (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
- ${python:Depends}, - ${python:Depends},
+ ${python3:Depends}, + ${python3:Depends},
${shlibs:Depends}, ${shlibs:Depends},
Suggests: ceph-mgr-dashboard, Suggests: ceph-mgr-dashboard,
ceph-mgr-diskprediction-local, ceph-mgr-diskprediction-local,
@@ -263,7 +263,7 @@ Depends: ceph-mgr (= ${binary:Version}), @@ -266,7 +266,7 @@ Depends: ceph-mgr (= ${binary:Version}),
python3-werkzeug, python3-werkzeug,
python3-routes, python3-routes,
${misc:Depends}, ${misc:Depends},
@ -50,7 +52,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Description: dashboard module for ceph-mgr Description: dashboard module for ceph-mgr
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
@@ -284,7 +284,7 @@ Depends: ceph-mgr (= ${binary:Version}), @@ -287,7 +287,7 @@ Depends: ceph-mgr (= ${binary:Version}),
python3-scipy, python3-scipy,
python3-sklearn, python3-sklearn,
${misc:Depends}, ${misc:Depends},
@ -59,7 +61,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Description: diskprediction-local module for ceph-mgr Description: diskprediction-local module for ceph-mgr
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
@@ -297,7 +297,7 @@ Description: diskprediction-local module for ceph-mgr @@ -300,7 +300,7 @@ Description: diskprediction-local module for ceph-mgr
Package: ceph-mgr-modules-core Package: ceph-mgr-modules-core
Architecture: all Architecture: all
Depends: ${misc:Depends}, Depends: ${misc:Depends},
@ -68,7 +70,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
python3-dateutil, python3-dateutil,
python3-openssl, python3-openssl,
@@ -317,7 +317,7 @@ Depends: ceph-mgr (= ${binary:Version}), @@ -319,7 +319,7 @@ Depends: ceph-mgr (= ${binary:Version}),
Depends: ceph-mgr (= ${binary:Version}), Depends: ceph-mgr (= ${binary:Version}),
python3-jsonpatch python3-jsonpatch
${misc:Depends}, ${misc:Depends},
@ -77,7 +79,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Description: rook module for ceph-mgr Description: rook module for ceph-mgr
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
@@ -333,7 +333,7 @@ Architecture: all @@ -335,7 +335,7 @@ Architecture: all
Depends: ceph-mgr (= ${binary:Version}), Depends: ceph-mgr (= ${binary:Version}),
python3-kubernetes, python3-kubernetes,
${misc:Depends}, ${misc:Depends},
@ -86,7 +88,7 @@ index c93aa3c21..aa8edb3d2 100644
Description: kubernetes events module for ceph-mgr Description: kubernetes events module for ceph-mgr
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
storage system that runs on commodity hardware and delivers object, storage system that runs on commodity hardware and delivers object,
@@ -348,7 +348,7 @@ Depends: ceph-mgr (= ${binary:Version}), @@ -350,7 +350,7 @@ Depends: ceph-mgr (= ${binary:Version}),
Depends: ceph-mgr (= ${binary:Version}), Depends: ceph-mgr (= ${binary:Version}),
cephadm, cephadm,
${misc:Depends}, ${misc:Depends},
@ -104,7 +106,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Replaces: ceph (<< 10), ceph-test (<< 12.2.2-14) Replaces: ceph (<< 10), ceph-test (<< 12.2.2-14)
Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14) Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14)
@@ -620,7 +620,7 @@ Depends: librbd1 (= ${binary:Version}), @@ -618,7 +618,7 @@ Depends: librbd1 (= ${binary:Version}),
python3-rbd (= ${binary:Version}), python3-rbd (= ${binary:Version}),
python3-rgw (= ${binary:Version}), python3-rgw (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},