From d2cfa7fac8cecb8f843d83fb896795b7bbe86641 Mon Sep 17 00:00:00 2001 From: "sakib.sajal@windriver.com" Date: Fri, 18 Nov 2022 14:40:20 -0500 Subject: ceph: support python 3.11 python3 has been upgraded to 3.11 in oe-core causing ceph do_configure to fail with the error: | Could NOT find Python3 (missing: Python3_LIBRARY Python3_INCLUDE_DIR | Development) (found suitable version "3.6.9", minimum required is "3") Support python 3.11 to fix the issue Upstream-Status: sent to upstream (https://github.com/ceph/ceph/pull/48947) Signed-off-by: Sakib Sajal Signed-off-by: Bruce Ashfield --- .../0001-cmake-add-support-for-python3.10.patch | 34 ---------------------- .../0001-cmake-add-support-for-python3.11.patch | 34 ++++++++++++++++++++++ recipes-extended/ceph/ceph_15.2.15.bb | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.10.patch create mode 100644 recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.11.patch diff --git a/recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.10.patch b/recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.10.patch deleted file mode 100644 index 94c4b8a6..00000000 --- a/recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.10.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1060f2e4362ebd6db23870d442dcd158d219ee92 Mon Sep 17 00:00:00 2001 -From: Yanfei Xu -Date: Tue, 10 Nov 2020 17:17:30 +0800 -Subject: [PATCH] cmake: add support for python 3.9 and 3.10 - -add support for python3.9. - -Signed-off-by: Yanfei Xu - -Add support for python 3.10. - -Upstream-Status: Submitted [https://github.com/ceph/ceph/pull/43630] - -Signed-off-by: Kai Kang ---- - cmake/modules/FindPython/Support.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/FindPython/Support.cmake b/cmake/modules/FindPython/Support.cmake -index 6584699b79..c05bbe3306 100644 ---- a/cmake/modules/FindPython/Support.cmake -+++ b/cmake/modules/FindPython/Support.cmake -@@ -17,7 +17,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) - message (FATAL_ERROR "FindPython: INTERNAL ERROR") - endif() - if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3) -- set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+ 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) - elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2) - set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) - else() --- -2.18.2 - 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 new file mode 100644 index 00000000..c0b718a2 --- /dev/null +++ b/recipes-extended/ceph/ceph/0001-cmake-add-support-for-python3.11.patch @@ -0,0 +1,34 @@ +From 1060f2e4362ebd6db23870d442dcd158d219ee92 Mon Sep 17 00:00:00 2001 +From: Yanfei Xu +Date: Tue, 10 Nov 2020 17:17:30 +0800 +Subject: [PATCH] cmake: add support for python 3.9 and 3.10 + +add support for python3.9. + +Signed-off-by: Yanfei Xu + +Add support for python 3.10. + +Upstream-Status: Submitted [https://github.com/ceph/ceph/pull/43630] + +Signed-off-by: Kai Kang +--- + cmake/modules/FindPython/Support.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPython/Support.cmake b/cmake/modules/FindPython/Support.cmake +index 6584699b79..c05bbe3306 100644 +--- a/cmake/modules/FindPython/Support.cmake ++++ b/cmake/modules/FindPython/Support.cmake +@@ -17,7 +17,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) + message (FATAL_ERROR "FindPython: INTERNAL ERROR") + endif() + if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3) +- set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++ 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) + elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2) + set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) + else() +-- +2.18.2 + diff --git a/recipes-extended/ceph/ceph_15.2.15.bb b/recipes-extended/ceph/ceph_15.2.15.bb index 14b4c978..6312fd31 100644 --- a/recipes-extended/ceph/ceph_15.2.15.bb +++ b/recipes-extended/ceph/ceph_15.2.15.bb @@ -12,7 +12,7 @@ SRC_URI = "http://download.ceph.com/tarballs/ceph-${PV}.tar.gz \ file://0001-ceph-fix-build-errors-for-cross-compile.patch \ file://0001-fix-host-library-paths-were-used.patch \ file://ceph.conf \ - file://0001-cmake-add-support-for-python3.10.patch \ + file://0001-cmake-add-support-for-python3.11.patch \ file://0001-SnappyCompressor.h-fix-snappy-compiler-error.patch \ file://0001-buffer.h-add-missing-header-file-due-to-gcc-upgrade.patch \ file://0002-common-fix-FTBFS-due-to-dout-need_dynamic-on-GCC-12.patch \ -- cgit v1.2.3-54-g00ecf