You are not logged in.
diff updating to 14.2.11
WITH_RADOSGW_KAFKA_ENDPOINT=OFF is needed because autodection detects the dependency is missing but test will fail to build while trying to use it anyway and adding the dependency does not help as the version check is broken.
Patches added for gcc 10 and glibc 2.32 compatibility.
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index cef7f9c..01c4304 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -3,8 +3,8 @@
pkgbase='ceph'
pkgname=('ceph' 'ceph-libs' 'ceph-mgr')
-_zstdver=1.4.4
-pkgver=14.2.8
+_zstdver=1.4.5
+pkgver=14.2.11
pkgrel=1
pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
arch=('x86_64')
@@ -47,16 +47,25 @@ source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
'use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch'
'suppress-pylint-warnings.patch'
'fix-mgr-dashboard-frontend-unittests-dist-stuff.patch'
- "zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz")
-sha512sums=('38b0c6df58579377528c8f8e06d0cbc40f471f6eb2fb4a05b395f6fddbd3f2117674545b2147d8730973b01967ddcd4322a769ba03f9c625417ed35cc39f195a'
+ "zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz"
+ https://github.com/ceph/ceph/commit/67bf182aa542a614c591b55c11736a0082feed47.patch
+ https://github.com/ceph/ceph/commit/b9b6faf66ae67648626470cb4fc3f0850ac4d842.patch
+ https://github.com/ceph/ceph/commit/598c37296c944a056e4cd90e9f73c9e2fa6552fc.patch
+ https://github.com/ceph/ceph/commit/84f629e1b1c8b336b9ce6bcc2466010045e68e7e.patch
+ )
+sha512sums=('765e8982d457cfd900acddc8f82c23824b32dc6d925d45e7693cba48c06fab798b6d57991dc9ad18a9ace9aff6fb2b917bd97f2d6435a7caceb03c9733e9602a'
'4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
'02c9e8fd3c23fb4c9c4c576ee6d06e8525ca31decfd964fb7231e73c98fe2987a483dda680969752186f0918f47d9af4fb09a4901e5319077f45d870906716da'
'2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
'a74aea7c0b0d1883c874f889c184bd2c766fa578d6ca0cbe5eaada840281bb947b3d80f142b30473058cd2652d2967d241ade6914d6be50e93e91728a31733c8'
'4345fc2f422c7c1910bfd4068ad39511fa63d8c1e4fc04af416bb0f3869e43327d4a4bfc980d5abf273693a532ac153ed1e4c03e033a127692c1254b99092b8a'
'4afd5c3b49a839531921e80b1204ef5b496531a31b3de13042bfcbb548d736851ef7698e41bc94a9bed356e7c2cab6bf30bc711796249cf10ee791974033c29b'
- '6265e083e0e8cba481741c7492a47e8144381287c2cbaef220a64bd889d8bac43cb5cc3efb01600cf785d585c950982a908deed10bedf0688c5cd2015e004c1f'
- '8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf')
+ '95778ae3f06db4e5038d040180974c6d1c43ab6a53085116a29fa79349a11e8d24f467589fcc2bc580f227372f3de57b66b94a7a9c2b9f333d5bce2431b28a1e'
+ 'b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387'
+ '8b61bd26b1a0442641d3237f1b4c09e7f43d6c52788a7b7088a5697b4e18bccb8f9ceaa0bd2fdfcbea12e8e182cdf038d2cfe671692758267ab72dff1c705f8e'
+ 'f4f725db5ce8ff01088557891382f28b014a18accbca40b9939899e611377dc71bc94aa47333bbff544b65a7f7cb680bac4a1359481afe24354a0b5c4a9469e4'
+ 'c6c13e94ae180d9753ec22e9d4f3f5cfbd01e01f94dda253f6f05475b96ac51773a9040279dacb26e2dcf5dc8983631e307eb3408b05fb44f0ca52d263e6fd12'
+ '4e0f1a1584fc4dfbb63603c424d6e4ebd828d778c834205605edc922a7878acaa5eeff4a5dfeb925b2f7c2c4f96bebb49a51e8c67ce0d4b10412cbbc3ca88bef')
# -fno-plt causes linker errors (undefined reference to internal methods)
@@ -154,6 +163,7 @@ build() {
-DWITH_RADOSGW_BEAST_FRONTEND=ON \
-DWITH_RADOSGW_BEAST_OPENSSL=ON \
-DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
+ -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \
-DWITH_SYSTEMD=ON \
-DWITH_SYSTEM_BOOST=OFF \
-DWITH_BOOST_CONTEXT=ON \
@@ -169,7 +179,7 @@ build() {
check() {
cd "${srcdir}/${pkgbase}-${pkgver}/build"
- export CTEST_PARALLEL_LEVEL="8"
+ export CTEST_PARALLEL_LEVEL="2"
VERBOSE=1 make check
# sometimes processes are not properly terminated...
diff --git a/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch b/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch
index 07c088b..5fd1bbe 100644
--- a/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch
+++ b/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch
@@ -9,7 +9,7 @@
# Unit Tests
config='src/unit-test-configuration.ts'
-@@ -25,22 +25,22 @@ if [ -e ${config}_old ]; then
+@@ -25,27 +25,27 @@ if [ -e ${config}_old ]; then
fi
# Linting
@@ -19,32 +19,40 @@
- echo -e "\nTry running 'npm run fix' to fix some linting errors. \
-Some errors might need a manual fix."
-fi
--
--# I18N
++#npm run lint --silent
++#if [ $? -gt 0 ]; then
++# failed=true
++# echo -e "\nTry running 'npm run fix' to fix some linting errors. \
++#Some errors might need a manual fix."
++#fi
+
+ # I18N
-npm run i18n:extract
--i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
--if [[ ! -z $i18n_lint ]]; then
-- echo -e "The following source translations in 'messages.xlf' need to be \
--fixed, please check the I18N suggestions in 'HACKING.rst':\n"
-- echo "${i18n_lint}"
+-if [ $? -gt 0 ]; then
- failed=true
+- echo -e "\nTranslations extraction has failed."
+-else
+- i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
+- if [ "$i18n_lint" ]; then
+- echo -e "The following source translations in 'messages.xlf' need to be \
+- fixed, please check the I18N suggestions in 'HACKING.rst':\n"
+- echo "${i18n_lint}"
+- failed=true
+- fi
-fi
-+# npm run lint --silent
-+# if [ $? -gt 0 ]; then
-+# failed=true
-+# echo -e "\nTry running 'npm run fix' to fix some linting errors. \
-+# Some errors might need a manual fix."
-+# fi
-+#
-+# # I18N
-+# npm run i18n:extract
-+# i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
-+# if [[ ! -z $i18n_lint ]]; then
-+# echo -e "The following source translations in 'messages.xlf' need to be \
-+# fixed, please check the I18N suggestions in 'HACKING.rst':\n"
-+# echo "${i18n_lint}"
-+# failed=true
-+# fi
++#npm run i18n:extract
++#if [ $? -gt 0 ]; then
++# failed=true
++# echo -e "\nTranslations extraction has failed."
++#else
++# i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
++# if [ "$i18n_lint" ]; then
++# echo -e "The following source translations in 'messages.xlf' need to be \
++# fixed, please check the I18N suggestions in 'HACKING.rst':\n"
++# echo "${i18n_lint}"
++# failed=true
++# fi
++#fi
if [ `uname` != "FreeBSD" ]; then
deactivateIn check this can fail dmclock seemingly randomly, bluesfs can fail due to OOM.
PKGBUILD.diff updating to 15.2.5
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index cef7f9c..468a1e4 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -3,8 +3,8 @@
pkgbase='ceph'
pkgname=('ceph' 'ceph-libs' 'ceph-mgr')
-_zstdver=1.4.4
-pkgver=14.2.8
+_zstdver=1.4.5
+pkgver=15.2.5
pkgrel=1
pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
arch=('x86_64')
@@ -35,7 +35,7 @@ makedepends=("zstd=${_zstdver}" 'bc' 'boost' 'boost-libs' 'cmake' 'coffeescript'
'python-setuptools' 'python-six' 'python-sphinx' 'python-tempora'
'python-virtualenv' 'python-werkzeug' 'python-wrapt' 'rabbitmq'
'sed' 'snappy' 'socat' 'systemd' 'systemd-libs' 'valgrind'
- 'xfsprogs' 'xmlstarlet' 'xxhash' 'yasm' 'zlib' )
+ 'xfsprogs' 'xmlstarlet' 'xxhash' 'yasm' 'zlib' 'librdkafka')
checkdepends=('python-mock' 'python-nose' 'python-pycodestyle' 'python-pylint'
'python-pytest' 'python-pytest-cov')
options=('emptydirs')
@@ -47,16 +47,18 @@ source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
'use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch'
'suppress-pylint-warnings.patch'
'fix-mgr-dashboard-frontend-unittests-dist-stuff.patch'
- "zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz")
-sha512sums=('38b0c6df58579377528c8f8e06d0cbc40f471f6eb2fb4a05b395f6fddbd3f2117674545b2147d8730973b01967ddcd4322a769ba03f9c625417ed35cc39f195a'
+ "zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz"
+ 'https://github.com/ceph/ceph/commit/b9b6faf66ae67648626470cb4fc3f0850ac4d842.patch')
+sha512sums=('55de068886c48293e92ef95cf8343ae44825fd2bf9c3fa7d47cda92907a47bae79e0af730cd34d0155b0777901d0fd6f9d1f30537c66c54c95098df7368fca2e'
'4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
- '02c9e8fd3c23fb4c9c4c576ee6d06e8525ca31decfd964fb7231e73c98fe2987a483dda680969752186f0918f47d9af4fb09a4901e5319077f45d870906716da'
+ '04804f4a61ced701a42140f1c8d10f2d3d06088d3598ac62df9ef7f6f9cec88412892833542e4f36fe735bd584d110258101dca2b7b19b54bcc1686592e3b19a'
'2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
'a74aea7c0b0d1883c874f889c184bd2c766fa578d6ca0cbe5eaada840281bb947b3d80f142b30473058cd2652d2967d241ade6914d6be50e93e91728a31733c8'
- '4345fc2f422c7c1910bfd4068ad39511fa63d8c1e4fc04af416bb0f3869e43327d4a4bfc980d5abf273693a532ac153ed1e4c03e033a127692c1254b99092b8a'
+ 'ea29f46126cf19f30938a62f65495c132d73720c93b882dd5a367f79b3130a809cbc8e3d8a481779b4b286c54a76610a72482a50ecd1af252bd183659a9dd668'
'4afd5c3b49a839531921e80b1204ef5b496531a31b3de13042bfcbb548d736851ef7698e41bc94a9bed356e7c2cab6bf30bc711796249cf10ee791974033c29b'
- '6265e083e0e8cba481741c7492a47e8144381287c2cbaef220a64bd889d8bac43cb5cc3efb01600cf785d585c950982a908deed10bedf0688c5cd2015e004c1f'
- '8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf')
+ '75cef9e003b0a88523d48dfe4120612b789caf4b5d2d0423747655390424ed9b3e32cc89d575da0c1ab772ceabba7f96f64301f01b3896abc75c0152d6fabe63'
+ 'b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387'
+ 'f4f725db5ce8ff01088557891382f28b014a18accbca40b9939899e611377dc71bc94aa47333bbff544b65a7f7cb680bac4a1359481afe24354a0b5c4a9469e4')
# -fno-plt causes linker errors (undefined reference to internal methods)
@@ -100,7 +102,7 @@ prepare() {
rm src/test/cli/ceph-authtool/cap*.t
# disable certain pylint test cases (we don't are about them for packaging)
- sed -i 's/,py3-lint//' src/pybind/mgr/dashboard/run-tox.sh
+# sed -i 's/,py3-lint//' src/pybind/mgr/dashboard/run-tox.sh
# this test will try to perform btrfs operations when a btrfs mount
@@ -116,8 +118,6 @@ build() {
mkdir -p build
cd build
- export PYTHON_INCLUDE_DIR="$(python -c "from sysconfig import get_path; print(get_path('include'))")"
-
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
@@ -131,8 +131,6 @@ build() {
-DENABLE_GIT_VERSION=ON \
-DWITH_PYTHON2=OFF \
-DWITH_PYTHON3=ON \
- -DMGR_PYTHON_VERSION=3 \
- -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDE_DIR:?}" \
-DWITH_BABELTRACE=OFF \
-DWITH_LTTNG=OFF \
-DWITH_OPENLDAP=OFF \
@@ -169,8 +167,8 @@ build() {
check() {
cd "${srcdir}/${pkgbase}-${pkgver}/build"
- export CTEST_PARALLEL_LEVEL="8"
- VERBOSE=1 make check
+ export CTEST_PARALLEL_LEVEL="2"
+ VERBOSE=1 make check #smoke and safe-to-destroy timeout
# sometimes processes are not properly terminated...
for process in ceph-mon ceph-mgr ceph-osd; do
diff --git a/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch b/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch
index 07c088b..1cae015 100644
--- a/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch
+++ b/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch
@@ -1,6 +1,6 @@
--- a/src/pybind/mgr/dashboard/run-frontend-unittests.sh 2020-01-08 19:36:54.000000000 +0100
+++ b/src/pybind/mgr/dashboard/run-frontend-unittests.sh 2020-01-10 15:18:39.646510326 +0100
-@@ -8,7 +8,7 @@ if [ `uname` != "FreeBSD" ]; then
+@@ -11,33 +11,33 @@ if [ `uname` != "FreeBSD" ]; then
fi
# Build
@@ -8,9 +8,7 @@
+#npm run build -- --prod --progress=false || failed=true
# Unit Tests
- config='src/unit-test-configuration.ts'
-@@ -25,22 +25,22 @@ if [ -e ${config}_old ]; then
- fi
+ npm run test:ci || failed=true
# Linting
-npm run lint --silent
@@ -19,32 +17,40 @@
- echo -e "\nTry running 'npm run fix' to fix some linting errors. \
-Some errors might need a manual fix."
-fi
--
--# I18N
++#npm run lint --silent
++#if [ $? -gt 0 ]; then
++# failed=true
++# echo -e "\nTry running 'npm run fix' to fix some linting errors. \
++#Some errors might need a manual fix."
++#fi
+
+ # I18N
-npm run i18n:extract
--i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
--if [[ ! -z $i18n_lint ]]; then
-- echo -e "The following source translations in 'messages.xlf' need to be \
--fixed, please check the I18N suggestions in 'HACKING.rst':\n"
-- echo "${i18n_lint}"
+-if [ $? -gt 0 ]; then
- failed=true
+- echo -e "\nTranslations extraction has failed."
+-else
+- i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
+- if [ "$i18n_lint" ]; then
+- echo -e "\nThe following source translations in 'messages.xlf' need to be \
+- fixed, please check the I18N suggestions in 'HACKING.rst':\n"
+- echo "${i18n_lint}"
+- failed=true
+- fi
-fi
-+# npm run lint --silent
-+# if [ $? -gt 0 ]; then
-+# failed=true
-+# echo -e "\nTry running 'npm run fix' to fix some linting errors. \
-+# Some errors might need a manual fix."
-+# fi
-+#
-+# # I18N
-+# npm run i18n:extract
-+# i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
-+# if [[ ! -z $i18n_lint ]]; then
-+# echo -e "The following source translations in 'messages.xlf' need to be \
-+# fixed, please check the I18N suggestions in 'HACKING.rst':\n"
-+# echo "${i18n_lint}"
-+# failed=true
-+# fi
++#npm run i18n:extract
++#if [ $? -gt 0 ]; then
++# failed=true
++# echo -e "\nTranslations extraction has failed."
++#else
++# i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
++# if [ "$i18n_lint" ]; then
++# echo -e "\nThe following source translations in 'messages.xlf' need to be \
++# fixed, please check the I18N suggestions in 'HACKING.rst':\n"
++# echo "${i18n_lint}"
++# failed=true
++# fi
++#fi
- if [ `uname` != "FreeBSD" ]; then
- deactivate
+ # npm resolutions
+ npm run fix:audit
diff --git a/trunk/remove-distro-version-detection.patch b/trunk/remove-distro-version-detection.patch
index df72305..64d503e 100644
--- a/trunk/remove-distro-version-detection.patch
+++ b/trunk/remove-distro-version-detection.patch
@@ -1,6 +1,6 @@
--- a/src/common/util.cc 2018-05-29 14:04:02.000000000 +0200
+++ b/src/common/util.cc 2018-06-04 13:45:52.279495745 +0200
-@@ -96,7 +96,6 @@ static bool os_release_parse(map<string,
+@@ -98,7 +98,6 @@ static bool os_release_parse(map<string, string> *m, CephContext *cct)
static const map<string, string> kvm = {
{ "distro", "ID=" },
{ "distro_description", "PRETTY_NAME=" },
diff --git a/trunk/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch b/trunk/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch
index ec5ea53..bd9be26 100644
--- a/trunk/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch
+++ b/trunk/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch
@@ -9,27 +9,15 @@
#include "include/buffer.h"
#include "include/encoding.h"
-@@ -30,7 +30,13 @@ class ZstdCompressor : public Compressor
+@@ -30,7 +30,10 @@ class ZstdCompressor : public Compressor {
int compress(const bufferlist &src, bufferlist &dst) override {
ZSTD_CStream *s = ZSTD_createCStream();
- ZSTD_initCStream_srcSize(s, COMPRESSION_LEVEL, src.length());
-+
-+ // ZSTD_initCStream_srcSize(s, COMPRESSION_LEVEL, src.length());
+ ZSTD_CCtx_reset(s, ZSTD_reset_session_only);
+ ZSTD_CCtx_refCDict(s, NULL); // clear the dictionary (if any)
+ ZSTD_CCtx_setParameter(s, ZSTD_c_compressionLevel, COMPRESSION_LEVEL);
+ ZSTD_CCtx_setPledgedSrcSize(s, src.length());
-+
auto p = src.begin();
size_t left = src.length();
-@@ -48,7 +54,7 @@ class ZstdCompressor : public Compressor
- inbuf.size = p.get_ptr_and_advance(left, (const char**)&inbuf.src);
- left -= inbuf.size;
- ZSTD_EndDirective const zed = (left==0) ? ZSTD_e_end : ZSTD_e_continue;
-- size_t r = ZSTD_compress_generic(s, &outbuf, &inbuf, zed);
-+ size_t r = ZSTD_compressStream2(s, &outbuf, &inbuf, zed);
- if (ZSTD_isError(r)) {
- return -EINVAL;
- }In addition to the potential check failures of the previous build smoke and safe-to-destroy timeout (timeout seems to be 10 or 12 hours).
Can anyone else reproduce these results?
Offline