Commit d01c1001 authored by Iggy Jackson's avatar Iggy Jackson
Browse files

community/ceph: upgrade to 14.2.8

**Changes:**

* Bump the version from 14.2.7 -> 14.2.8
* Add patch to fix build on musl
* Set MAKEFLAGS to keep build from using all the memory... thanks C++
* Re-enable the build
parent 2a466dd5
Pipeline #9023 failed with stages
in 121 minutes and 15 seconds
# Contributor: John Coyle <dx9err@gmail.com>
# Maintainer: Iggy Jackson <iggy@kws1.com>
pkgname=ceph
pkgver=14.2.7
pkgver=14.2.8
pkgrel=0
pkgdesc="Ceph is a distributed object store and file system"
pkgusers="ceph"
pkggroups="ceph"
url="https://ceph.com/"
arch="" #"x86_64 aarch64"
arch="x86_64 aarch64"
# https://github.com/ceph/ceph/blob/master/COPYING
license="LGPL-2.1-only AND LGPL-2.0-or-later AND GPL-2.0-only AND GPL-3.0-only AND CC-BY-SA-1.0 AND BSL-1.0 AND GPL-2.0-or-later WITH Autoconf-exception-2.0 AND BSD-3-Clause AND MIT AND custom"
depends="ceph-osd ceph-mds ceph-mon"
......@@ -90,6 +90,7 @@ makedepends="
source="https://download.ceph.com/tarballs/ceph_$pkgver.orig.tar.gz
allperms.patch
musl-fixes.patch
fix-seek-data-hole.patch
"
subpackages="
$pkgname-doc
......@@ -153,6 +154,8 @@ _py3_sitelib() {
build() {
export CEPH_BUILD_VIRTUALENV="$builddir"
# builders keep failing when -jN == nproc
export MAKEFLAGS="$MAKEFLAGS -j1"
mkdir -p "$builddir"/build
cd "$builddir"/build
......@@ -522,6 +525,9 @@ _pkg() {
done
}
sha512sums="59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1 ceph_14.2.7.orig.tar.gz
sha512sums="
38b0c6df58579377528c8f8e06d0cbc40f471f6eb2fb4a05b395f6fddbd3f2117674545b2147d8730973b01967ddcd4322a769ba03f9c625417ed35cc39f195a ceph_14.2.8.orig.tar.gz
e1becd813ed3f28e2e4a6bef78b3b5117c1c0bb9cabe0ba9c912e0a20b551b6b2667495cddb94acd64192e287144911ff1c11e0d636fe04cc458146cfb0daca8 allperms.patch
35722b11ad52a3145153635b6a96abda2a23ae9c7e63e2eac006c1e5b8014452c4a1a11bbe0292fd731e4c43aa38e27dd75d2ff9d25bcf52290278f71e868570 musl-fixes.patch"
35722b11ad52a3145153635b6a96abda2a23ae9c7e63e2eac006c1e5b8014452c4a1a11bbe0292fd731e4c43aa38e27dd75d2ff9d25bcf52290278f71e868570 musl-fixes.patch
951eab175ffcfc39675302ea9ea5ac18c9c348a0c5180c6b1f376e4547c079dd660ec50e08e32d47a4144bd17248b81842df85e55a93903054f58f976d85f8a1 fix-seek-data-hole.patch
"
From ffc79f128ca577908899689fffbdbbd97a7af2ef Mon Sep 17 00:00:00 2001
From: Stefan Bischoff <stefan.bischoff@9plus.de>
Date: Tue, 12 Nov 2019 16:11:32 +0100
Subject: [PATCH] client: Fixes for missing consts SEEK_DATA and SEEK_HOLE on
alpine linux
Fixes: https://tracker.ceph.com/issues/42602
Signed-off-by: Stefan Bischoff <stefan.bischoff@lw-rulez.de>
---
src/client/Client.cc | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/client/Client.cc b/src/client/Client.cc
index 281b4ef03123..737bfabe67f7 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -8908,9 +8908,28 @@ loff_t Client::_lseek(Fh *f, loff_t offset, int whence)
{
Inode *in = f->inode.get();
int r;
+ bool whence_check = false;
loff_t pos = -1;
- if (whence == SEEK_END || whence == SEEK_DATA || whence == SEEK_HOLE) {
+ switch (whence) {
+ case SEEK_END:
+ whence_check = true;
+ break;
+
+#ifdef SEEK_DATA
+ case SEEK_DATA:
+ whence_check = true;
+ break;
+#endif
+
+#ifdef SEEK_HOLE
+ case SEEK_HOLE:
+ whence_check = true;
+ break;
+#endif
+ }
+
+ if (whence_check) {
r = _getattr(in, CEPH_STAT_CAP_SIZE, f->actor_perms);
if (r < 0) {
return r;
@@ -8930,6 +8949,7 @@ loff_t Client::_lseek(Fh *f, loff_t offset, int whence)
pos = in->size + offset;
break;
+#ifdef SEEK_DATA
case SEEK_DATA:
if (offset < 0 || static_cast<uint64_t>(offset) >= in->size) {
r = -ENXIO;
@@ -8937,7 +8957,9 @@ loff_t Client::_lseek(Fh *f, loff_t offset, int whence)
}
pos = offset;
break;
+#endif
+#ifdef SEEK_HOLE
case SEEK_HOLE:
if (offset < 0 || static_cast<uint64_t>(offset) >= in->size) {
r = -ENXIO;
@@ -8946,6 +8968,7 @@ loff_t Client::_lseek(Fh *f, loff_t offset, int whence)
pos = in->size;
}
break;
+#endif
default:
ldout(cct, 1) << __func__ << ": invalid whence value " << whence << dendl;
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