aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan Bellamy <dunk@denkimushi.com>2021-05-10 18:28:07 +0000
committerMichał Polański <michal@polanski.me>2021-05-11 02:31:22 +0000
commit6499c90511f77bf13e29f2f93ac743f0e1193dc6 (patch)
treeed07d27fecd9de0027846b7da5c770962a78693d
parent4256449064b2612f3cb4113e804673bacdfcbc46 (diff)
downloadaports-6499c90511f77bf13e29f2f93ac743f0e1193dc6.tar.gz
aports-6499c90511f77bf13e29f2f93ac743f0e1193dc6.tar.bz2
aports-6499c90511f77bf13e29f2f93ac743f0e1193dc6.tar.xz
community/ceph: add missing patch desciptions
-rw-r--r--community/ceph/10-musl-fixes.patch1
-rw-r--r--community/ceph/20-pci.patch2
-rw-r--r--community/ceph/30-32bit_fix.patch.noauto2
-rw-r--r--community/ceph/30-cypress.patch.noauto2
-rw-r--r--community/ceph/35-fix_ErasureCodeShec.patch2
-rw-r--r--community/ceph/37-fix_tests.patch3
-rw-r--r--community/ceph/42-no-virtualenvs.patch3
-rw-r--r--community/ceph/APKBUILD14
8 files changed, 22 insertions, 7 deletions
diff --git a/community/ceph/10-musl-fixes.patch b/community/ceph/10-musl-fixes.patch
index 183097514b..1b7c9079c1 100644
--- a/community/ceph/10-musl-fixes.patch
+++ b/community/ceph/10-musl-fixes.patch
@@ -1,3 +1,4 @@
+fix for musl
diff -Nurp a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
--- a/src/tools/rbd_nbd/rbd-nbd.cc 2020-11-21 08:06:35.834423310 +0000
diff --git a/community/ceph/20-pci.patch b/community/ceph/20-pci.patch
index ded258677a..c16e27699e 100644
--- a/community/ceph/20-pci.patch
+++ b/community/ceph/20-pci.patch
@@ -1,3 +1,5 @@
+Musl patch for pci
+
diff -Nurp a/src/spdk/dpdk/drivers/bus/pci/linux/pci_uio.c b/src/spdk/dpdk/drivers/bus/pci/linux/pci_uio.c
--- a/src/spdk/dpdk/drivers/bus/pci/linux/pci_uio.c 2020-11-21 13:07:44.255206657 +0000
+++ b/src/spdk/dpdk/drivers/bus/pci/linux/pci_uio.c 2020-11-21 13:04:06.488285583 +0000
diff --git a/community/ceph/30-32bit_fix.patch.noauto b/community/ceph/30-32bit_fix.patch.noauto
index 7365a9880a..aba21d6400 100644
--- a/community/ceph/30-32bit_fix.patch.noauto
+++ b/community/ceph/30-32bit_fix.patch.noauto
@@ -1,3 +1,5 @@
+32bit specific patches
+
diff -uNr ceph-15.2.4/src/client/Client.cc ceph-15.2.4-arm32_fix/src/client/Client.cc
--- ceph-15.2.4/src/client/Client.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/client/Client.cc 2020-11-21 22:11:16.061796876 +1030
diff --git a/community/ceph/30-cypress.patch.noauto b/community/ceph/30-cypress.patch.noauto
index 2a28bdcb41..8e74753270 100644
--- a/community/ceph/30-cypress.patch.noauto
+++ b/community/ceph/30-cypress.patch.noauto
@@ -1,3 +1,5 @@
+remove cypress as not availiable on 32bit platforms
+
diff -Nurp a/src/pybind/mgr/dashboard/frontend/package.json b/src/pybind/mgr/dashboard/frontend/package.json
--- a/src/pybind/mgr/dashboard/frontend/package.json 2021-04-03 08:58:07.611941559 +0100
+++ b/src/pybind/mgr/dashboard/frontend/package.json 2021-04-03 08:59:13.903122038 +0100
diff --git a/community/ceph/35-fix_ErasureCodeShec.patch b/community/ceph/35-fix_ErasureCodeShec.patch
index cf99132112..0ab2cc2ed0 100644
--- a/community/ceph/35-fix_ErasureCodeShec.patch
+++ b/community/ceph/35-fix_ErasureCodeShec.patch
@@ -1,3 +1,5 @@
+patch by Vladimir Bashkirtsev
+
diff -uNr ceph-15.2.4/src/erasure-code/shec/ErasureCodeShec.cc ceph-15.2.4-fix_ErasureCodeShec/src/erasure-code/shec/ErasureCodeShec.cc
--- ceph-15.2.4/src/erasure-code/shec/ErasureCodeShec.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_ErasureCodeShec/src/erasure-code/shec/ErasureCodeShec.cc 2020-11-14 00:46:20.029488684 +1030
diff --git a/community/ceph/37-fix_tests.patch b/community/ceph/37-fix_tests.patch
index 08ca3839b0..169f6ef189 100644
--- a/community/ceph/37-fix_tests.patch
+++ b/community/ceph/37-fix_tests.patch
@@ -1,3 +1,6 @@
+patch by Vladimir Bashkirtsev
+increase timeouts for armv7 ci
+
diff -uNr ceph-15.2.4/src/test/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/CMakeLists.txt
--- ceph-15.2.4/src/test/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/CMakeLists.txt 2020-11-08 17:37:15.788767448 +1030
diff --git a/community/ceph/42-no-virtualenvs.patch b/community/ceph/42-no-virtualenvs.patch
index eafe32e21c..81efe72ea5 100644
--- a/community/ceph/42-no-virtualenvs.patch
+++ b/community/ceph/42-no-virtualenvs.patch
@@ -1,3 +1,6 @@
+based on gentoo patch
+use system node instead of nodeenv installing one as only availiable for x86 with musl
+
--- a/cmake/modules/AddCephTest.cmake
+++ b/cmake/modules/AddCephTest.cmake
@@ -68,14 +68,6 @@
diff --git a/community/ceph/APKBUILD b/community/ceph/APKBUILD
index 42da2051a9..65ff9f9625 100644
--- a/community/ceph/APKBUILD
+++ b/community/ceph/APKBUILD
@@ -521,18 +521,18 @@ sha512sums="
07bc2b386fb0607df3128c151ee41565afe28b5efe3d907972198fc7fff9cecbafd51570d1b2624d1f921b259f788f0c3d133fb31f11bf6650cb2552f72f8047 ceph_16.2.3.orig.tar.gz
110bdbcb40216c7ed155a8d23020784741b4992d895f4f04a146d275506e4e68053854d3b063b41e9c9b3e3e4f95b6b90602f92c185c853c0d8f47ad0c6b7121 ceph.confd
ce5f162501f6b67fe254546dddf880d1a5b1d1a0fa69e0b1918de17e8da45c5c6124512b8cbd98b76f29d931403de0d11c5ffd330ed8ee1f4dc75bb04baecae3 ceph.initd
-c608f11cf358d76daf5281467a4ea941a81474fbe7f5faa41f7f4d0abaf9136a01576bbb1ab24bdd7bc91a49f66bd7f0a84717de5ec27250d74dd1e47e3b5dd3 10-musl-fixes.patch
-427ab410aeb02d49c5caa8ff68c7b8df325229823d625b7069cd48c66dd9e129e742270850fb2be2238eb6fa12b8256845b4d94426ca96b2a9187b2726e78423 20-pci.patch
-a4dcfbb924fb946d7c346aef0a9ab9bc9b366039775c69d5137842a9dd9a69711fd6c1cf2d757d394212fbfe4209b37a3d2b517de5842ad3ecf6d64497c4fc1b 30-32bit_fix.patch.noauto
-0ea07b5bf8aeb3e0bffc04bf1058af9db0e1e773922be348ebf79594d860a1e734897ef34af143790ef12c3dffa7588b63e94390a1c236b0da0ddf4c689c8dbd 30-cypress.patch.noauto
+94687578411bf0de1b17555ed81c188c88ea63ac4a25993bd8fde9cf68afbbfbdec7b2d7c54fdcfbd4aed4eb78754e8061c308955596cbe037ff15b575874cc6 10-musl-fixes.patch
+03ef3598181c45ecba5600a1e4db7fd897ea9d3c8abdfaad2dcf84c7a241d9ba18e7f7885d69ee0572ee307fc94600a2784a07da909d37a51de27f8ded2e3a70 20-pci.patch
+b879993a285a771c3640c5214ff70e8e01673c0c5e23a0f88ac70db168aeb1dd2eaed12805ed5076adae5a0f596abcb9d82220c6fd97643169cb92788898a189 30-32bit_fix.patch.noauto
+013ff1e35fd91b4b4a9d712701e78975f423a883650b391d9fe73dbc2ab68f02ecd1fa51e1ba6bc60c483b021f99c0d4b9e80a8e19492bd2f31ffed159a356a7 30-cypress.patch.noauto
01c446ac4528d8e12d3544f603ba32a0bf0d5a3a72f9f8f3726725f9d225ee447d2fea4ee2ddf10b36498cc01f2ecf51175dbfcc6376aac4c8002f52c6a04299 30-ubuntu-32bit-fixes.patch.noauto
f974ab36cd6fa49c1d4613203a4f2152723e4952a185dfb6349bc4ca8ee1a7a9d0477bea136c54248271de30a4e584734ba41e8ec41bf274b04074622888ae39 31-32bit_fix_tests.patch.noauto
964e7ca107cc731be2be7bf6813aca760ca1c6e6f6b3748103c1e6baef4d25e41442752a72f5e5daed2b1c6c4f96c9aebbb7114247e8a5047511fbd035767aeb 32-PurgeQueue.cc-cast.patch
fb69f1c886f3cc05a10dd8722429c6bdc840674113e83cf3592caf75b5d4082e5bdaea73426b28edbde724c4973775f2109a3eb4e0a84384fa8083621d463fbd 32-upstream32bit.patch
73326b47deb0967ff024731c28a956ca63800ffcbfa36c6351c157328d2036b3f8406368cc7c7e087841e144b32889f27d807f3405ac1c5a1c2daf6bd7ca5338 32-upstream32bitcleanup.patch
-8a3e902309238ae6917b4c5fe9fa371dad3ba8e01848f462a9b67ad8d69b8370a8957f6c88462a7016319fd323eb6d6c31415734db56485a8a8b279d2705aff5 35-fix_ErasureCodeShec.patch
-cdd7cd0853ad0804415335e0e0c7dc72098de07c769e05d785ac1ebce77311eed6c5ab795c58eededdfa2eaeaf39e9b83c733be2e476b687cadf89c1b5b24a27 37-fix_tests.patch
-82f50a83f138316cf56edeb2f140074ffea33bd0f5352b618f4b540e3ca6d9cb6d97b67d370b3cacb2cfeebc1015f295b3499feff66374b6b4297c16139598a1 42-no-virtualenvs.patch
+abb3cab9c01cc3d6d42a9858678059a8c9c43bda2649bf97b489fdc205eb10ae27f9fb7302062e0fb41f5cffddbfc2ae529130569034f373732a0a5d33aba86e 35-fix_ErasureCodeShec.patch
+908169df45177240d2dcc721fe1637c521789aed56c3b3400ed3ba9c73d93634e4369258fb0e0395dc27053be26229ee8f370e445f0e69d01f551a710a29d407 37-fix_tests.patch
+2584ceb68b50423fac386ce83ad194f22aa574e11b99916e712471bacba28486d2639a8fe63d97c5697f33270c0de99db1f0e76eb43b14cc47c6de7da6903fde 42-no-virtualenvs.patch
aea43c2a99f16f7fccf33aeca3565077bb2274816ca68db64b672addc85bde5c479bc9ad0fb33dbde79c9390f9acf1d98545e20e311e40dd428dad5ed02f0651 43-aarch64-erasure.patch
e47d736d3ab1417758fc5f92798a77272b978799e6d9f0728b2036d6cc5975c6c10f8dc4590c2e1cb31e1e9fc03c582394b30727e315a6889de524fc8bf95369 44-LogClock.h.patch
f89c913a53e2806c59508d26f5dc72abb428c7e4e3b7c1aeb6eaf92744ea9a13cac2f00a2ac90f91ad7682f66d876a5fffedd10feeceecd71a944793581da443 44-staticcast.patch