mirror of
https://git.proxmox.com/git/ceph.git
synced 2025-04-28 15:01:36 +00:00
refresh patches and drop ones applied upstream
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
aee94f6923
commit
e868ce26e9
@ -7,11 +7,11 @@ to avoid that the parent (packaging) git info is used..
|
|||||||
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
---
|
---
|
||||||
ceph/src/CMakeLists.txt | 7 -------
|
src/CMakeLists.txt | 7 -------
|
||||||
1 file changed, 7 deletions(-)
|
1 file changed, 7 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||||
index bb4a7812d..ea4789522 100644
|
index e1f90f72b..185218554 100644
|
||||||
--- a/src/CMakeLists.txt
|
--- a/src/CMakeLists.txt
|
||||||
+++ b/src/CMakeLists.txt
|
+++ b/src/CMakeLists.txt
|
||||||
@@ -35,17 +35,10 @@ configure_file(ceph-crash.in
|
@@ -35,17 +35,10 @@ configure_file(ceph-crash.in
|
||||||
|
@ -3,15 +3,16 @@ From: Alwin Antreich <a.antreich@proxmox.com>
|
|||||||
Date: Wed, 24 Oct 2018 10:38:19 +0200
|
Date: Wed, 24 Oct 2018 10:38:19 +0200
|
||||||
Subject: [PATCH] debian/control: add break libpvestorage-perl
|
Subject: [PATCH] debian/control: add break libpvestorage-perl
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
---
|
---
|
||||||
debian/control | 2 ++
|
debian/control | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/debian/control b/debian/control
|
diff --git a/debian/control b/debian/control
|
||||||
index 83dc414788..1cfa2250de 100644
|
index 837a55a37..a845ba795 100644
|
||||||
--- a/debian/control
|
--- a/debian/control
|
||||||
+++ b/debian/control
|
+++ b/debian/control
|
||||||
@@ -154,6 +154,7 @@ Replaces: ceph (<< 10),
|
@@ -155,6 +155,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 +20,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,
|
||||||
@@ -660,6 +661,7 @@ Breaks: ceph (<< 10),
|
@@ -634,6 +635,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),
|
@ -1,29 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
|
||||||
Date: Wed, 22 Mar 2017 09:00:34 +0100
|
|
||||||
Subject: [PATCH] enable systemd targets by default
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
||||||
---
|
|
||||||
debian/rules | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/debian/rules b/debian/rules
|
|
||||||
index b5ce42c6f3..00e9ac6b16 100755
|
|
||||||
--- a/debian/rules
|
|
||||||
+++ b/debian/rules
|
|
||||||
@@ -98,6 +98,11 @@ override_dh_installinit:
|
|
||||||
|
|
||||||
dh_installinit -p ceph-base --name ceph --no-start
|
|
||||||
dh_installinit -p radosgw --no-start
|
|
||||||
+ dh_systemd_enable -p ceph-common ceph.target
|
|
||||||
+ dh_systemd_enable -p ceph-mon ceph-mon.target
|
|
||||||
+ dh_systemd_enable -p ceph-mgr ceph-mgr.target
|
|
||||||
+ dh_systemd_enable -p ceph-mds ceph-mds.target
|
|
||||||
+ dh_systemd_enable -p ceph-osd ceph-osd.target
|
|
||||||
|
|
||||||
# NOTE: execute systemd helpers so they pickup dh_install'ed units and targets
|
|
||||||
dh_systemd_enable
|
|
@ -9,21 +9,20 @@ The `override_dh_installdocs` target was left over as empty override
|
|||||||
by MISTAKE in uptream commit c3a53010af432e77f74bcb46e7205c5500b6af77,
|
by MISTAKE in uptream commit c3a53010af432e77f74bcb46e7205c5500b6af77,
|
||||||
fix that by just dropping it completely.
|
fix that by just dropping it completely.
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
---
|
---
|
||||||
debian/rules | 2 +-
|
debian/rules | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/debian/rules b/debian/rules
|
diff --git a/debian/rules b/debian/rules
|
||||||
index 3ac923f71a..d9927b3e0d 100755
|
index ed7f4a255..45a624b5a 100755
|
||||||
--- a/debian/rules
|
--- a/debian/rules
|
||||||
+++ b/debian/rules
|
+++ b/debian/rules
|
||||||
@@ -81,9 +81,7 @@ override_dh_auto_install:
|
@@ -80,7 +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:
|
||||||
- dh_installchangelogs --exclude doc/changelog
|
- dh_installchangelogs --exclude doc/changelog
|
||||||
-
|
|
||||||
-override_dh_installdocs:
|
|
||||||
+ dh_installchangelogs --exclude doc/changelog changelog.upstream
|
+ dh_installchangelogs --exclude doc/changelog changelog.upstream
|
||||||
|
|
||||||
override_dh_installlogrotate:
|
override_dh_installlogrotate:
|
@ -1,8 +1,8 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Dominik Csapak <d.csapak@proxmox.com>
|
From: Dominik Csapak <d.csapak@proxmox.com>
|
||||||
Date: Thu, 27 Jun 2019 14:37:06 +0200
|
Date: Thu, 27 Jun 2019 14:37:06 +0200
|
||||||
Subject: [PATCH 09/10] remove legacy pve ceph osd activation script in
|
Subject: [PATCH] remove legacy pve ceph osd activation script in postinst of
|
||||||
postinst of ceph-osd
|
ceph-osd
|
||||||
|
|
||||||
that service was distributed by pve-manager (but not in a regular way)
|
that service was distributed by pve-manager (but not in a regular way)
|
||||||
and only executed ceph-disk activate-all
|
and only executed ceph-disk activate-all
|
||||||
@ -11,15 +11,16 @@ this fails on nautilus and has to be removed when upgrading from
|
|||||||
luminous
|
luminous
|
||||||
|
|
||||||
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
|
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
|
||||||
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
---
|
---
|
||||||
debian/ceph-osd.postinst | 13 +++++++++++++
|
debian/ceph-osd.postinst | 13 +++++++++++++
|
||||||
1 file changed, 13 insertions(+)
|
1 file changed, 13 insertions(+)
|
||||||
|
|
||||||
diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst
|
diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst
|
||||||
index 5e44548fe8..7cc1f6ce14 100644
|
index 04e33b860..6c2513d4d 100644
|
||||||
--- a/debian/ceph-osd.postinst
|
--- a/debian/ceph-osd.postinst
|
||||||
+++ b/debian/ceph-osd.postinst
|
+++ b/debian/ceph-osd.postinst
|
||||||
@@ -25,6 +25,19 @@ case "$1" in
|
@@ -26,6 +26,19 @@ case "$1" in
|
||||||
configure)
|
configure)
|
||||||
[ -x /etc/init.d/procps ] && invoke-rc.d procps restart || :
|
[ -x /etc/init.d/procps ] && invoke-rc.d procps restart || :
|
||||||
[ -x /sbin/start ] && start ceph-osd-all || :
|
[ -x /sbin/start ] && start ceph-osd-all || :
|
@ -1,16 +1,17 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Dominik Csapak <d.csapak@proxmox.com>
|
From: Dominik Csapak <d.csapak@proxmox.com>
|
||||||
Date: Fri, 28 Jun 2019 16:31:34 +0200
|
Date: Fri, 28 Jun 2019 16:31:34 +0200
|
||||||
Subject: [PATCH 10/10] remove legacy init.d ceph script
|
Subject: [PATCH] remove legacy init.d ceph script
|
||||||
|
|
||||||
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
|
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
|
||||||
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
---
|
---
|
||||||
debian/ceph-base.install | 1 -
|
debian/ceph-base.install | 1 -
|
||||||
debian/ceph-base.maintscript | 1 +
|
debian/ceph-base.maintscript | 1 +
|
||||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/debian/ceph-base.install b/debian/ceph-base.install
|
diff --git a/debian/ceph-base.install b/debian/ceph-base.install
|
||||||
index 24731dc89d..7f7c56c4bc 100644
|
index a3d7757a5..51fafb6e9 100644
|
||||||
--- a/debian/ceph-base.install
|
--- a/debian/ceph-base.install
|
||||||
+++ b/debian/ceph-base.install
|
+++ b/debian/ceph-base.install
|
||||||
@@ -1,4 +1,3 @@
|
@@ -1,4 +1,3 @@
|
||||||
@ -19,7 +20,7 @@ index 24731dc89d..7f7c56c4bc 100644
|
|||||||
usr/bin/ceph-crash
|
usr/bin/ceph-crash
|
||||||
usr/bin/ceph-debugpack
|
usr/bin/ceph-debugpack
|
||||||
diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript
|
diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript
|
||||||
index 196dc08413..180b7dfde4 100644
|
index 196dc0841..180b7dfde 100644
|
||||||
--- a/debian/ceph-base.maintscript
|
--- a/debian/ceph-base.maintscript
|
||||||
+++ b/debian/ceph-base.maintscript
|
+++ b/debian/ceph-base.maintscript
|
||||||
@@ -1,2 +1,3 @@
|
@@ -1,2 +1,3 @@
|
@ -12,12 +12,12 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
diff --git a/debian/control b/debian/control
|
diff --git a/debian/control b/debian/control
|
||||||
index e7a01c6ff8..692705c4c4 100644
|
index a845ba795..32e7bb45c 100644
|
||||||
--- a/debian/control
|
--- a/debian/control
|
||||||
+++ b/debian/control
|
+++ b/debian/control
|
||||||
@@ -242,11 +242,11 @@ Depends: ceph-base (= ${binary:Version}),
|
@@ -235,11 +235,11 @@ Depends: ceph-base (= ${binary:Version}),
|
||||||
${misc:Depends},
|
${misc:Depends},
|
||||||
${python:Depends},
|
${python3:Depends},
|
||||||
${shlibs:Depends},
|
${shlibs:Depends},
|
||||||
-Recommends: ceph-mgr-dashboard,
|
-Recommends: ceph-mgr-dashboard,
|
||||||
- ceph-mgr-diskprediction-local,
|
- ceph-mgr-diskprediction-local,
|
@ -11,6 +11,7 @@ fails) and doesn't let us continue to #DEBHELPER#. #DEBHELPER#, however, gets
|
|||||||
replaced by a systemd call that successfully stops the ceph services.
|
replaced by a systemd call that successfully stops the ceph services.
|
||||||
|
|
||||||
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
|
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
|
||||||
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
---
|
---
|
||||||
debian/ceph-base.prerm | 17 -----------------
|
debian/ceph-base.prerm | 17 -----------------
|
||||||
debian/ceph-mds.prerm | 17 -----------------
|
debian/ceph-mds.prerm | 17 -----------------
|
||||||
@ -159,6 +160,3 @@ index 40f07b621..37460790a 100644
|
|||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@ -14,7 +14,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||||||
6 files changed, 11 insertions(+), 12 deletions(-)
|
6 files changed, 11 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
diff --git a/systemd/ceph-mds@.service.in b/systemd/ceph-mds@.service.in
|
diff --git a/systemd/ceph-mds@.service.in b/systemd/ceph-mds@.service.in
|
||||||
index e47738a27..eeab101b5 100644
|
index afa36702f..03ffbc1fa 100644
|
||||||
--- a/systemd/ceph-mds@.service.in
|
--- a/systemd/ceph-mds@.service.in
|
||||||
+++ b/systemd/ceph-mds@.service.in
|
+++ b/systemd/ceph-mds@.service.in
|
||||||
@@ -2,8 +2,8 @@
|
@@ -2,8 +2,8 @@
|
||||||
@ -29,7 +29,7 @@ index e47738a27..eeab101b5 100644
|
|||||||
[Service]
|
[Service]
|
||||||
Environment=CLUSTER=ceph
|
Environment=CLUSTER=ceph
|
||||||
diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in
|
diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in
|
||||||
index 0ff9db237..aea3af40a 100644
|
index 8fadc4746..79ea740a7 100644
|
||||||
--- a/systemd/ceph-mgr@.service.in
|
--- a/systemd/ceph-mgr@.service.in
|
||||||
+++ b/systemd/ceph-mgr@.service.in
|
+++ b/systemd/ceph-mgr@.service.in
|
||||||
@@ -2,8 +2,8 @@
|
@@ -2,8 +2,8 @@
|
||||||
@ -44,7 +44,7 @@ index 0ff9db237..aea3af40a 100644
|
|||||||
[Service]
|
[Service]
|
||||||
Environment=CLUSTER=ceph
|
Environment=CLUSTER=ceph
|
||||||
diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in
|
diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in
|
||||||
index d3121d59d..7992d502a 100644
|
index 2eba83c3c..a2a619d7f 100644
|
||||||
--- a/systemd/ceph-mon@.service.in
|
--- a/systemd/ceph-mon@.service.in
|
||||||
+++ b/systemd/ceph-mon@.service.in
|
+++ b/systemd/ceph-mon@.service.in
|
||||||
@@ -6,8 +6,8 @@ PartOf=ceph-mon.target
|
@@ -6,8 +6,8 @@ PartOf=ceph-mon.target
|
||||||
@ -59,7 +59,7 @@ index d3121d59d..7992d502a 100644
|
|||||||
[Service]
|
[Service]
|
||||||
Environment=CLUSTER=ceph
|
Environment=CLUSTER=ceph
|
||||||
diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
|
diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
|
||||||
index 2e5ea6ae4..987656da7 100644
|
index 046500efb..c988cf345 100644
|
||||||
--- a/systemd/ceph-osd@.service.in
|
--- a/systemd/ceph-osd@.service.in
|
||||||
+++ b/systemd/ceph-osd@.service.in
|
+++ b/systemd/ceph-osd@.service.in
|
||||||
@@ -2,8 +2,8 @@
|
@@ -2,8 +2,8 @@
|
||||||
@ -74,7 +74,7 @@ index 2e5ea6ae4..987656da7 100644
|
|||||||
[Service]
|
[Service]
|
||||||
Environment=CLUSTER=ceph
|
Environment=CLUSTER=ceph
|
||||||
diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in
|
diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in
|
||||||
index dee501b47..d1bcf5bb7 100644
|
index b74747055..5cccc21ee 100644
|
||||||
--- a/systemd/ceph-radosgw@.service.in
|
--- a/systemd/ceph-radosgw@.service.in
|
||||||
+++ b/systemd/ceph-radosgw@.service.in
|
+++ b/systemd/ceph-radosgw@.service.in
|
||||||
@@ -2,8 +2,8 @@
|
@@ -2,8 +2,8 @@
|
@ -1,20 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
Date: Thu, 6 May 2021 18:04:45 +0200
|
|
||||||
Subject: [PATCH] d/control: bump compat to 10
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
debian/compat | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/debian/compat b/debian/compat
|
|
||||||
index ec635144f60..f599e28b8ab 100644
|
|
||||||
--- a/debian/compat
|
|
||||||
+++ b/debian/compat
|
|
||||||
@@ -1 +1 @@
|
|
||||||
-9
|
|
||||||
+10
|
|
||||||
--
|
|
||||||
2.29.2
|
|
||||||
|
|
@ -32,7 +32,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/debian/ceph-mgr.requires b/debian/ceph-mgr.requires
|
diff --git a/debian/ceph-mgr.requires b/debian/ceph-mgr.requires
|
||||||
index bf334fb9bd2..39336330c93 100644
|
index bf334fb9b..39336330c 100644
|
||||||
--- a/debian/ceph-mgr.requires
|
--- a/debian/ceph-mgr.requires
|
||||||
+++ b/debian/ceph-mgr.requires
|
+++ b/debian/ceph-mgr.requires
|
||||||
@@ -1,3 +1,4 @@
|
@@ -1,3 +1,4 @@
|
@ -1,37 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
|
||||||
Date: Wed, 20 May 2021 15:36:34 +0200
|
|
||||||
Subject: [PATCH] d/rules: also add --no-restart-after-upgrade parameter
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
is only a problem with dh compat >= 10 as that enables the
|
|
||||||
restart-after-upgrade by default.
|
|
||||||
|
|
||||||
Keep the old --no-restart-on-upgrade one as else debian may just
|
|
||||||
think we want the restart but as full stop in prerm and start only in
|
|
||||||
postinst.
|
|
||||||
|
|
||||||
For ceph we actually want to let the user fully control the restart
|
|
||||||
explicit.
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
debian/rules | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/debian/rules b/debian/rules
|
|
||||||
index b5ce42c6f3..00e9ac6b16 100755
|
|
||||||
--- a/debian/rules
|
|
||||||
+++ b/debian/rules
|
|
||||||
@@ -104,7 +104,7 @@ override_dh_installinit:
|
|
||||||
|
|
||||||
# NOTE: execute systemd helpers so they pickup dh_install'ed units and targets
|
|
||||||
dh_systemd_enable
|
|
||||||
- dh_systemd_start --no-restart-on-upgrade
|
|
||||||
+ dh_systemd_start --no-restart-on-upgrade --no-restart-after-upgrade
|
|
||||||
|
|
||||||
override_dh_systemd_enable:
|
|
||||||
# systemd enable done as part of dh_installinit
|
|
||||||
|
|
@ -10,6 +10,7 @@ crashing on older CPU architectures. -O1 causes those optimizations to
|
|||||||
be implemented manually via runtime dispatch.
|
be implemented manually via runtime dispatch.
|
||||||
|
|
||||||
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
|
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
|
||||||
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
---
|
---
|
||||||
src/erasure-code/jerasure/CMakeLists.txt | 2 +-
|
src/erasure-code/jerasure/CMakeLists.txt | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
@ -27,6 +28,3 @@ index f9cd22e11..b0a355235 100644
|
|||||||
set_target_properties(gf-complete_objs PROPERTIES
|
set_target_properties(gf-complete_objs PROPERTIES
|
||||||
COMPILE_DEFINITIONS "${GF_COMPILE_FLAGS}")
|
COMPILE_DEFINITIONS "${GF_COMPILE_FLAGS}")
|
||||||
|
|
||||||
--
|
|
||||||
2.39.2
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
Date: Tue, 25 Jul 2023 21:05:18 +0200
|
|
||||||
Subject: [PATCH] d/rules: compile with gcc 12
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
debian/rules | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/debian/rules b/debian/rules
|
|
||||||
index c163daad2..a1653cb74 100755
|
|
||||||
--- a/debian/rules
|
|
||||||
+++ b/debian/rules
|
|
||||||
@@ -5,7 +5,7 @@ export DESTDIR=$(CURDIR)/debian/tmp
|
|
||||||
|
|
||||||
include /usr/share/dpkg/default.mk
|
|
||||||
|
|
||||||
-extraopts += -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11
|
|
||||||
+extraopts += -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12
|
|
||||||
ifneq (,$(findstring WITH_STATIC_LIBSTDCXX,$(CEPH_EXTRA_CMAKE_ARGS)))
|
|
||||||
# dh_auto_build sets LDFLAGS with `dpkg-buildflags --get LDFLAGS` on ubuntu,
|
|
||||||
# which makes the application aborts when the shared library throws
|
|
@ -1,15 +1,11 @@
|
|||||||
0001-cmake-disable-version-from-git.patch
|
0001-cmake-disable-version-from-git.patch
|
||||||
0002-enable-systemd-targets-by-default.patch
|
0002-debian-control-add-break-libpvestorage-perl.patch
|
||||||
0003-debian-control-add-break-libpvestorage-perl.patch
|
0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch
|
||||||
0004-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch
|
0004-remove-legacy-pve-ceph-osd-activation-script-in-post.patch
|
||||||
0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch
|
0005-remove-legacy-init.d-ceph-script.patch
|
||||||
0006-remove-legacy-init.d-ceph-script.patch
|
0006-ceph-mgr-only-suggest-mgr-plugins.patch
|
||||||
0007-only-suggest-mgr-plugins.patch
|
0007-Remove-failing-actions-from-prerm.patch
|
||||||
0008-Remove-failing-actions-from-prerm.patch
|
0008-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch
|
||||||
0009-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch
|
0009-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch
|
||||||
0010-d-control-drop-outdated-build-dependencies-and-bump-.patch
|
0010-debian-add-missing-bcrypt-to-manager-.requires.patch
|
||||||
0011-d-rules-fix-no-restart-on-upgrade.patch
|
0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch
|
||||||
0012-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch
|
|
||||||
0013-d-rules-compile-with-gcc-12.patch
|
|
||||||
0014-debian-add-missing-bcrypt-to-manager-.requires.patch
|
|
||||||
0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch
|
|
||||||
|
Loading…
Reference in New Issue
Block a user