summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBazaah2023-12-31 19:43:33 +0000
committerBazaah2023-12-31 19:43:33 +0000
commitbb264d04efc66e5bd290440c83004087be5ad116 (patch)
tree6094c98cf7b54009ff43ff98fbd69c2dbae8598d
parent1a580903dc8515498ec8c1ab0be21e434d15376a (diff)
downloadaur-bb264d04efc66e5bd290440c83004087be5ad116.tar.gz
repo: rm ceph-17.2.6-mgr-dashboard-node-version.patch
No longer needed, the upstream as upped their nodejs version. References: https://github.com/ceph/ceph/pull/52828 Upstream-Ref: https://github.com/ceph/ceph/commit/47f49e5b1ae2e5bf7aad5df23d877ae5df00210c
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
-rw-r--r--ceph-17.2.6-mgr-dashboard-node-version.patch13
3 files changed, 0 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bb05696de9c0..6821ba30ba3e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -93,7 +93,6 @@ pkgbase = ceph
source = ceph-17.2.4-pybind-unmock-cythonize.patch
source = ceph-17.2.5-fix-iterator-depreciations.patch
source = ceph-17.2.5-rgw-client-boost-string-view.patch
- source = ceph-17.2.6-mgr-dashboard-node-version.patch
source = ceph-17.2.6-mgr-dashboard-cherrypy-18.patch
source = ceph-17.2.6-mgr-dashboard-pylint-217.patch
source = ceph-17.2.6-cython-fixes.patch
@@ -112,7 +111,6 @@ pkgbase = ceph
sha512sums = 781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf
sha512sums = 612faebfb5eec3651832f349ea3c23b50d2386889ff77592b0acff653049efdc5c2254f63c30d88b9a730813bf1f1945dda0d0beab0db7db3e0708ba8d057a40
sha512sums = 02ca1a9bf15f9cd6f474f264ba2bf66ae725bac990a7cac315dabe377c66935a7afd8117f18a1f82c78bdf9ab2c3e5a2a227f2ffc166974dd7bb99b290f1f233
- sha512sums = d9729c33f2b8c03ab918919e3b62cbc0825314ad09596dc12984ac5964f8b421db3376b84fa26e0952e0781deb218f8aff6ba32f9c8e5a22bd27afac8dcaf6d3
sha512sums = 79be1630ae4a599509e5d789d4aefe412ce47e67ad482f853664fa4b01e063c20593e3da668e6a776ad038fb07606ae948eea41bab20776c33c87f9ab49505e0
sha512sums = c767a8e6fd02ea2ab88e99b50b206d0f825acdf177136ded38d93594fc7663b7c9612af7195b85e0b2b501d8ee482af5e088e9abb5ebee7b8a69e0153ce89782
sha512sums = 0c5124693bd317a73707dfd34b17664cc05233aec08e07739fe08fc9a73be7a1f4446052b1addde832cba141a382c35f45e60c89a00bb7dab81cee7ed6be07e1
diff --git a/PKGBUILD b/PKGBUILD
index 7f9d3dff46e6..f38b4ebbd4b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -88,9 +88,6 @@ source=(
# https://github.com/boostorg/beast/issues/2594
'ceph-17.2.5-rgw-client-boost-string-view.patch'
- # Fixes node-gyp errors due to py3.11 incompatibilities
- 'ceph-17.2.6-mgr-dashboard-node-version.patch'
-
# Fixes inspect.getargspec errors due to removal in py3.11
'ceph-17.2.6-mgr-dashboard-cherrypy-18.patch'
@@ -123,7 +120,6 @@ sha512sums=('fe6a3ca4227cc05b5effc33a02670c466583ec9e4c7c025241248223992254e6e65
'781a01e622a70d56bf1948bdc0b427ffa95a86cec7dd9d26c6007a9ec024a942a8ca55f2acc3d37344862f1d6bf11cae998d8071754cd841a66bfba4ec9c58bf'
'612faebfb5eec3651832f349ea3c23b50d2386889ff77592b0acff653049efdc5c2254f63c30d88b9a730813bf1f1945dda0d0beab0db7db3e0708ba8d057a40'
'02ca1a9bf15f9cd6f474f264ba2bf66ae725bac990a7cac315dabe377c66935a7afd8117f18a1f82c78bdf9ab2c3e5a2a227f2ffc166974dd7bb99b290f1f233'
- 'd9729c33f2b8c03ab918919e3b62cbc0825314ad09596dc12984ac5964f8b421db3376b84fa26e0952e0781deb218f8aff6ba32f9c8e5a22bd27afac8dcaf6d3'
'79be1630ae4a599509e5d789d4aefe412ce47e67ad482f853664fa4b01e063c20593e3da668e6a776ad038fb07606ae948eea41bab20776c33c87f9ab49505e0'
'c767a8e6fd02ea2ab88e99b50b206d0f825acdf177136ded38d93594fc7663b7c9612af7195b85e0b2b501d8ee482af5e088e9abb5ebee7b8a69e0153ce89782'
'0c5124693bd317a73707dfd34b17664cc05233aec08e07739fe08fc9a73be7a1f4446052b1addde832cba141a382c35f45e60c89a00bb7dab81cee7ed6be07e1'
diff --git a/ceph-17.2.6-mgr-dashboard-node-version.patch b/ceph-17.2.6-mgr-dashboard-node-version.patch
deleted file mode 100644
index b2db11e5b544..000000000000
--- a/ceph-17.2.6-mgr-dashboard-node-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
-index 4fd2130b93a..7df5de57c66 100644
---- a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
-+++ b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt
-@@ -63,7 +63,7 @@ else(WITH_SYSTEM_NPM)
- OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
-- COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=14.15.1
-+ COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=16.15.0
- COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "dashboard nodeenv is being installed")