aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan Bellamy <dunk@denkimushi.com>2021-11-11 13:03:14 +0000
committerAndy Postnikov <apostnikov@gmail.com>2021-11-12 04:53:53 +0000
commit6e80a8f57eaac9b0feba7eb89a94e81dd6357693 (patch)
tree986db51cb0dfcb0b6964b30ee142621428576ee1
parentf8961fd93a2a76a080abdd2c5d8ba4ca1041ebad (diff)
community/ceph: backport 11-s3_expiration_header.patch from edge
* backport yarn patch to fix out of space during build * remove dashboard angular app source
-rw-r--r--community/ceph/11-s3_expiration_header.patch30
-rw-r--r--community/ceph/12-package.json-resolutions.patch31
-rw-r--r--community/ceph/44-npm.patch14
-rw-r--r--community/ceph/APKBUILD18
4 files changed, 74 insertions, 19 deletions
diff --git a/community/ceph/11-s3_expiration_header.patch b/community/ceph/11-s3_expiration_header.patch
new file mode 100644
index 00000000000..ac12a833556
--- /dev/null
+++ b/community/ceph/11-s3_expiration_header.patch
@@ -0,0 +1,30 @@
+Patch by Robin Mueller
+
+Fix musl date handling
+
+--- a/src/rgw/rgw_lc.cc 2021-09-16 16:27:19.000000000 +0200
++++ b/src/rgw/rgw_lc.cc 2021-10-01 09:17:06.996639952 +0200
+@@ -2238,8 +2238,21 @@
+ // Fri, 23 Dec 2012 00:00:00 GMT
+ char exp_buf[100];
+ time_t exp = ceph::real_clock::to_time_t(*expiration_date);
+- if (std::strftime(exp_buf, sizeof(exp_buf),
+- "%a, %d %b %Y %T %Z", std::gmtime(&exp))) {
++ std::size_t len = std::strftime(exp_buf, sizeof(exp_buf), "%a, %d %b %Y %T %Z", std::gmtime(&exp));
++
++ if (len) {
++ int position = 0;
++ while (exp_buf[position] != 'U' && len - position > 3)
++ position++;
++
++ if (len - position == 3) {
++ char substr[4];
++ memcpy(substr, &exp_buf[position], 4);
++
++ if (strcmp(substr, "UTC") == 0)
++ memcpy(&exp_buf[position], "GMT", 3);
++ }
++
+ hdr = fmt::format("expiry-date=\"{0}\", rule-id=\"{1}\"", exp_buf,
+ *rule_id);
+ } else {
diff --git a/community/ceph/12-package.json-resolutions.patch b/community/ceph/12-package.json-resolutions.patch
new file mode 100644
index 00000000000..1a392642659
--- /dev/null
+++ b/community/ceph/12-package.json-resolutions.patch
@@ -0,0 +1,31 @@
+--- a/src/pybind/mgr/dashboard/CMakeLists.txt
++++ b/src/pybind/mgr/dashboard/CMakeLists.txt
+@@ -76,7 +76,7 @@
+
+ add_npm_command(
+ OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
+- COMMAND CYPRESS_CACHE_FOLDER=${CMAKE_SOURCE_DIR}/build/src/pybind/mgr/dashboard/cypress NG_CLI_ANALYTICS=false npm ci ${mgr-dashboard-userconfig}
++ COMMAND CYPRESS_CACHE_FOLDER=${CMAKE_SOURCE_DIR}/build/src/pybind/mgr/dashboard/cypress NG_CLI_ANALYTICS=false yarn install --network-timeout 600000 --frozen-lockfile ${mgr-dashboard-userconfig}
+ DEPENDS frontend/package.json
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
+ COMMENT "dashboard frontend dependencies are being installed"
+@@ -119,7 +119,7 @@
+
+ add_npm_command(
+ OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist"
+- COMMAND DASHBOARD_FRONTEND_LANGS="${DASHBOARD_FRONTEND_LANGS}" npm run build:localize -- ${npm_args}
++ COMMAND DASHBOARD_FRONTEND_LANGS="${DASHBOARD_FRONTEND_LANGS}" yarn run build:localize ${npm_args}
+ DEPENDS ${frontend_src} frontend/node_modules
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
+ COMMENT "dashboard frontend is being created"
+--- a/src/pybind/mgr/dashboard/frontend/package.json
++++ b/src/pybind/mgr/dashboard/frontend/package.json
+@@ -142,8 +142,5 @@
+ "ts-node": "9.0.0",
+ "tslint": "6.1.3",
+ "typescript": "3.9.6"
+- },
+- "resolutions": {
+- "fsevents": "2.1.3"
+ }
+ }
diff --git a/community/ceph/44-npm.patch b/community/ceph/44-npm.patch
deleted file mode 100644
index 7cce3fa1f52..00000000000
--- a/community/ceph/44-npm.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-merged as:
-https://github.com/ceph/ceph/pull/43053
-
---- a/src/pybind/mgr/dashboard/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
-@@ -70,7 +70,7 @@
-
- add_npm_command(
- OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
-- COMMAND CYPRESS_CACHE_FOLDER=${CMAKE_SOURCE_DIR}/build/src/pybind/mgr/dashboard/cypress NG_CLI_ANALYTICS=false npm ci ${mgr-dashboard-userconfig}
-+ COMMAND CYPRESS_CACHE_FOLDER=${CMAKE_SOURCE_DIR}/build/src/pybind/mgr/dashboard/cypress NG_CLI_ANALYTICS=false npm ci -f ${mgr-dashboard-userconfig}
- DEPENDS frontend/package.json
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
- COMMENT "dashboard frontend dependencies are being installed"
diff --git a/community/ceph/APKBUILD b/community/ceph/APKBUILD
index 26260828932..fc287f74966 100644
--- a/community/ceph/APKBUILD
+++ b/community/ceph/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=ceph
pkgver=16.2.6
-pkgrel=0
+pkgrel=1
pkgdesc="Ceph is a distributed object store and file system"
pkgusers="ceph"
pkggroups="ceph"
@@ -96,6 +96,7 @@ makedepends="
userspace-rcu-dev
xfsprogs-dev
xmlstarlet
+ yarn
yasm
$_base_deps
$_osd_daemon_deps
@@ -108,8 +109,10 @@ source="https://download.ceph.com/tarballs/ceph_$pkgver.orig.tar.gz
ceph.confd
ceph.initd
10-musl-fixes.patch
- 11-parse_rfc1123_alt.patch
11-dump_time_header_impl.patch
+ 11-parse_rfc1123_alt.patch
+ 11-s3_expiration_header.patch
+ 12-package.json-resolutions.patch
20-pci.patch
30-32bit_fix.patch.noauto
30-cypress.patch.noauto
@@ -126,7 +129,6 @@ source="https://download.ceph.com/tarballs/ceph_$pkgver.orig.tar.gz
44-cmake-buildtype.patch
44-staticcast.patch
44-node_modules.patch
- 44-npm.patch
44-missing-include.patch
"
@@ -246,6 +248,11 @@ package() {
rm -rf src/pybind/mgr/dashboard/frontend/node_modules
make -C build DESTDIR="$pkgdir" install
+ # yarn creates an empty usr/local/bin
+ rm -rf "${pkgdir:?}"/usr/local
+
+ # remove dashboard angular app source
+ rm -rf "$pkgdir"/usr/share/ceph/mgr/dashboard/frontend/src
# remove the upstream init file and put in openrc ones
rm -f "$pkgdir"/etc/init.d/ceph
@@ -541,8 +548,10 @@ f01e29088ae566d4111c21b5d0c173ddb02badaa0d8272f7f1548eb8e66a95dc7052b3945d9fb342
110bdbcb40216c7ed155a8d23020784741b4992d895f4f04a146d275506e4e68053854d3b063b41e9c9b3e3e4f95b6b90602f92c185c853c0d8f47ad0c6b7121 ceph.confd
ce5f162501f6b67fe254546dddf880d1a5b1d1a0fa69e0b1918de17e8da45c5c6124512b8cbd98b76f29d931403de0d11c5ffd330ed8ee1f4dc75bb04baecae3 ceph.initd
94687578411bf0de1b17555ed81c188c88ea63ac4a25993bd8fde9cf68afbbfbdec7b2d7c54fdcfbd4aed4eb78754e8061c308955596cbe037ff15b575874cc6 10-musl-fixes.patch
-ff6e281388432ef864e72e00833f979c7bafe14d56c08968835a123466bf5e82239dfb8a7d89afa9caabba445217ae4ba0d7f89093c2edf243dd7cca3353efbe 11-parse_rfc1123_alt.patch
211e6f5f8fc962878196ec917984781eb4a8a9495bcc8d1729b34ac66abd2d4a0b7388ae2caee9d5deb664d54860d120a37215924625e82eac9bfca16179667a 11-dump_time_header_impl.patch
+ff6e281388432ef864e72e00833f979c7bafe14d56c08968835a123466bf5e82239dfb8a7d89afa9caabba445217ae4ba0d7f89093c2edf243dd7cca3353efbe 11-parse_rfc1123_alt.patch
+52b11dfd157dfb7363d2d3428901559189263caaa1c5f29a924b9be7ea012d4f54a887b22d2e2a3d756f6fd771f626505912dca52e6b19a56e018be45b7acb8b 11-s3_expiration_header.patch
+707fd58855b4290ebcee7194ba29e089d3147310fa466b222a57f82c7659575f922637655b95bff92bdb1116cafbb58bc4e17e1cc65cb8dc29c891edf10a509f 12-package.json-resolutions.patch
03ef3598181c45ecba5600a1e4db7fd897ea9d3c8abdfaad2dcf84c7a241d9ba18e7f7885d69ee0572ee307fc94600a2784a07da909d37a51de27f8ded2e3a70 20-pci.patch
b879993a285a771c3640c5214ff70e8e01673c0c5e23a0f88ac70db168aeb1dd2eaed12805ed5076adae5a0f596abcb9d82220c6fd97643169cb92788898a189 30-32bit_fix.patch.noauto
2eebc4501d40edf92c5302b25dea554807caba6abd22a3569d708db8a057085d74a3ecdac2adab54edb0619cf3d74884e1d44ef95d991a069dd473279819b974 30-cypress.patch.noauto
@@ -559,6 +568,5 @@ abb3cab9c01cc3d6d42a9858678059a8c9c43bda2649bf97b489fdc205eb10ae27f9fb7302062e0f
624ff72debfb698d681b187c99da9e927c6e4f5df7bc741b7dd196a9ee20773ac8a0f103314983faa29b934e6753407a02abfec2553feb1c3e1fcf20772cb1d9 44-cmake-buildtype.patch
f89c913a53e2806c59508d26f5dc72abb428c7e4e3b7c1aeb6eaf92744ea9a13cac2f00a2ac90f91ad7682f66d876a5fffedd10feeceecd71a944793581da443 44-staticcast.patch
85d0009b0d1442af81d115402cdbd17667d85314030e1748a4656c1ee798b02efdcff41ccb374a6b63f7bf012bf1756b61e75c5d2b6399c329a6e62024ad0011 44-node_modules.patch
-013d94202e579bd07cc0824c32356b20b477a6076858dcec59b65fd8b58b7f240811bda28940e99aa712196bb24a5a4e41c4f837f5dd22b14ae4415f65681cfc 44-npm.patch
b95ec157f9c77177afd3deb8e3485bb5f10e1b634a15617d14e09b08d6680d32201ecb249ea5ea98127a312e1fdb22fdbe9f0216690291a2849419aa7ab81610 44-missing-include.patch
"