From 8ded083436c6c884d53d99daa23279ffa383e336 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 28 May 2021 15:50:48 -0700 Subject: ceph: Fix compile error with snappy snappy changed a data type in the last update, this is a known issue in ceph. Signed-off-by: Saul Wold Signed-off-by: Bruce Ashfield --- ...ppyCompressor.h-fix-snappy-compiler-error.patch | 30 ++++++++++++++++++++++ recipes-extended/ceph/ceph_15.2.12.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 recipes-extended/ceph/ceph/0001-SnappyCompressor.h-fix-snappy-compiler-error.patch diff --git a/recipes-extended/ceph/ceph/0001-SnappyCompressor.h-fix-snappy-compiler-error.patch b/recipes-extended/ceph/ceph/0001-SnappyCompressor.h-fix-snappy-compiler-error.patch new file mode 100644 index 00000000..2ebd32d1 --- /dev/null +++ b/recipes-extended/ceph/ceph/0001-SnappyCompressor.h-fix-snappy-compiler-error.patch @@ -0,0 +1,30 @@ +From 85bde55627cfbb35d8b4735dec32bf33fa30079f Mon Sep 17 00:00:00 2001 +From: Saul Wold +Date: Fri, 28 May 2021 10:16:07 -0700 +Subject: [PATCH] SnappyCompressor.h: fix snappy compiler error + +snappy quietly changed public type + +Known issue in ceph: https://tracker.ceph.com/issues/50934 + +Upstream-Status: Pending + +Signed-off-by: Saul Wold + +--- + src/compressor/snappy/SnappyCompressor.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h +index 0cfb819c..2fbe35b7 100644 +--- a/src/compressor/snappy/SnappyCompressor.h ++++ b/src/compressor/snappy/SnappyCompressor.h +@@ -96,7 +96,7 @@ class SnappyCompressor : public Compressor { + if (qat_enabled) + return qat_accel.decompress(p, compressed_len, dst); + #endif +- snappy::uint32 res_len = 0; ++ uint32_t res_len = 0; + BufferlistSource source_1(p, compressed_len); + if (!snappy::GetUncompressedLength(&source_1, &res_len)) { + return -1; diff --git a/recipes-extended/ceph/ceph_15.2.12.bb b/recipes-extended/ceph/ceph_15.2.12.bb index 9ba72b40..3c2e1c62 100644 --- a/recipes-extended/ceph/ceph_15.2.12.bb +++ b/recipes-extended/ceph/ceph_15.2.12.bb @@ -14,6 +14,7 @@ SRC_URI = "http://download.ceph.com/tarballs/ceph-${PV}.tar.gz \ file://ceph.conf \ file://0001-add-missing-include-for-atomic-bool.patch \ file://0001-cmake-add-support-for-python3.9.patch \ + file://0001-SnappyCompressor.h-fix-snappy-compiler-error.patch \ " SRC_URI[sha1sum] = "9c76b298e1e659b9c5501003ac77fb28aab7823d" -- cgit v1.2.3-54-g00ecf