diff options
author | Patrick McLean <patrick.mclean@sony.com> | 2019-06-12 18:48:04 -0700 |
---|---|---|
committer | Patrick McLean <chutzpah@gentoo.org> | 2019-06-12 18:48:04 -0700 |
commit | 952b32d755ca4b2d84fc6ec8316dbe0a5eaa0557 (patch) | |
tree | ef6cd988e6de34c6a9c3c0504c2ec3f6973b8a7d /sys-cluster/ceph/files | |
parent | app-crypt/jitterentropy: remove old (diff) | |
download | gentoo-952b32d755ca4b2d84fc6ec8316dbe0a5eaa0557.tar.gz gentoo-952b32d755ca4b2d84fc6ec8316dbe0a5eaa0557.tar.bz2 gentoo-952b32d755ca4b2d84fc6ec8316dbe0a5eaa0557.zip |
sys-cluster/ceph: Version bump to 13.2.6
Add -DMGR_PYTHON_VERSION (bug #687946)
Bug: https://bugs.gentoo.org/687946
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'sys-cluster/ceph/files')
-rw-r--r-- | sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch | 14 | ||||
-rw-r--r-- | sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch | 74 |
2 files changed, 88 insertions, 0 deletions
diff --git a/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch b/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch new file mode 100644 index 000000000000..c5d048eb7a2e --- /dev/null +++ b/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch @@ -0,0 +1,14 @@ +diff --git a/src/spdk/dpdk/lib/librte_net/rte_ether.h b/src/spdk/dpdk/lib/librte_net/rte_ether.h +index 3a87ff184..8090b7c01 100644 +--- a/src/spdk/dpdk/lib/librte_net/rte_ether.h ++++ b/src/spdk/dpdk/lib/librte_net/rte_ether.h +@@ -55,7 +55,8 @@ extern "C" { + * See http://standards.ieee.org/regauth/groupmac/tutorial.html + */ + struct ether_addr { +- uint8_t addr_bytes[ETHER_ADDR_LEN]; /**< Addr bytes in tx order */ ++ /** Addr bytes in tx order */ ++ uint8_t addr_bytes[ETHER_ADDR_LEN] __rte_aligned(2); + } __attribute__((__packed__)); + + #define ETHER_LOCAL_ADMIN_ADDR 0x02 /**< Locally assigned Eth. address. */ diff --git a/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch new file mode 100644 index 000000000000..ad38799b6901 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch @@ -0,0 +1,74 @@ +diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt +index 6e5946b784..233cccfc9b 100644 +--- a/src/ceph-detect-init/CMakeLists.txt ++++ b/src/ceph-detect-init/CMakeLists.txt +@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua + + add_custom_target(ceph-detect-init + COMMAND +- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} && +- ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e . ++ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} && ++ #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e . + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init + COMMENT "ceph-detect-init is being created") + add_dependencies(tests ceph-detect-init) +diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt +index 00aaec4a80..b0700c488f 100644 +--- a/src/ceph-disk/CMakeLists.txt ++++ b/src/ceph-disk/CMakeLists.txt +@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv) + + add_custom_target(ceph-disk + COMMAND +- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} && +- ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e . ++ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} && ++ #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e . + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk + COMMENT "ceph-disk is being created") + add_dependencies(tests ceph-disk) +diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt +index 88ca8a60bb..77c716cdb1 100644 +--- a/src/pybind/mgr/dashboard/CMakeLists.txt ++++ b/src/pybind/mgr/dashboard/CMakeLists.txt +@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) + + add_custom_target(mgr-dashboard-test-venv + COMMAND +- ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} ++ #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard + COMMENT "dashboard tests virtualenv is being created") + add_dependencies(tests mgr-dashboard-test-venv) +@@ -13,9 +13,6 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env) + + add_custom_command( + OUTPUT "${mgr-dashboard-nodeenv}/bin/npm" +- COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv} +- COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv +- COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 10.13.0 + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "dashboard nodeenv is being installed" + ) +@@ -27,7 +24,6 @@ add_custom_target(mgr-dashboard-nodeenv + + add_custom_command( + OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules" +- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm ci && deactivate + DEPENDS frontend/package.json + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend + COMMENT "dashboard frontend dependencies are being installed" +@@ -62,9 +58,11 @@ else() + set(npm_command npm run build) + endif() + ++LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin) ++ + add_custom_command( + OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist" +- COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate ++ COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command} + DEPENDS ${frontend_src} frontend/node_modules + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend + COMMENT "dashboard frontend is being created" |