[pve-devel] [PATCH ceph 2/2] patches: remove fuzz and re-format
Fabian Grünbichler
f.gruenbichler at proxmox.com
Wed Nov 14 13:40:56 CET 2018
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
patches/0001-update-changelog.patch | 12 +++++-----
.../0002-cmake-disable-version-from-git.patch | 5 +---
...03-enable-systemd-targets-by-default.patch | 5 +---
patches/0004-enable-LZ4-support.patch | 9 +++-----
...sync-rdma-uninitialized-variable-fix.patch | 3 ---
...ntrol-adjust-ceph-osdomap-kvstore-mo.patch | 11 ++++-----
...control-add-break-libpvestorage-perl.patch | 23 +++++++++++++------
7 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 28fb3923d..7c80c47f0 100644
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -8,13 +8,13 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
- debian/changelog | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 156 insertions(+)
+ debian/changelog | 175 +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 175 insertions(+)
-Index: ceph/debian/changelog
-===================================================================
---- ceph.orig/debian/changelog
-+++ ceph/debian/changelog
+diff --git a/debian/changelog b/debian/changelog
+index 642fc450fa..a8f2a30ee0 100644
+--- a/debian/changelog
++++ b/debian/changelog
@@ -1,9 +1,28 @@
+ceph (12.2.8-pve1) stable; urgency=medium
+
diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0002-cmake-disable-version-from-git.patch
index 6829479ae..6889ec62d 100644
--- a/patches/0002-cmake-disable-version-from-git.patch
+++ b/patches/0002-cmake-disable-version-from-git.patch
@@ -15,7 +15,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
1 file changed, 5 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7aa8a4392e..77a05ad960 100644
+index 80d4b351f5..10e4a6013b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4)
@@ -34,6 +34,3 @@ index 7aa8a4392e..77a05ad960 100644
# remove 'v' prefix from raw git version
string(SUBSTRING ${CEPH_GIT_NICE_VER} 1 -1 CEPH_GIT_NICE_VER)
else(${ENABLE_GIT_VERSION})
---
-2.14.2
-
diff --git a/patches/0003-enable-systemd-targets-by-default.patch b/patches/0003-enable-systemd-targets-by-default.patch
index 9d9b7d0c3..d99cef48e 100644
--- a/patches/0003-enable-systemd-targets-by-default.patch
+++ b/patches/0003-enable-systemd-targets-by-default.patch
@@ -12,7 +12,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
1 file changed, 3 insertions(+)
diff --git a/debian/rules b/debian/rules
-index 9c63c99c31..4442732e17 100755
+index 99a3e8e982..db051ded25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
dh_systemd_enable
---
-2.14.2
-
diff --git a/patches/0004-enable-LZ4-support.patch b/patches/0004-enable-LZ4-support.patch
index 9727a427d..55bb0883a 100644
--- a/patches/0004-enable-LZ4-support.patch
+++ b/patches/0004-enable-LZ4-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
2 files changed, 2 insertions(+)
diff --git a/debian/control b/debian/control
-index bdc74471da..bc5d03b0ab 100644
+index d5bc16e9ee..d96f5aedd0 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,7 @@ Build-Depends: bc,
@@ -25,17 +25,14 @@ index bdc74471da..bc5d03b0ab 100644
libsnappy-dev,
libssl-dev,
diff --git a/debian/rules b/debian/rules
-index 4442732e17..a631658d4c 100755
+index db051ded25..9dad5ad166 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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_LZ4=ON
# assumes that ceph is exmpt from multiarch support, so we override the libdir.
extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib
extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib
---
-2.14.2
-
diff --git a/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch b/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch
index 975fad1da..88b51b7ca 100644
--- a/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch
+++ b/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch
@@ -29,6 +29,3 @@ index 37e1a53077..06f514fe24 100644
{
#ifdef HAVE_IBV_EXP
union ibv_gid cgid;
---
-2.14.2
-
diff --git a/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch b/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch
index 6daa05923..626d0d8d9 100644
--- a/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch
+++ b/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch
@@ -17,10 +17,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
-index bc5d03b0ab..902d033098 100644
+index d96f5aedd0..ecbecca725 100644
--- a/debian/control
+++ b/debian/control
-@@ -105,10 +105,10 @@ Recommends: btrfs-tools,
+@@ -106,10 +106,10 @@ Recommends: btrfs-tools,
ntp | time-daemon,
Replaces: ceph (<< 10),
ceph-common (<< 0.78-500),
@@ -33,7 +33,7 @@ index bc5d03b0ab..902d033098 100644
python-ceph (<< 0.92-1223),
Description: common ceph daemon libraries and management tools
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},
${shlibs:Depends},
Recommends: ceph-common,
@@ -44,7 +44,7 @@ index bc5d03b0ab..902d033098 100644
Description: monitor server for the ceph storage system
Ceph is a massively scalable, open-source, distributed
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},
${shlibs:Depends},
Recommends: ceph-common (= ${binary:Version}),
@@ -55,6 +55,3 @@ index bc5d03b0ab..902d033098 100644
Description: OSD server for the ceph storage system
Ceph is a massively scalable, open-source, distributed
storage system that runs on commodity hardware and delivers object,
---
-2.14.2
-
diff --git a/patches/0007-debian-control-add-break-libpvestorage-perl.patch b/patches/0007-debian-control-add-break-libpvestorage-perl.patch
index d851210b3..977dc8e60 100644
--- a/patches/0007-debian-control-add-break-libpvestorage-perl.patch
+++ b/patches/0007-debian-control-add-break-libpvestorage-perl.patch
@@ -1,16 +1,25 @@
-Index: ceph/debian/control
-===================================================================
---- ceph.orig/debian/control
-+++ ceph/debian/control
-@@ -110,6 +110,7 @@ Replaces: ceph (<< 10),
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alwin Antreich <a.antreich at proxmox.com>
+Date: Wed, 24 Oct 2018 10:38:19 +0200
+Subject: [PATCH] debian/control: add break libpvestorage-perl
+
+---
+ 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),
- ceph-test (<< 12.2.2-14),
+ ceph-test (<< 12.2.3),
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,
-@@ -406,6 +407,7 @@ Breaks: ceph (<< 10),
+@@ -407,6 +408,7 @@ Breaks: ceph (<< 10),
ceph-test (<< 9.0.3-1646),
librbd1 (<< 0.92-1238),
python-ceph (<< 0.92-1223),
--
2.19.1
More information about the pve-devel
mailing list