update patches for quincy beta

basically just some context or line number changes

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/patches/0002-enable-systemd-targets-by-default.patch b/patches/0002-enable-systemd-targets-by-default.patch
index 70e5d7c0e80eba86dfb38680a7ec9023f038bc5f..88a66b84236c05109c74bb361e25c50329b2255b 100644 (file)
--- a/patches/0002-enable-systemd-targets-by-default.patch
+++ b/patches/0002-enable-systemd-targets-by-default.patch
@@ -15,7 +15,7 @@ diff --git a/debian/rules b/debian/rules
 index b5ce42c6f3..00e9ac6b16 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -97,6 +97,11 @@ override_dh_installinit:
+@@ -98,6 +98,11 @@ override_dh_installinit:
  
        dh_installinit -p ceph-base --name ceph --no-start
        dh_installinit -p radosgw --no-start

diff --git a/patches/0006-debian-control-add-break-libpvestorage-perl.patch b/patches/0006-debian-control-add-break-libpvestorage-perl.patch
index 14e8a3949347139744ee48f2850888dd0e6dd687..928e953d4773e90fea025359afbba990517d1080 100644 (file)
--- a/patches/0006-debian-control-add-break-libpvestorage-perl.patch
+++ b/patches/0006-debian-control-add-break-libpvestorage-perl.patch
@@ -11,7 +11,7 @@ diff --git a/debian/control b/debian/control
 index 83dc414788..1cfa2250de 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -153,6 +153,7 @@ Replaces: ceph (<< 10),
+@@ -154,6 +154,7 @@ Replaces: ceph (<< 10),
  Breaks: ceph (<< 10),
          ceph-test (<< 12.2.2-14),
          python-ceph (<< 0.92-1223),
@@ -19,7 +19,7 @@ index 83dc414788..1cfa2250de 100644
  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,
-@@ -654,6 +654,7 @@ Breaks: ceph (<< 10),
+@@ -660,6 +661,7 @@ Breaks: ceph (<< 10),
          ceph-test (<< 9.0.3-1646),
          librbd1 (<< 0.92-1238),
          python-ceph (<< 0.92-1223),

diff --git a/patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch b/patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch
index 3f542602c8842d79219092f18e534f5283873a0e..e70f6388841e2cb0a7dc0a1e525df1be3d7adb8c 100644 (file)
--- a/patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch
+++ b/patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch
@@ -17,7 +17,7 @@ diff --git a/debian/rules b/debian/rules
 index 3ac923f71a..d9927b3e0d 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -80,9 +80,7 @@ override_dh_auto_install:
+@@ -81,9 +81,7 @@ override_dh_auto_install:
  
  # doc/changelog is a directory, which confuses dh_installchangelogs
  override_dh_installchangelogs:

diff --git a/patches/0011-only-suggest-mgr-plugins.patch b/patches/0011-only-suggest-mgr-plugins.patch
index 14d1e025bb240d8313f2856ef1d4f51f2238478f..cf6ce7fdc247a86d700cd34fad9356a9568718e8 100644 (file)
--- a/patches/0011-only-suggest-mgr-plugins.patch
+++ b/patches/0011-only-suggest-mgr-plugins.patch
@@ -15,7 +15,7 @@ diff --git a/debian/control b/debian/control
 index e7a01c6ff8..692705c4c4 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -238,11 +238,11 @@ Depends: ceph-base (= ${binary:Version}),
+@@ -242,11 +242,11 @@ Depends: ceph-base (= ${binary:Version}),
           ${misc:Depends},
           ${python:Depends},
           ${shlibs:Depends},

diff --git a/patches/0013-d-control-move-python-dependencies-over-to-python3.patch b/patches/0013-d-control-move-python-dependencies-over-to-python3.patch
index 4929e3b1ef806bf733c8410c3770d487a4e4283f..abf3f8324097efc93d83636c6d1e3a12f77856b8 100644 (file)
--- a/patches/0013-d-control-move-python-dependencies-over-to-python3.patch
+++ b/patches/0013-d-control-move-python-dependencies-over-to-python3.patch
@@ -13,7 +13,7 @@ diff --git a/debian/control b/debian/control
 index c93aa3c21..aa8edb3d2 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -136,7 +136,7 @@ Depends: binutils,
+@@ -137,7 +137,7 @@ Depends: binutils,
           parted,
           psmisc,
           ${misc:Depends},
@@ -22,7 +22,7 @@ index c93aa3c21..aa8edb3d2 100644
           ${shlibs:Depends},
  Recommends: btrfs-tools,
              ceph-mds (= ${binary:Version}),
-@@ -184,7 +184,7 @@ Package: cephadm
+@@ -185,7 +185,7 @@ Package: cephadm
  Architecture: linux-any
  Recommends: podman (>= 2.0.2) | docker.io
  Depends: lvm2,
@@ -31,9 +31,10 @@ index c93aa3c21..aa8edb3d2 100644
  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,
