Commit f71bedc2 authored by Kai Kang's avatar Kai Kang Committed by Bruce Ashfield
Browse files

ceph: 15.2.12 -> 15.2.15


Update ceph to latest 15.x version:

* remove 0001-add-missing-include-for-atomic-bool.patch which has been
  fixed in upstream
* update patch to support python 3.10
* add gawk to RDEPENDS that script 'rgw-gap-list-comparator' requires it
Signed-off-by: default avatarKai Kang <kai.kang@windriver.com>
Signed-off-by: default avatarBruce Ashfield <bruce.ashfield@gmail.com>
parent e94f6cb9
Showing with 11 additions and 35 deletions
+11 -35
From 502be73be3c3645094525aa552f5e53d8782a004 Mon Sep 17 00:00:00 2001
From: Sakib Sajal <sakib.sajal@windriver.com>
Date: Fri, 28 Aug 2020 19:36:19 -0400
Subject: [PATCH] add missing include for atomic<bool>
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
---
src/tools/rbd/action/Bench.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/tools/rbd/action/Bench.cc b/src/tools/rbd/action/Bench.cc
index aa6edbc1..90c551c1 100644
--- a/src/tools/rbd/action/Bench.cc
+++ b/src/tools/rbd/action/Bench.cc
@@ -9,6 +9,7 @@
#include "common/ceph_mutex.h"
#include "include/types.h"
#include "global/signal_handler.h"
+#include <atomic>
#include <iostream>
#include <boost/accumulators/accumulators.hpp>
#include <boost/accumulators/statistics/stats.hpp>
--
2.27.0
From 1060f2e4362ebd6db23870d442dcd158d219ee92 Mon Sep 17 00:00:00 2001
From: Yanfei Xu <yanfei.xu@windriver.com>
Date: Tue, 10 Nov 2020 17:17:30 +0800
Subject: [PATCH] cmake: add support for python3.9
Subject: [PATCH] cmake: add support for python 3.9 and 3.10
add support for python3.9.
Upstream-Status: Pending
Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com>
Add support for python 3.10.
Upstream-Status: Submitted [https://github.com/ceph/ceph/pull/43630]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
cmake/modules/FindPython/Support.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
......@@ -21,7 +25,7 @@ index 6584699b79..c05bbe3306 100644
endif()
if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
- set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
else()
......
......@@ -12,15 +12,11 @@ SRC_URI = "http://download.ceph.com/tarballs/ceph-${PV}.tar.gz \
file://0001-ceph-fix-build-errors-for-cross-compile.patch \
file://0001-fix-host-library-paths-were-used.patch \
file://ceph.conf \
file://0001-add-missing-include-for-atomic-bool.patch \
file://0001-cmake-add-support-for-python3.9.patch \
file://0001-cmake-add-support-for-python3.10.patch \
file://0001-SnappyCompressor.h-fix-snappy-compiler-error.patch \
"
SRC_URI[sha1sum] = "9c76b298e1e659b9c5501003ac77fb28aab7823d"
SRC_URI[sha256sum] = "8710f6700de83765138df8eb4fc7a5e7c66104dd838033e0827a1850f250ac85"
SRC_URI[sha384sum] = "2a2f177e5b68f6f5d13b253a8d4daba9e956b4a79a40a4775aee288b60c612fe13b417d6baf77944c32b1181b2136f68"
SRC_URI[sha512sum] = "08266a2e9a7ca5a37e03f340873571fd012c630dd898a87241cd97c29760b2bf41fe64c8883e7b08e0f83c26245072cd26e69ecb1db02378d1ec38335ba1cd0f"
SRC_URI[sha256sum] = "5dccdaff2ebe18d435b32bfc06f8b5f474bf6ac0432a6a07d144b7c56700d0bf"
DEPENDS = "boost bzip2 curl expat gperf-native \
keyutils libaio libibverbs lz4 \
......@@ -133,6 +129,7 @@ RDEPENDS:${PN} += "\
python3-modules \
python3-prettytable \
${PN}-python \
gawk \
"
COMPATIBLE_HOST = "(x86_64).*"
PACKAGES += " \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment