proxmox-mirrors/ceph
1
0
Fork 0
mirror of https://git.proxmox.com/git/ceph.git synced 2026-01-27 12:19:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update patches for pacific

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-05-06 16:19:06 +02:00
parent d05a54a280
commit 0c05bc94bf
5 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/0001-cmake-disable-version-from-git.patch
View File

@ -14,7 +14,7 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb4a7812d..ea4789522 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -201,17 +201,10 @@ set(GCOV_PREFIX_STRIP 4)
@@ -221,17 +221,10 @@ set(GCOV_PREFIX_STRIP 4)
# we pull the git version from .git
option(ENABLE_GIT_VERSION "build Ceph with git version string" ON)
if(${ENABLE_GIT_VERSION})

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

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

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

@ -15,26 +15,24 @@ diff --git a/debian/control b/debian/control
index e7a01c6ff8..692705c4c4 100644
--- a/debian/control
+++ b/debian/control
@@ -225,12 +225,12 @@ Depends: ceph-base (= ${binary:Version}),
@@ -239,11 +239,11 @@ Depends: ceph-base (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends},
-Recommends: ceph-mgr-dashboard,
- ceph-mgr-diskprediction-local,
- ceph-mgr-diskprediction-cloud,
- ceph-mgr-k8sevents,
- ceph-mgr-cephadm
-Suggests: python3-influxdb
+Suggests: ceph-mgr-dashboard,
+ ceph-mgr-diskprediction-local,
+ ceph-mgr-diskprediction-cloud,
+ ceph-mgr-k8sevents,
+ ceph-mgr-cephadm,
+ python3-influxdb
Replaces: ceph (<< 0.93-417),
Breaks: ceph (<< 0.93-417),
Description: manager for the ceph distributed storage system
@@ -304,7 +304,7 @@ Depends: ${misc:Depends},
@@ -303,7 +303,7 @@ Depends: ${misc:Depends},
python3-openssl,
Replaces: ceph-mgr (<< 15.1.0)
Breaks: ceph-mgr (<< 15.1.0)