-@@ -236,7 +236,8 @@ Depends: ceph-base (= ${binary:Version}),
-          python3-requests,
+@@ -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},
@@ -41,7 +42,7 @@ index c93aa3c21..aa8edb3d2 100644
           ${shlibs:Depends},
  Suggests: ceph-mgr-dashboard,
            ceph-mgr-diskprediction-local,
-@@ -262,7 +262,7 @@ Depends: ceph-mgr (= ${binary:Version}),
+@@ -267,7 +267,7 @@ Depends: ceph-mgr (= ${binary:Version}),
           python3-werkzeug,
           python3-routes,
           ${misc:Depends},
@@ -50,7 +51,7 @@ index c93aa3c21..aa8edb3d2 100644
           ${shlibs:Depends},
  Description: dashboard module for ceph-mgr
   Ceph is a massively scalable, open-source, distributed
-@@ -283,7 +283,7 @@ Depends: ceph-mgr (= ${binary:Version}),
+@@ -288,7 +288,7 @@ Depends: ceph-mgr (= ${binary:Version}),
           python3-scipy,
           python3-sklearn,
           ${misc:Depends},
@@ -59,7 +60,7 @@ index c93aa3c21..aa8edb3d2 100644
           ${shlibs:Depends},
  Description: diskprediction-local module for ceph-mgr
   Ceph is a massively scalable, open-source, distributed
-@@ -296,7 +296,7 @@ Description: diskprediction-local module for ceph-mgr
+@@ -301,7 +301,7 @@ Description: diskprediction-local module for ceph-mgr
  Package: ceph-mgr-modules-core
  Architecture: all
  Depends: ${misc:Depends},
@@ -68,7 +69,7 @@ index c93aa3c21..aa8edb3d2 100644
           ${shlibs:Depends},
           python3-dateutil,
           python3-openssl,
-@@ -315,7 +315,7 @@ Depends: ceph-mgr (= ${binary:Version}),
+@@ -320,7 +320,7 @@ Depends: ceph-mgr (= ${binary:Version}),
  Depends: ceph-mgr (= ${binary:Version}),
           python3-jsonpatch
           ${misc:Depends},
@@ -77,7 +78,7 @@ index c93aa3c21..aa8edb3d2 100644
           ${shlibs:Depends},
  Description: rook module for ceph-mgr
   Ceph is a massively scalable, open-source, distributed
-@@ -331,7 +331,7 @@ Architecture: all
+@@ -336,7 +336,7 @@ Architecture: all
  Depends: ceph-mgr (= ${binary:Version}),
           python3-kubernetes,
           ${misc:Depends},
@@ -86,7 +87,7 @@ 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,
-@@ -346,7 +346,7 @@ Depends: ceph-mgr (= ${binary:Version}),
+@@ -351,7 +351,7 @@ Depends: ceph-mgr (= ${binary:Version}),
  Depends: ceph-mgr (= ${binary:Version}),
         cephadm,
           ${misc:Depends},
@@ -94,8 +95,8 @@ index c93aa3c21..aa8edb3d2 100644
 +         ${python3:Depends},
           openssh-client,
           python3-jinja2,
-          python3-cherrypy3
-@@ -407,7 +407,7 @@ Depends: ceph-base (= ${binary:Version}),
+          python3-cherrypy3,
+@@ -413,7 +413,7 @@ Depends: ceph-base (= ${binary:Version}),
  Depends: ceph-base (= ${binary:Version}),
           sudo,
           ${misc:Depends},
@@ -104,7 +105,7 @@ index c93aa3c21..aa8edb3d2 100644
           ${shlibs:Depends},
  Replaces: ceph (<< 10),
            ceph-test (<< 12.2.2-14),
-@@ -640,7 +640,7 @@ Depends: librbd1 (= ${binary:Version}),
+@@ -646,7 +646,7 @@ Depends: librbd1 (= ${binary:Version}),
           python3-rbd (= ${binary:Version}),
           python3-rgw (= ${binary:Version}),
           ${misc:Depends},
@@ -117,7 +118,7 @@ diff --git a/debian/rules b/debian/rules
 index c93aa3c21..aa8edb3d2 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -140,16 +140,6 @@
+@@ -141,16 +141,6 @@
  override_dh_shlibdeps:
        dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor --exclude=ceph_crypto
  

diff --git a/patches/0016-d-rules-fix-no-restart-on-upgrade.patch b/patches/0016-d-rules-fix-no-restart-on-upgrade.patch
index 8c1c0e52e2416b3e7ca81b684f88e64a92d194c4..78106a9ceafb30be5c75c5b6417c3095dcb558b8 100644 (file)
--- a/patches/0016-d-rules-fix-no-restart-on-upgrade.patch
+++ b/patches/0016-d-rules-fix-no-restart-on-upgrade.patch
@@ -25,7 +25,7 @@ diff --git a/debian/rules b/debian/rules
 index b5ce42c6f3..00e9ac6b16 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -103,7 +103,7 @@ override_dh_installinit:
+@@ -104,7 +104,7 @@ override_dh_installinit:
  
        # NOTE: execute systemd helpers so they pickup dh_install'ed units and targets
        dh_systemd_enable