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

patches: remove fuzz and re-format

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2018-11-14 13:40:56 +01:00 committed by Thomas Lamprecht
parent 9e089b1de7
commit b32d239b49
7 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/0001-update-changelog.patch
View File

@ -8,13 +8,13 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
--- ---
debian/changelog | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 175 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 156 insertions(+) 1 file changed, 175 insertions(+)
Index: ceph/debian/changelog diff --git a/debian/changelog b/debian/changelog
=================================================================== index 642fc450fa..a8f2a30ee0 100644
--- ceph.orig/debian/changelog --- a/debian/changelog
+++ ceph/debian/changelog +++ b/debian/changelog
@@ -1,9 +1,28 @@ @@ -1,9 +1,28 @@
+ceph (12.2.8-pve1) stable; urgency=medium +ceph (12.2.8-pve1) stable; urgency=medium
+ +

5
patches/0002-cmake-disable-version-from-git.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
1 file changed, 5 deletions(-) 1 file changed, 5 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7aa8a4392e..77a05ad960 100644 index 80d4b351f5..10e4a6013b 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4) @@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4)
@ -34,6 +34,3 @@ index 7aa8a4392e..77a05ad960 100644
# remove 'v' prefix from raw git version # remove 'v' prefix from raw git version
string(SUBSTRING ${CEPH_GIT_NICE_VER} 1 -1 CEPH_GIT_NICE_VER) string(SUBSTRING ${CEPH_GIT_NICE_VER} 1 -1 CEPH_GIT_NICE_VER)
else(${ENABLE_GIT_VERSION}) else(${ENABLE_GIT_VERSION})
--
2.14.2

5
patches/0003-enable-systemd-targets-by-default.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index 9c63c99c31..4442732e17 100755 index 99a3e8e982..db051ded25 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -133,6 +133,9 @@ override_dh_installinit: @@ -133,6 +133,9 @@ override_dh_installinit:
@ -25,6 +25,3 @@ index 9c63c99c31..4442732e17 100755
# 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
--
2.14.2

9
patches/0004-enable-LZ4-support.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2 files changed, 2 insertions(+) 2 files changed, 2 insertions(+)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index bdc74471da..bc5d03b0ab 100644 index d5bc16e9ee..d96f5aedd0 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -38,6 +38,7 @@ Build-Depends: bc, @@ -38,6 +38,7 @@ Build-Depends: bc,
@ -25,17 +25,14 @@ index bdc74471da..bc5d03b0ab 100644
libsnappy-dev, libsnappy-dev,
libssl-dev, libssl-dev,
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index 4442732e17..a631658d4c 100755 index db051ded25..9dad5ad166 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -7,6 +7,7 @@ export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) @@ -7,6 +7,7 @@ export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
extraopts += -DUSE_CRYPTOPP=OFF -DWITH_OCF=ON -DWITH_LTTNG=ON -DWITH_PYTHON3=ON -DWITH_EMBEDDED=OFF extraopts += -DUSE_CRYPTOPP=OFF -DWITH_OCF=ON -DWITH_LTTNG=ON -DWITH_PYTHON3=ON
extraopts += -DWITH_CEPHFS_JAVA=ON extraopts += -DWITH_CEPHFS_JAVA=ON
+extraopts += -DWITH_LZ4=ON +extraopts += -DWITH_LZ4=ON
# assumes that ceph is exmpt from multiarch support, so we override the libdir. # assumes that ceph is exmpt from multiarch support, so we override the libdir.
extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib
extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib
--
2.14.2

3
patches/0005-msg-async-rdma-uninitialized-variable-fix.patch
View File

@ -29,6 +29,3 @@ index 37e1a53077..06f514fe24 100644
{ {
#ifdef HAVE_IBV_EXP #ifdef HAVE_IBV_EXP
union ibv_gid cgid; union ibv_gid cgid;
--
2.14.2

11
patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch
View File

@ -17,10 +17,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
1 file changed, 6 insertions(+), 6 deletions(-) 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index bc5d03b0ab..902d033098 100644 index d96f5aedd0..ecbecca725 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -105,10 +105,10 @@ Recommends: btrfs-tools, @@ -106,10 +106,10 @@ Recommends: btrfs-tools,
ntp | time-daemon, ntp | time-daemon,
Replaces: ceph (<< 10), Replaces: ceph (<< 10),
ceph-common (<< 0.78-500), ceph-common (<< 0.78-500),
@ -33,7 +33,7 @@ index bc5d03b0ab..902d033098 100644
python-ceph (<< 0.92-1223), python-ceph (<< 0.92-1223),
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
@@ -207,8 +207,8 @@ Depends: ceph-base (= ${binary:Version}), @@ -208,8 +208,8 @@ Depends: ceph-base (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends}, ${shlibs:Depends},
Recommends: ceph-common, Recommends: ceph-common,
@ -44,7 +44,7 @@ index bc5d03b0ab..902d033098 100644
Description: monitor server for the ceph storage system Description: monitor server for the ceph storage system
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,
@@ -241,8 +241,8 @@ Depends: ceph-base (= ${binary:Version}), @@ -242,8 +242,8 @@ Depends: ceph-base (= ${binary:Version}),
${python:Depends}, ${python:Depends},
${shlibs:Depends}, ${shlibs:Depends},
Recommends: ceph-common (= ${binary:Version}), Recommends: ceph-common (= ${binary:Version}),
@ -55,6 +55,3 @@ index bc5d03b0ab..902d033098 100644
Description: OSD server for the ceph storage system Description: OSD server for the ceph storage system
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,
--
2.14.2

23
patches/0007-debian-control-add-break-libpvestorage-perl.patch
View File

@ -1,16 +1,25 @@
Index: ceph/debian/control From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
=================================================================== From: Alwin Antreich <a.antreich@proxmox.com>
--- ceph.orig/debian/control Date: Wed, 24 Oct 2018 10:38:19 +0200
+++ ceph/debian/control Subject: [PATCH] debian/control: add break libpvestorage-perl
@@ -110,6 +110,7 @@ Replaces: ceph (<< 10),
---
debian/control | 2 ++
1 file changed, 2 insertions(+)
diff --git a/debian/control b/debian/control
index ecbecca725..19aa49f9f4 100644
--- a/debian/control
+++ b/debian/control
@@ -111,6 +111,7 @@ Replaces: ceph (<< 10),
Breaks: ceph (<< 10), Breaks: ceph (<< 10),
ceph-test (<< 12.2.2-14), ceph-test (<< 12.2.3),
python-ceph (<< 0.92-1223), python-ceph (<< 0.92-1223),
+ libpve-storage-perl (<= 5.0-25), + libpve-storage-perl (<= 5.0-25),
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,
@@ -406,6 +407,7 @@ Breaks: ceph (<< 10), @@ -407,6 +408,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),