From 4e8568e32e516d87b5f24e4ec6e7af3a399fcb01 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 17 Jul 2024 19:43:16 +0000 Subject: ceph: build rocksdb, disable QAT, use bundled dependencies (no pip) By building rocksdb out of the tree, we can avoid incompatiblity issues in the API with a dependency. QAT doesn't build well, so disable it. Ensure that we are using our python dependencies otherwise pip will be run at build / package time. Signed-off-by: Bruce Ashfield --- recipes-extended/ceph/ceph_git.bb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'recipes-extended/ceph') diff --git a/recipes-extended/ceph/ceph_git.bb b/recipes-extended/ceph/ceph_git.bb index 56160393..c0b97e0e 100644 --- a/recipes-extended/ceph/ceph_git.bb +++ b/recipes-extended/ceph/ceph_git.bb @@ -15,7 +15,7 @@ SRC_URI = "gitsm://github.com/ceph/ceph.git;protocol=https;branch=main \ file://0001-cephadm-build.py-avoid-using-python3-from-sysroot-wh.patch \ " -SRCREV="c14e68e1617b77c40bcd5da7e689d626a851c900" +SRCREV="103cd8e78bcfe7f69647013187c053c9ccb76685" PV = "19.0.0+git" S = "${WORKDIR}/git" @@ -25,9 +25,9 @@ DEPENDS = "boost bzip2 curl cryptsetup expat gperf-native \ nspr nss ninja-native \ oath openldap openssl \ python3 python3-native python3-cython-native python3-pyyaml-native \ - rabbitmq-c rocksdb snappy thrift udev \ + rabbitmq-c snappy thrift udev \ valgrind xfsprogs zlib libgcc zstd re2 \ - lmdb \ + lmdb autoconf-native automake-native \ " @@ -74,7 +74,6 @@ EXTRA_OECMAKE += "-DWITH_MANPAGE=OFF \ -DWITH_MGR=OFF \ -DWITH_MGR_DASHBOARD_FRONTEND=OFF \ -DWITH_SYSTEM_BOOST=ON \ - -DWITH_SYSTEM_ROCKSDB=ON \ -DWITH_RDMA=OFF \ -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \ -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \ @@ -82,8 +81,11 @@ EXTRA_OECMAKE += "-DWITH_MANPAGE=OFF \ -DWITH_PYTHON3=3.12 \ -DPYTHON_DESIRED=3 \ -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${WORKDIR}/toolchain.cmake \ + -DCEPHADM_BUNDLED_DEPENDENCIES=none \ " +# -DWITH_SYSTEM_ROCKSDB=ON + do_configure:prepend () { echo "set( CMAKE_SYSROOT \"${RECIPE_SYSROOT}\" )" >> ${WORKDIR}/toolchain.cmake echo "set( CMAKE_DESTDIR \"${D}\" )" >> ${WORKDIR}/toolchain.cmake @@ -94,6 +96,9 @@ do_configure:prepend () { echo "set( WITH_QATDRV OFF )" >> ${WORKDIR}/toolchain.cmake echo "set( WITH_QATZIP OFF )" >> ${WORKDIR}/toolchain.cmake + echo "set( WITH_LIBURING OFF )" >> ${WORKDIR}/toolchain.cmake + echo "set( WITH_QATLIB OFF )" >> ${WORKDIR}/toolchain.cmake + # echo "set( WITH_SYSTEM_ROCKSDB TRUE )" >> ${WORKDIR}/toolchain.cmake } do_compile:prepend() { -- cgit v1.2.3-54-g00ecf