40
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
--- a/debian/control
+++ b/debian/control
@@ -126,7 +126,7 @@ Depends: binutils,
@@ -138,7 +138,7 @@ Depends: binutils,
psmisc,
xfsprogs,
${misc:Depends},
@ -22,16 +22,16 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends},
Recommends: btrfs-tools,
ceph-mds (= ${binary:Version}),
@@ -172,7 +172,7 @@ Package: cephadm
@@ -184,7 +184,7 @@ Package: cephadm
Architecture: linux-any
Recommends: podman | docker.io
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,
@@ -223,7 +223,8 @@ Depends: ceph-base (= ${binary:Version}),
@@ -237,7 +237,8 @@ Depends: ceph-base (= ${binary:Version}),
python3-requests,
python3-werkzeug,
+ python3-yaml,
@ -41,7 +41,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends},
Suggests: ceph-mgr-dashboard,
ceph-mgr-diskprediction-local,
@@ -250,7 +250,7 @@ Depends: ceph-mgr (= ${binary:Version}),
@@ -263,7 +263,7 @@ Depends: ceph-mgr (= ${binary:Version}),
python3-werkzeug,
python3-routes,
${misc:Depends},
@ -50,7 +50,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends},
Description: dashboard module for ceph-mgr
Ceph is a massively scalable, open-source, distributed
@@ -271,7 +271,7 @@ Depends: ceph-mgr (= ${binary:Version}),
@@ -284,7 +284,7 @@ Depends: ceph-mgr (= ${binary:Version}),
python3-scipy,
python3-sklearn,
${misc:Depends},
@ -59,16 +59,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends},
Description: diskprediction-local module for ceph-mgr
Ceph is a massively scalable, open-source, distributed
@@ -285,7 +285,7 @@ Package: ceph-mgr-diskprediction-cloud
Architecture: all
Depends: ceph-mgr (= ${binary:Version}),
${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
${shlibs:Depends},
Description: diskprediction-cloud module for ceph-mgr
Ceph is a massively scalable, open-source, distributed
@@ -298,7 +298,7 @@ Description: diskprediction-cloud module for ceph-mgr
@@ -297,7 +297,7 @@ Description: diskprediction-local module for ceph-mgr
Package: ceph-mgr-modules-core
Architecture: all
Depends: ${misc:Depends},
@ -77,8 +68,8 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends},
python3-dateutil,
python3-openssl,
@@ -319,7 +319,7 @@ Depends: ceph-mgr (= ${binary:Version}),
python3-six,
@@ -317,7 +317,7 @@ Depends: ceph-mgr (= ${binary:Version}),
Depends: ceph-mgr (= ${binary:Version}),
python3-jsonpatch
${misc:Depends},
- ${python:Depends},
@ -86,7 +77,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends},
Description: rook module for ceph-mgr
Ceph is a massively scalable, open-source, distributed
@@ -335,7 +335,7 @@ Architecture: all
@@ -333,7 +333,7 @@ Architecture: all
Depends: ceph-mgr (= ${binary:Version}),
python3-kubernetes,
${misc:Depends},
@ -95,16 +86,16 @@ index c93aa3c21..aa8edb3d2 100644
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}),
@@ -348,7 +348,7 @@ Depends: ceph-mgr (= ${binary:Version}),
Depends: ceph-mgr (= ${binary:Version}),
cephadm,
python3-six,
${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
openssh-client,
python3-jinja2
Description: cephadm orchestrator module for ceph-mgr
@@ -411,7 +411,7 @@ Depends: ceph-base (= ${binary:Version}),
@@ -412,7 +412,7 @@ Depends: ceph-base (= ${binary:Version}),
lvm2,
sudo,
${misc:Depends},
@ -113,7 +104,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends},
Replaces: ceph (<< 10), ceph-test (<< 12.2.2-14)
Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14)
@@ -591,7 +591,7 @@ Depends: librbd1 (= ${binary:Version}),
@@ -620,7 +620,7 @@ Depends: librbd1 (= ${binary:Version}),
python3-rbd (= ${binary:Version}),
python3-rgw (= ${binary:Version}),
${misc:Depends},
@ -126,7 +117,7 @@ diff --git a/debian/rules b/debian/rules
index c93aa3c21..aa8edb3d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,15 +128,6 @@
@@ -125,16 +125,6 @@
override_dh_shlibdeps:
dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor
@ -137,6 +128,7 @@ index c93aa3c21..aa8edb3d2 100755
- 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

10
patches/0014-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch
View File

@ -27,7 +27,7 @@ index e47738a27..eeab101b5 100644
+Wants=network-online.target local-fs.target time-sync.target ceph-mds.target
[Service]
LimitNOFILE=1048576
Environment=CLUSTER=ceph
diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in
index 0ff9db237..aea3af40a 100644
--- a/systemd/ceph-mgr@.service.in
@ -42,7 +42,7 @@ index 0ff9db237..aea3af40a 100644
+Wants=network-online.target local-fs.target time-sync.target ceph-mgr.target
[Service]
LimitNOFILE=1048576
Environment=CLUSTER=ceph
diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in
index d3121d59d..7992d502a 100644
--- a/systemd/ceph-mon@.service.in
@ -57,7 +57,7 @@ index d3121d59d..7992d502a 100644
+Wants=network-online.target local-fs.target time-sync.target ceph-mon.target
[Service]
LimitNOFILE=1048576
Environment=CLUSTER=ceph
diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
index 2e5ea6ae4..987656da7 100644
--- a/systemd/ceph-osd@.service.in
@ -72,7 +72,7 @@ index 2e5ea6ae4..987656da7 100644
+Wants=network-online.target local-fs.target time-sync.target ceph-osd.target
[Service]
LimitNOFILE=1048576
Environment=CLUSTER=ceph
diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in
index dee501b47..d1bcf5bb7 100644
--- a/systemd/ceph-radosgw@.service.in
@ -87,7 +87,7 @@ index dee501b47..d1bcf5bb7 100644
+Wants=network-online.target local-fs.target time-sync.target ceph-radosgw.target
[Service]
LimitNOFILE=1048576
Environment=CLUSTER=ceph
diff --git a/systemd/rbdmap.service.in b/systemd/rbdmap.service.in
index 6644508cf..96f7d54e7 100644
--- a/systemd/rbdmap.service.in