diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2024-03-14 01:08:58 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-03-15 17:17:20 +0000 |
commit | 21b439042b2e3d715e21f6777127f2ee6f58ea95 (patch) | |
tree | 42762b071ef0e02c0cba635df4a729c9d72dcb3d /recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.11.patch | |
parent | 3e1ee1fda758885c17be7d4d45f514d370b1b92b (diff) | |
download | meta-virtualization-21b439042b2e3d715e21f6777127f2ee6f58ea95.tar.gz |
ceph: fix do_compile/do_install failures
1. OECMAKE_C/CXX_COMPILER needs to have sysroot setting in it, because
ceph's cmake files are using it to construct PY_CC. Without it, files
such as stdlib.h cannot be found.
2. re2 is added to deps. Seems no way to disable it.
3. 0001-ceph-fix-build-errors-for-cross-compile.patch is dropped. It's useless
and problematic for new version.
4. 0001-cmake-add-support-for-python3.11.patch is dropped as it's not needed anymore.
5. 0001-avoid-to_string-error.patch is added to fix build error, maybe caused by
boost version incompatibility.
6. Some cleanups.
7. A few more options are set.
8. BUILD_DOC=1 is exported so that check_sanity() causes compilation error.
This is a workaround and may need further visit in the future.
9. Delete the conditional check for /etc/debian_version which adds '--install-layout deb'
and causes the following error.
error: option --install-layout not recognized
The patch is 0001-delete-install-layout-deb.patch.
10. ceph-volume[-systemd] are now in sbin.
11. cephfs-mirror units are added to avoid package QA issue.
12. cephfs-top is seded to fix incorrect shebang.
13. Ensure libcephsqlite.so is packaged into ceph instead of ceph-dev.
14. Add bash to RDEPENDS as rbdmap needs it.
15. Skip buildpaths QA.
16. Add ceph user/group, because ceph-crash needs it in drop_privilege function call.
17. Patch the build.py which creates the cephadm zipapp to ensure it uses the correct interpreter.
We cannot simply use 'sed' against the cephadm as it's zip format.
Runtime tests:
cephfs-top --help
cephadm --help
systemctl status rbdmap
systemctl --failed
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.11.patch')
-rw-r--r-- | recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.11.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.11.patch b/recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.11.patch deleted file mode 100644 index c72c91b2..00000000 --- a/recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.11.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 1060f2e4362ebd6db23870d442dcd158d219ee92 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yanfei Xu <yanfei.xu@windriver.com> | ||
3 | Date: Tue, 10 Nov 2020 17:17:30 +0800 | ||
4 | Subject: [PATCH] cmake: add support for python 3.9 and 3.10 | ||
5 | |||
6 | add support for python3.9. | ||
7 | |||
8 | Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com> | ||
9 | |||
10 | Add support for python 3.10. | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/ceph/ceph/pull/43630] | ||
13 | |||
14 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
15 | --- | ||
16 | cmake/modules/FindPython/Support.cmake | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | Index: ceph-18.2.0/cmake/modules/FindPython/Support.cmake | ||
20 | =================================================================== | ||
21 | --- ceph-18.2.0.orig/cmake/modules/FindPython/Support.cmake | ||
22 | +++ ceph-18.2.0/cmake/modules/FindPython/Support.cmake | ||
23 | @@ -17,7 +17,7 @@ | ||
24 | message (FATAL_ERROR "FindPython: INTERNAL ERROR") | ||
25 | endif() | ||
26 | if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3) | ||
27 | - set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) | ||
28 | + set(_${_PYTHON_PREFIX}_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) | ||
29 | elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2) | ||
30 | set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) | ||
31 | else() | ||