proxmox-mirrors/ceph
1
0
Fork 0
mirror of https://git.proxmox.com/git/ceph.git synced 2025-08-16 15:56:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update patches for quincy beta

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-03-30 17:35:57 +02:00
parent 20effc670b
commit a653f20b2f
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,10 +14,10 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb4a7812d..ea4789522 100644 index bb4a7812d..ea4789522 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -221,17 +221,10 @@ set(GCOV_PREFIX_STRIP 4) @@ -35,17 +35,10 @@ configure_file(ceph-crash.in
# we pull the git version from .git # we pull the git version from .git
option(ENABLE_GIT_VERSION "build Ceph with git version string" ON) option(ENABLE_GIT_VERSION "build Ceph with git version string" ON)
if(${ENABLE_GIT_VERSION}) if(ENABLE_GIT_VERSION)
- get_git_head_revision(GIT_REFSPEC CEPH_GIT_VER) - get_git_head_revision(GIT_REFSPEC CEPH_GIT_VER)
- git_describe(CEPH_GIT_NICE_VER_WITH_V --always) - git_describe(CEPH_GIT_NICE_VER_WITH_V --always)
- # remove leading 'v' - # remove leading 'v'
@ -29,6 +29,6 @@ index bb4a7812d..ea4789522 100644
list(GET CEPH_GIT_SHA_AND_TAG 0 CEPH_GIT_VER) list(GET CEPH_GIT_SHA_AND_TAG 0 CEPH_GIT_VER)
list(GET CEPH_GIT_SHA_AND_TAG 1 CEPH_GIT_NICE_VER) list(GET CEPH_GIT_SHA_AND_TAG 1 CEPH_GIT_NICE_VER)
- endif(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND") - endif(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND")
else(${ENABLE_GIT_VERSION}) else(ENABLE_GIT_VERSION)
set(CEPH_GIT_VER "no_version") set(CEPH_GIT_VER "no_version")
set(CEPH_GIT_NICE_VER "Development") set(CEPH_GIT_NICE_VER "Development")

2
patches/0002-enable-systemd-targets-by-default.patch
View File

@ -15,7 +15,7 @@ diff --git a/debian/rules b/debian/rules
index b5ce42c6f3..00e9ac6b16 100755 index b5ce42c6f3..00e9ac6b16 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -82,6 +82,11 @@ override_dh_installinit: @@ -97,6 +97,11 @@ override_dh_installinit:
dh_installinit -p ceph-base --name ceph --no-start dh_installinit -p ceph-base --name ceph --no-start
dh_installinit -p radosgw --no-start dh_installinit -p radosgw --no-start

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

@ -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), @@ -654,6 +654,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/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch
View File

@ -17,7 +17,7 @@ diff --git a/debian/rules b/debian/rules
index 3ac923f71a..d9927b3e0d 100755 index 3ac923f71a..d9927b3e0d 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -65,9 +65,7 @@ override_dh_auto_install: @@ -80,9 +80,7 @@ override_dh_auto_install:
# doc/changelog is a directory, which confuses dh_installchangelogs # doc/changelog is a directory, which confuses dh_installchangelogs
override_dh_installchangelogs: override_dh_installchangelogs:

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}), @@ -238,11 +238,11 @@ Depends: ceph-base (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
${python:Depends}, ${python:Depends},
${shlibs:Depends}, ${shlibs:Depends},

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

@ -13,9 +13,9 @@ 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, @@ -136,7 +136,7 @@ Depends: binutils,
parted,
psmisc, psmisc,
xfsprogs,
${misc:Depends}, ${misc:Depends},
- ${python:Depends}, - ${python:Depends},
+ ${python3:Depends}, + ${python3:Depends},
@ -31,7 +31,7 @@ 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}), @@ -236,7 +236,8 @@ Depends: ceph-base (= ${binary:Version}),
python3-requests, python3-requests,
python3-werkzeug, python3-werkzeug,
+ python3-yaml, + python3-yaml,
@ -41,7 +41,7 @@ index c93aa3c21..aa8edb3d2 100644
${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}), @@ -262,7 +262,7 @@ Depends: ceph-mgr (= ${binary:Version}),
python3-werkzeug, python3-werkzeug,
python3-routes, python3-routes,
${misc:Depends}, ${misc:Depends},
@ -50,7 +50,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}), @@ -283,7 +283,7 @@ Depends: ceph-mgr (= ${binary:Version}),
python3-scipy, python3-scipy,
python3-sklearn, python3-sklearn,
${misc:Depends}, ${misc:Depends},
@ -59,7 +59,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 @@ -296,7 +296,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 +68,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}), @@ -315,7 +315,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 +77,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 @@ -331,7 +331,7 @@ Architecture: all
Depends: ceph-mgr (= ${binary:Version}), Depends: ceph-mgr (= ${binary:Version}),
python3-kubernetes, python3-kubernetes,
${misc:Depends}, ${misc:Depends},
@ -86,25 +86,25 @@ 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}), @@ -346,7 +346,7 @@ Depends: ceph-mgr (= ${binary:Version}),
Depends: ceph-mgr (= ${binary:Version}), Depends: ceph-mgr (= ${binary:Version}),
cephadm, cephadm,
${misc:Depends}, ${misc:Depends},
- ${python:Depends}, - ${python:Depends},
+ ${python3:Depends}, + ${python3:Depends},
openssh-client, openssh-client,
python3-jinja2 python3-jinja2,
Description: cephadm orchestrator module for ceph-mgr python3-cherrypy3
@@ -412,7 +412,7 @@ Depends: ceph-base (= ${binary:Version}), @@ -407,7 +407,7 @@ Depends: ceph-base (= ${binary:Version}),
lvm2, Depends: ceph-base (= ${binary:Version}),
sudo, sudo,
${misc:Depends}, ${misc:Depends},
- ${python:Depends}, - ${python:Depends},
+ ${python3:Depends}, + ${python3:Depends},
${shlibs:Depends}, ${shlibs:Depends},
Replaces: ceph (<< 10), ceph-test (<< 12.2.2-14) Replaces: ceph (<< 10),
Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14) ceph-test (<< 12.2.2-14),
@@ -620,7 +620,7 @@ Depends: librbd1 (= ${binary:Version}), @@ -640,7 +640,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},
@ -117,9 +117,9 @@ diff --git a/debian/rules b/debian/rules
index c93aa3c21..aa8edb3d2 100755 index c93aa3c21..aa8edb3d2 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -125,16 +125,6 @@ @@ -140,16 +140,6 @@
override_dh_shlibdeps: override_dh_shlibdeps:
dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor --exclude=ceph_crypto
-override_dh_python3: -override_dh_python3:
- for binding in rados cephfs rbd rgw; do \ - for binding in rados cephfs rbd rgw; do \

2
patches/0016-d-rules-fix-no-restart-on-upgrade.patch
View File

@ -25,7 +25,7 @@ diff --git a/debian/rules b/debian/rules
index b5ce42c6f3..00e9ac6b16 100755 index b5ce42c6f3..00e9ac6b16 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -88,7 +88,7 @@ override_dh_installinit: @@ -103,7 +103,7 @@ override_dh_installinit:
# NOTE: execute systemd helpers so they pickup dh_install'ed units and targets # NOTE: execute systemd helpers so they pickup dh_install'ed units and targets
dh_systemd_enable dh_systemd_enable