summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2019-03-13 18:06:41 +0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-03-17 00:18:31 +0000
commited9045b143d7ff07858f4701598d1cf782c40f75 (patch)
treea111c7a7eee664e0f6d58d88ce4b8856c2f80e37
parent2a44defc697cdf16521e5c11e894bd93c926f059 (diff)
downloadmeta-virtualization-ed9045b143d7ff07858f4701598d1cf782c40f75.tar.gz
ceph: upgrade to 14.1.0
1. set the cross compile sysroot to find the rocksdb library 2. correct the install path for library in Distutils.cmake Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat
-rw-r--r--recipes-extended/ceph/ceph/0001-Correct-the-path-to-find-version.h-in-rocksdb.patch40
-rw-r--r--recipes-extended/ceph/ceph/0001-ceph-add-pybind-support-in-OE.patch129
-rw-r--r--recipes-extended/ceph/ceph/0001-ceph-detect-init-correct-the-installation-for-OE.patch36
-rw-r--r--recipes-extended/ceph/ceph/0001-ceph-fix-build-errors-for-cross-compile.patch188
-rw-r--r--recipes-extended/ceph/ceph/0001-zstd-fix-error-for-cross-compile.patch26
-rw-r--r--recipes-extended/ceph/ceph_14.1.0.bb (renamed from recipes-extended/ceph/ceph_13.2.2.bb)22
6 files changed, 199 insertions, 242 deletions
diff --git a/recipes-extended/ceph/ceph/0001-Correct-the-path-to-find-version.h-in-rocksdb.patch b/recipes-extended/ceph/ceph/0001-Correct-the-path-to-find-version.h-in-rocksdb.patch
deleted file mode 100644
index 788505b2..00000000
--- a/recipes-extended/ceph/ceph/0001-Correct-the-path-to-find-version.h-in-rocksdb.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From a53605694d5301b7bb543464b17f74bbbd35d372 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Tue, 28 Aug 2018 10:04:40 +0800
4Subject: [PATCH] Correct the path to find version.h in rocksdb
5
6Signed-off-by: Dengke Du <dengke.du@windriver.com>
7---
8 cmake/modules/Findrocksdb.cmake | 10 +++++-----
9 1 file changed, 5 insertions(+), 5 deletions(-)
10
11diff --git a/cmake/modules/Findrocksdb.cmake b/cmake/modules/Findrocksdb.cmake
12index f8369f7..36b67ea 100644
13--- a/cmake/modules/Findrocksdb.cmake
14+++ b/cmake/modules/Findrocksdb.cmake
15@@ -9,17 +9,17 @@
16 # ROCKSDB_VERSION_MINOR
17 # ROCKSDB_VERSION_PATCH
18
19-find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h)
20+find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h ${CMAKE_SYSROOT})
21
22-find_library(ROCKSDB_LIBRARIES rocksdb)
23+find_library(ROCKSDB_LIBRARIES rocksdb ${CMAKE_SYSROOT})
24
25 if(ROCKSDB_INCLUDE_DIR AND EXISTS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h")
26 foreach(ver "MAJOR" "MINOR" "PATCH")
27- file(STRINGS "${ROCKSDB_INCLUDE_DIR}/version.h" ROCKSDB_VER_${ver}_LINE
28+ file(STRINGS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h" ROCKSDB_VER_${ver}_LINE
29 REGEX "^#define[ \t]+ROCKSDB_${ver}[ \t]+[0-9]+$")
30 string(REGEX REPLACE "^#define[ \t]+ROCKSDB_${ver}[ \t]+([0-9]+)$"
31- "\\1" ROCKSDB_VERSION_${ver} "${ROCKDB_VER_${ver}_LINE}")
32- unset(${ROCKDB_VER_${ver}_LINE})
33+ "\\1" ROCKSDB_VERSION_${ver} "${ROCKSDB_VER_${ver}_LINE}")
34+ unset(ROCKSDB_VER_${ver}_LINE)
35 endforeach()
36 set(ROCKSDB_VERSION_STRING
37 "${ROCKSDB_VERSION_MAJOR}.${ROCKSDB_VERSION_MINOR}.${ROCKSDB_VERSION_PATCH}")
38--
392.7.4
40
diff --git a/recipes-extended/ceph/ceph/0001-ceph-add-pybind-support-in-OE.patch b/recipes-extended/ceph/ceph/0001-ceph-add-pybind-support-in-OE.patch
deleted file mode 100644
index f9c53406..00000000
--- a/recipes-extended/ceph/ceph/0001-ceph-add-pybind-support-in-OE.patch
+++ /dev/null
@@ -1,129 +0,0 @@
1From 00d44940c2e83bf73101a05d2aa8f88c2e2fca58 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Tue, 23 Oct 2018 15:34:53 +0800
4Subject: [PATCH] ceph: add pybind support in OE
5
61. add sysroot to CFLAGS when cross compiling pybind
72. change the pybind's INSTALL path to OE's INSTALL path
83. delete the check for header files, because the check method using
9 host compiler.
10
11Signed-off-by: Dengke Du <dengke.du@windriver.com>
12Upstream-Status: Inappropriate [oe specific]
13---
14 cmake/modules/Distutils.cmake | 12 +++---------
15 src/pybind/cephfs/setup.py | 8 --------
16 src/pybind/rados/setup.py | 8 --------
17 src/pybind/rbd/setup.py | 8 --------
18 src/pybind/rgw/setup.py | 8 --------
19 5 files changed, 3 insertions(+), 41 deletions(-)
20
21diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
22index d6e9f38..3091d97 100644
23--- a/cmake/modules/Distutils.cmake
24+++ b/cmake/modules/Distutils.cmake
25@@ -47,7 +47,7 @@ function(distutils_add_cython_module name src)
26 LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
27 CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
28 CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
29- CFLAGS=\"-iquote${CMAKE_SOURCE_DIR}/src/include -w\"
30+ CFLAGS=\"-iquote${CMAKE_SOURCE_DIR}/src/include -w --sysroot=${CMAKE_SYSROOT}\"
31 ${PYTHON${PYTHON_VERSION}_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
32 build --verbose --build-base ${CYTHON_MODULE_DIR}
33 --build-platlib ${CYTHON_MODULE_DIR}/lib.${PYTHON${PYTHON_VERSION}_VERSION_MAJOR}
34@@ -69,14 +69,8 @@ function(distutils_install_cython_module name)
35 set(ENV{CEPH_LIBDIR} \"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\")
36
37 set(options --prefix=${CMAKE_INSTALL_PREFIX})
38- if(DEFINED ENV{DESTDIR})
39- if(EXISTS /etc/debian_version)
40- list(APPEND options --install-layout=deb)
41- endif()
42- list(APPEND options --root=\$ENV{DESTDIR})
43- else()
44- list(APPEND options --root=/)
45- endif()
46+ list(APPEND options --root=${CMAKE_DESTDIR})
47+ list(APPEND options --install-lib=${PYTHON_SITEPACKAGES_DIR})
48 execute_process(
49 COMMAND
50 ${PYTHON${PYTHON_VERSION}_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
51diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py
52index 6533f41..1ee4a59 100755
53--- a/src/pybind/cephfs/setup.py
54+++ b/src/pybind/cephfs/setup.py
55@@ -121,14 +121,6 @@ def check_sanity():
56 finally:
57 shutil.rmtree(tmp_dir)
58
59-
60-if 'BUILD_DOC' in os.environ.keys():
61- pass
62-elif check_sanity():
63- pass
64-else:
65- sys.exit(1)
66-
67 cmdclass = {}
68 try:
69 from Cython.Build import cythonize
70diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py
71index ef7c307..5204017 100755
72--- a/src/pybind/rados/setup.py
73+++ b/src/pybind/rados/setup.py
74@@ -117,14 +117,6 @@ def check_sanity():
75 finally:
76 shutil.rmtree(tmp_dir)
77
78-
79-if 'BUILD_DOC' in os.environ.keys():
80- pass
81-elif check_sanity():
82- pass
83-else:
84- sys.exit(1)
85-
86 cmdclass = {}
87 try:
88 from Cython.Build import cythonize
89diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py
90index bcf96f2..d4cbbeb 100755
91--- a/src/pybind/rbd/setup.py
92+++ b/src/pybind/rbd/setup.py
93@@ -120,14 +120,6 @@ def check_sanity():
94 finally:
95 shutil.rmtree(tmp_dir)
96
97-
98-if 'BUILD_DOC' in os.environ.keys():
99- pass
100-elif check_sanity():
101- pass
102-else:
103- sys.exit(1)
104-
105 cmdclass = {}
106 try:
107 from Cython.Build import cythonize
108diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py
109index f14f30c..ee7570b 100755
110--- a/src/pybind/rgw/setup.py
111+++ b/src/pybind/rgw/setup.py
112@@ -120,14 +120,6 @@ def check_sanity():
113 finally:
114 shutil.rmtree(tmp_dir)
115
116-
117-if 'BUILD_DOC' in os.environ.keys():
118- pass
119-elif check_sanity():
120- pass
121-else:
122- sys.exit(1)
123-
124 cmdclass = {}
125 try:
126 from Cython.Build import cythonize
127--
1282.7.4
129
diff --git a/recipes-extended/ceph/ceph/0001-ceph-detect-init-correct-the-installation-for-OE.patch b/recipes-extended/ceph/ceph/0001-ceph-detect-init-correct-the-installation-for-OE.patch
deleted file mode 100644
index 875501bf..00000000
--- a/recipes-extended/ceph/ceph/0001-ceph-detect-init-correct-the-installation-for-OE.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 6aaf04036f0affbeddda123bff111990c4d5fd72 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Fri, 26 Oct 2018 14:31:10 +0800
4Subject: [PATCH] ceph-detect-init: correct the installation for OE
5
6Signed-off-by: Dengke Du <dengke.du@windriver.com>
7Upstream-Status: Inappropriate [oe specific]
8---
9 cmake/modules/Distutils.cmake | 11 ++---------
10 1 file changed, 2 insertions(+), 9 deletions(-)
11
12diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
13index 3091d97..c50fe77 100644
14--- a/cmake/modules/Distutils.cmake
15+++ b/cmake/modules/Distutils.cmake
16@@ -16,15 +16,8 @@ function(distutils_install_module name)
17 cmake_parse_arguments(DU "" INSTALL_SCRIPT "" ${ARGN})
18 install(CODE "
19 set(options --prefix=${CMAKE_INSTALL_PREFIX})
20- if(DEFINED ENV{DESTDIR})
21- if(EXISTS /etc/debian_version)
22- list(APPEND options --install-layout=deb)
23- endif()
24- list(APPEND options --root=\$ENV{DESTDIR})
25- if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
26- list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
27- endif()
28- endif()
29+ list(APPEND options --root=${CMAKE_DESTDIR})
30+ list(APPEND options --install-lib=${PYTHON_SITEPACKAGES_DIR})
31 execute_process(
32 COMMAND ${PYTHON${PYTHON_VERSION}_EXECUTABLE}
33 setup.py install \${options}
34--
352.7.4
36
diff --git a/recipes-extended/ceph/ceph/0001-ceph-fix-build-errors-for-cross-compile.patch b/recipes-extended/ceph/ceph/0001-ceph-fix-build-errors-for-cross-compile.patch
new file mode 100644
index 00000000..1e23cc1d
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0001-ceph-fix-build-errors-for-cross-compile.patch
@@ -0,0 +1,188 @@
1From 20dd3fb9e5daa780e15113a2c88f846c8f5dd904 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Mon, 11 Mar 2019 09:14:09 +0800
4Subject: [PATCH] ceph: fix build errors for cross compile
5
61. set the cross compile sysroot to find the rocksdb library
72. correct the install path for library in Distutils.cmake
8
9Upstream-Status: Inappropriate [oe specific]
10
11Signed-off-by: Dengke Du <dengke.du@windriver.com>
12---
13 cmake/modules/Distutils.cmake | 25 +++++--------------------
14 cmake/modules/FindRocksDB.cmake | 6 +++---
15 src/compressor/zstd/CMakeLists.txt | 2 +-
16 src/pybind/cephfs/setup.py | 8 --------
17 src/pybind/rados/setup.py | 8 --------
18 src/pybind/rbd/setup.py | 8 --------
19 src/pybind/rgw/setup.py | 8 --------
20 7 files changed, 9 insertions(+), 56 deletions(-)
21
22diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
23index 5697dff..de3cd57 100644
24--- a/cmake/modules/Distutils.cmake
25+++ b/cmake/modules/Distutils.cmake
26@@ -16,17 +16,8 @@ function(distutils_install_module name)
27 cmake_parse_arguments(DU "" INSTALL_SCRIPT "" ${ARGN})
28 install(CODE "
29 set(options --prefix=${CMAKE_INSTALL_PREFIX})
30- if(DEFINED ENV{DESTDIR})
31- if(EXISTS /etc/debian_version)
32- list(APPEND options --install-layout=deb)
33- endif()
34- list(APPEND options
35- --root=\$ENV{DESTDIR}
36- --single-version-externally-managed)
37- if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
38- list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
39- endif()
40- endif()
41+ list(APPEND options --root=${CMAKE_DESTDIR})
42+ list(APPEND options --install-lib=${PYTHON_SITEPACKAGES_DIR})
43 execute_process(
44 COMMAND ${PYTHON${PYTHON_VERSION}_EXECUTABLE}
45 setup.py install \${options}
46@@ -48,7 +39,7 @@ function(distutils_add_cython_module name src)
47 # Note: no quotes, otherwise distutils will execute "/usr/bin/ccache gcc"
48 # CMake's implicit conversion between strings and lists is wonderful, isn't it?
49 string(REPLACE " " ";" cflags ${CMAKE_C_FLAGS})
50- list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w)
51+ list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w --sysroot=${CMAKE_SYSROOT})
52 # This little bit of magic wipes out __Pyx_check_single_interpreter()
53 list(APPEND cflags -D'void0=dead_function\(void\)')
54 list(APPEND cflags -D'__Pyx_check_single_interpreter\(ARG\)=ARG \#\# 0')
55@@ -86,14 +77,8 @@ function(distutils_install_cython_module name)
56 set(ENV{CEPH_LIBDIR} \"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\")
57
58 set(options --prefix=${CMAKE_INSTALL_PREFIX})
59- if(DEFINED ENV{DESTDIR})
60- if(EXISTS /etc/debian_version)
61- list(APPEND options --install-layout=deb)
62- endif()
63- list(APPEND options --root=\$ENV{DESTDIR})
64- else()
65- list(APPEND options --root=/)
66- endif()
67+ list(APPEND options --root=${CMAKE_DESTDIR})
68+ list(APPEND options --install-lib=${PYTHON_SITEPACKAGES_DIR})
69 execute_process(
70 COMMAND
71 ${PYTHON${PYTHON_VERSION}_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
72diff --git a/cmake/modules/FindRocksDB.cmake b/cmake/modules/FindRocksDB.cmake
73index 9818433..be38597 100644
74--- a/cmake/modules/FindRocksDB.cmake
75+++ b/cmake/modules/FindRocksDB.cmake
76@@ -9,9 +9,9 @@
77 # ROCKSDB_VERSION_MINOR
78 # ROCKSDB_VERSION_PATCH
79
80-find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h)
81+find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h ${CMAKE_SYSROOT})
82
83-find_library(ROCKSDB_LIBRARIES rocksdb)
84+find_library(ROCKSDB_LIBRARIES rocksdb ${CMAKE_SYSROOT})
85
86 if(ROCKSDB_INCLUDE_DIR AND EXISTS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h")
87 foreach(ver "MAJOR" "MINOR" "PATCH")
88@@ -40,7 +40,7 @@ if(RocksDB_FOUND)
89 set_target_properties(RocksDB::RocksDB PROPERTIES
90 INTERFACE_INCLUDE_DIRECTORIES "${ROCKSDB_INCLUDE_DIR}"
91 IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
92- IMPORTED_LOCATION "${ROCKSDB_LIBRARY}"
93+ IMPORTED_LOCATION "${ROCKSDB_LIBRARIES}"
94 VERSION "${ROCKSDB_VERSION_STRING}")
95 endif()
96 endif()
97diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt
98index 76709bb..95bba4a 100644
99--- a/src/compressor/zstd/CMakeLists.txt
100+++ b/src/compressor/zstd/CMakeLists.txt
101@@ -9,7 +9,7 @@ ExternalProject_Add(zstd_ext
102 CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
103 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
104 -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS}
105- -DCMAKE_AR=${CMAKE_AR}
106+ -DCMAKE_SYSROOT=${CMAKE_SYSROOT}
107 -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_SHARED}
108 BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd
109 BUILD_COMMAND $(MAKE) libzstd_static
110diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py
111index 1f95005..8a6d136 100755
112--- a/src/pybind/cephfs/setup.py
113+++ b/src/pybind/cephfs/setup.py
114@@ -142,14 +142,6 @@ def check_sanity():
115 finally:
116 shutil.rmtree(tmp_dir)
117
118-
119-if 'BUILD_DOC' in os.environ.keys():
120- pass
121-elif check_sanity():
122- pass
123-else:
124- sys.exit(1)
125-
126 cmdclass = {}
127 try:
128 from Cython.Build import cythonize
129diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py
130index 75081df..4d1591c 100755
131--- a/src/pybind/rados/setup.py
132+++ b/src/pybind/rados/setup.py
133@@ -138,14 +138,6 @@ def check_sanity():
134 finally:
135 shutil.rmtree(tmp_dir)
136
137-
138-if 'BUILD_DOC' in os.environ.keys():
139- pass
140-elif check_sanity():
141- pass
142-else:
143- sys.exit(1)
144-
145 cmdclass = {}
146 try:
147 from Cython.Build import cythonize
148diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py
149index 8dd5c12..b8f4d91 100755
150--- a/src/pybind/rbd/setup.py
151+++ b/src/pybind/rbd/setup.py
152@@ -141,14 +141,6 @@ def check_sanity():
153 finally:
154 shutil.rmtree(tmp_dir)
155
156-
157-if 'BUILD_DOC' in os.environ.keys():
158- pass
159-elif check_sanity():
160- pass
161-else:
162- sys.exit(1)
163-
164 cmdclass = {}
165 try:
166 from Cython.Build import cythonize
167diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py
168index 4ee4f49..91dc7d4 100755
169--- a/src/pybind/rgw/setup.py
170+++ b/src/pybind/rgw/setup.py
171@@ -143,14 +143,6 @@ def check_sanity():
172 finally:
173 shutil.rmtree(tmp_dir)
174
175-
176-if 'BUILD_DOC' in os.environ.keys():
177- pass
178-elif check_sanity():
179- pass
180-else:
181- sys.exit(1)
182-
183 cmdclass = {}
184 try:
185 from Cython.Build import cythonize
186--
1872.7.4
188
diff --git a/recipes-extended/ceph/ceph/0001-zstd-fix-error-for-cross-compile.patch b/recipes-extended/ceph/ceph/0001-zstd-fix-error-for-cross-compile.patch
deleted file mode 100644
index 66b5f0a5..00000000
--- a/recipes-extended/ceph/ceph/0001-zstd-fix-error-for-cross-compile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 3e86b6d9db2682b123839e38e9bf45060e2bb2ab Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Wed, 29 Aug 2018 16:57:52 +0800
4Subject: [PATCH] zstd: fix error for cross compile
5
6Signed-off-by: Dengke Du <dengke.du@windriver.com>
7---
8 src/compressor/zstd/CMakeLists.txt | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt
12index e30cb89..b298a3d 100644
13--- a/src/compressor/zstd/CMakeLists.txt
14+++ b/src/compressor/zstd/CMakeLists.txt
15@@ -9,7 +9,7 @@ ExternalProject_Add(zstd_ext
16 CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
17 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
18 -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS}
19- -DCMAKE_AR=${CMAKE_AR}
20+ -DCMAKE_SYSROOT=${CMAKE_SYSROOT}
21 BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd
22 BUILD_COMMAND $(MAKE) libzstd_static
23 INSTALL_COMMAND "true")
24--
252.7.4
26
diff --git a/recipes-extended/ceph/ceph_13.2.2.bb b/recipes-extended/ceph/ceph_14.1.0.bb
index 0cba08a5..0005d3b0 100644
--- a/recipes-extended/ceph/ceph_13.2.2.bb
+++ b/recipes-extended/ceph/ceph_14.1.0.bb
@@ -2,27 +2,24 @@ SUMMARY = "User space components of the Ceph file system"
2LICENSE = "LGPLv2.1 & GPLv2 & Apache-2.0 & MIT" 2LICENSE = "LGPLv2.1 & GPLv2 & Apache-2.0 & MIT"
3LIC_FILES_CHKSUM = "file://COPYING-LGPL2.1;md5=fbc093901857fcd118f065f900982c24 \ 3LIC_FILES_CHKSUM = "file://COPYING-LGPL2.1;md5=fbc093901857fcd118f065f900982c24 \
4 file://COPYING-GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 4 file://COPYING-GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
5 file://COPYING;md5=92d301c8fccd296f2221a68a8dd53828 \ 5 file://COPYING;md5=601c21a554d728c3038ca292b83b8af0 \
6" 6"
7inherit cmake pythonnative python-dir systemd 7inherit cmake pythonnative python-dir systemd
8# Disable python pybind support for ceph temporary, when corss compiling pybind, 8# Disable python pybind support for ceph temporary, when corss compiling pybind,
9# pybind mix cmake and python setup environment, would case a lot of errors. 9# pybind mix cmake and python setup environment, would case a lot of errors.
10 10
11SRC_URI = "http://download.ceph.com/tarballs/ceph-${PV}.tar.gz \ 11SRC_URI = "http://download.ceph.com/tarballs/ceph-${PV}.tar.gz \
12 file://0001-Correct-the-path-to-find-version.h-in-rocksdb.patch \ 12 file://0001-ceph-fix-build-errors-for-cross-compile.patch \
13 file://0001-zstd-fix-error-for-cross-compile.patch \
14 file://0001-ceph-add-pybind-support-in-OE.patch \
15 file://0001-ceph-detect-init-correct-the-installation-for-OE.patch \
16 file://ceph.conf \ 13 file://ceph.conf \
17" 14"
18SRC_URI[md5sum] = "ce118be451dcb6b89e9e0a45057827dd" 15SRC_URI[md5sum] = "67b53eeb0f241c3011e7f40925aa7e08"
19SRC_URI[sha256sum] = "f3a61db4c90e00c38a2dac7239b956ec367ef56f601e07335ed3011f931d8840" 16SRC_URI[sha256sum] = "9ef726d7e73ce4d9510ad899493258374f1b40ba20a26b72bbbedb0bfb6dffd8"
20 17
21DEPENDS = "boost bzip2 curl expat gperf-native \ 18DEPENDS = "boost bzip2 curl expat gperf-native \
22 keyutils libaio libibverbs lz4 \ 19 keyutils libaio libibverbs lz4 \
23 nspr nss \ 20 nspr nss \
24 oath openldap openssl \ 21 oath openldap openssl \
25 python python-cython-native rocksdb snappy udev \ 22 python python-cython-native rabbitmq-c rocksdb snappy udev \
26 valgrind xfsprogs zlib \ 23 valgrind xfsprogs zlib \
27" 24"
28SYSTEMD_SERVICE_${PN} = " \ 25SYSTEMD_SERVICE_${PN} = " \
@@ -32,7 +29,6 @@ SYSTEMD_SERVICE_${PN} = " \
32 ceph-mon.target \ 29 ceph-mon.target \
33 ceph-mds@.service \ 30 ceph-mds@.service \
34 ceph-mds.target \ 31 ceph-mds.target \
35 ceph-disk@.service \
36 ceph-osd@.service \ 32 ceph-osd@.service \
37 ceph-osd.target \ 33 ceph-osd.target \
38 ceph.target \ 34 ceph.target \
@@ -43,6 +39,7 @@ SYSTEMD_SERVICE_${PN} = " \
43 ceph-volume@.service \ 39 ceph-volume@.service \
44 ceph-mgr@.service \ 40 ceph-mgr@.service \
45 ceph-mgr.target \ 41 ceph-mgr.target \
42 ceph-crash.service \
46 rbdmap.service \ 43 rbdmap.service \
47" 44"
48OECMAKE_GENERATOR = "Unix Makefiles" 45OECMAKE_GENERATOR = "Unix Makefiles"
@@ -58,6 +55,8 @@ EXTRA_OECMAKE = "-DWITH_MANPAGE=OFF \
58 -DWITH_MGR_DASHBOARD_FRONTEND=OFF \ 55 -DWITH_MGR_DASHBOARD_FRONTEND=OFF \
59 -DWITH_SYSTEM_BOOST=ON \ 56 -DWITH_SYSTEM_BOOST=ON \
60 -DWITH_SYSTEM_ROCKSDB=ON \ 57 -DWITH_SYSTEM_ROCKSDB=ON \
58 -DWITH_RDMA=OFF \
59 -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
61" 60"
62 61
63do_configure_prepend () { 62do_configure_prepend () {
@@ -68,8 +67,9 @@ do_configure_prepend () {
68 67
69do_install_append () { 68do_install_append () {
70 sed -i -e 's:${WORKDIR}.*python2:${bindir}/python:' ${D}${bindir}/ceph 69 sed -i -e 's:${WORKDIR}.*python2:${bindir}/python:' ${D}${bindir}/ceph
71 sed -i -e 's:${WORKDIR}.*python2:${bindir}/python:' ${D}${bindir}/ceph-disk 70 sed -i -e 's:${WORKDIR}.*python2:${bindir}/python:' ${D}${bindir}/ceph-crash
72 sed -i -e 's:${WORKDIR}.*python2:${bindir}/python:' ${D}${bindir}/ceph-detect-init 71 sed -i -e 's:${WORKDIR}.*python2:${bindir}/python:' ${D}${bindir}/ceph-volume
72 sed -i -e 's:${WORKDIR}.*python2:${bindir}/python:' ${D}${bindir}/ceph-volume-systemd
73 find ${D} -name SOURCES.txt | xargs sed -i -e 's:${WORKDIR}::' 73 find ${D} -name SOURCES.txt | xargs sed -i -e 's:${WORKDIR}::'
74 install -d ${D}${sysconfdir}/ceph 74 install -d ${D}${sysconfdir}/ceph
75 install -m 644 ${WORKDIR}/ceph.conf ${D}${sysconfdir}/ceph/ 75 install -m 644 ${WORKDIR}/ceph.conf ${D}${sysconfdir}/ceph/
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-26 00:30:44 +0000