diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch index 68fd1ee3e0..98044877cd 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch @@ -1,4 +1,4 @@ -From 4952f03d150770ff06f9a12ff42d8de680407649 Mon Sep 17 00:00:00 2001 +From ff886f41c471a4b7d97a5a4473727a8b1d8ba2bb Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 19 Mar 2024 19:39:04 +0800 Subject: [PATCH] Do not use bundled packages @@ -9,27 +9,32 @@ xz, yaml-cpp and libxml2. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yi Zhao +[lz: When upgrading from 0.99.1 to 0.99.2: +adapted the patch for context changes; +added using external dependencies for pugixml.] +Signed-off-by: Li Zhou --- - CMakeLists.txt | 3 +-- - cmake/GetBZip2.cmake | 3 +++ - cmake/GetCatch2.cmake | 4 ++++ - cmake/GetCivetWeb.cmake | 3 +++ - cmake/GetFmt.cmake | 3 +++ - cmake/GetLibCURL.cmake | 3 +++ - cmake/GetLibXml2.cmake | 3 +++ - cmake/GetOpenSSL.cmake | 3 +++ - cmake/GetRocksDB.cmake | 4 ++++ - cmake/GetSpdlog.cmake | 4 ++++ - cmake/GetZLIB.cmake | 3 +++ - cmake/GetZstd.cmake | 4 ++++ - extensions/libarchive/CMakeLists.txt | 6 ++---- - 13 files changed, 40 insertions(+), 6 deletions(-) + CMakeLists.txt | 3 +-- + cmake/GetBZip2.cmake | 3 +++ + cmake/GetCatch2.cmake | 4 ++++ + cmake/GetCivetWeb.cmake | 3 +++ + cmake/GetFmt.cmake | 3 +++ + cmake/GetLibCURL.cmake | 3 +++ + cmake/GetLibXml2.cmake | 3 +++ + cmake/GetOpenSSL.cmake | 3 +++ + cmake/GetRocksDB.cmake | 4 ++++ + cmake/GetSpdlog.cmake | 4 ++++ + cmake/GetZLIB.cmake | 3 +++ + cmake/GetZstd.cmake | 4 ++++ + cmake/PugiXml.cmake | 20 ++++++++++++-------- + extensions/libarchive/CMakeLists.txt | 6 ++---- + 14 files changed, 52 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 50e31d871..fc1718dfd 100644 +index 5cf1c4e5f..36aee1508 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -265,8 +265,7 @@ include(GetSpdlog) +@@ -285,8 +285,7 @@ include(GetSpdlog) get_spdlog() # yaml-cpp @@ -106,13 +111,13 @@ index afd38f3c9..0eac59ec4 100644 endif() endfunction(get_curl SOURCE_DIR BINARY_DIR) diff --git a/cmake/GetLibXml2.cmake b/cmake/GetLibXml2.cmake -index 5915b117d..18048715d 100644 +index 2a6c618f6..093b57a4b 100644 --- a/cmake/GetLibXml2.cmake +++ b/cmake/GetLibXml2.cmake -@@ -23,5 +23,8 @@ function(get_libxml2 SOURCE_DIR BINARY_DIR) +@@ -22,5 +22,8 @@ function(get_libxml2 SOURCE_DIR BINARY_DIR) + elseif(MINIFI_LIBXML2_SOURCE STREQUAL "BUILD") message("Using CMake to build libxml2 from source") - include(BundledLibXml2) - use_bundled_libxml2(${SOURCE_DIR} ${BINARY_DIR}) + include(LibXml2) + elseif(MINIFI_LIBXML2_SOURCE STREQUAL "SYSTEM") + message("Using libxml2 provided by system") + find_package(libxml2 REQUIRED) @@ -146,10 +151,10 @@ index 0968afc38..3ca1fe565 100644 endif() endfunction(get_rocksdb SOURCE_DIR BINARY_DIR) diff --git a/cmake/GetSpdlog.cmake b/cmake/GetSpdlog.cmake -index 747894984..6255e31bf 100644 +index 9fe3b9c46..60f5c01d7 100644 --- a/cmake/GetSpdlog.cmake +++ b/cmake/GetSpdlog.cmake -@@ -27,5 +27,9 @@ function(get_spdlog) +@@ -32,5 +32,9 @@ function(get_spdlog) elseif(MINIFI_SPDLOG_SOURCE STREQUAL "BUILD") message("Using CMake to build spdlog from source") include(Spdlog) @@ -186,8 +191,37 @@ index a0334b02d..0e7600c22 100644 + add_library(zstd::zstd ALIAS zstd::libzstd_static) endif() endfunction(get_zstd) +diff --git a/cmake/PugiXml.cmake b/cmake/PugiXml.cmake +index ba5a4df38..7a1a72b9b 100644 +--- a/cmake/PugiXml.cmake ++++ b/cmake/PugiXml.cmake +@@ -15,12 +15,16 @@ + # specific language governing permissions and limitations + # under the License. + include(FetchContent) ++if(MINIFI_PUGIXML_SOURCE STREQUAL "SYSTEM") ++ message("Using pugixml provided by system") ++ find_package(PUGIXML REQUIRED) ++else() ++ set(PUGIXML_BUILD_TESTS OFF CACHE BOOL "" FORCE) + +-set(PUGIXML_BUILD_TESTS OFF CACHE BOOL "" FORCE) +- +-FetchContent_Declare( +- pugixml +- URL https://github.com/zeux/pugixml/archive/refs/tags/v1.15.tar.gz +- URL_HASH SHA256=b39647064d9e28297a34278bfb897092bf33b7c487906ddfc094c9e8868bddcb +-) +-FetchContent_MakeAvailable(pugixml) ++ FetchContent_Declare( ++ pugixml ++ URL https://github.com/zeux/pugixml/archive/refs/tags/v1.15.tar.gz ++ URL_HASH SHA256=b39647064d9e28297a34278bfb897092bf33b7c487906ddfc094c9e8868bddcb ++ ) ++ FetchContent_MakeAvailable(pugixml) ++endif() diff --git a/extensions/libarchive/CMakeLists.txt b/extensions/libarchive/CMakeLists.txt -index bf7b2a7f5..eb6b71091 100644 +index 14b75dcc2..ad2b13c25 100644 --- a/extensions/libarchive/CMakeLists.txt +++ b/extensions/libarchive/CMakeLists.txt @@ -22,12 +22,10 @@ if (NOT ENABLE_LIBARCHIVE) diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch index 10d9965ef4..db2434723b 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch @@ -1,4 +1,4 @@ -From a19e548826e65a95a55ac6b9c12a83d3dcc0010d Mon Sep 17 00:00:00 2001 +From d48ababf341708885ecf687ebc46bb1d84ca868d Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 19 Mar 2024 20:56:05 +0800 Subject: [PATCH] Fix libsodium build @@ -9,16 +9,19 @@ Subject: [PATCH] Fix libsodium build Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yi Zhao +[lz: Adapted the patch for context changes when upgrading +from 0.99.1 to 0.99.2.] +Signed-off-by: Li Zhou --- cmake/BundledLibSodium.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/BundledLibSodium.cmake b/cmake/BundledLibSodium.cmake -index 98d05b737..4f0faa879 100644 +index 001a90dad..87a3244fd 100644 --- a/cmake/BundledLibSodium.cmake +++ b/cmake/BundledLibSodium.cmake -@@ -58,14 +58,12 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR) - EXCLUDE_FROM_ALL TRUE +@@ -60,14 +60,12 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR) + TLS_VERIFY TRUE ) else() - set(CONFIGURE_COMMAND ./configure --disable-pie --enable-minimal "--prefix=${LIBSODIUM_BIN_DIR}") diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch b/meta-oe/recipes-extended/minifi-cpp/files/0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch deleted file mode 100644 index 3e916a8081..0000000000 --- a/meta-oe/recipes-extended/minifi-cpp/files/0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 905676309a407b9a50118b31370b73ec411a6f8b Mon Sep 17 00:00:00 2001 -From: Marton Szasz -Date: Mon, 31 Mar 2025 14:48:01 +0200 -Subject: [PATCH] MINIFICPP-2553 CMP0065=OLD removed in cmake 4.0, removed - override - -Signed-off-by: Marton Szasz -Signed-off-by: Gabor Gyimesi - -This closes #1957 - -Upstream-Status: Backport [26aea0d8280986713b441cda3fd3858c80d21f65] -Signed-off-by: Moritz Haase ---- - CMakeLists.txt | 1 - - minifi_main/CMakeLists.txt | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70c94c2f..6673e331 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,7 +19,6 @@ - - cmake_minimum_required(VERSION 3.24) - cmake_policy(SET CMP0096 NEW) # policy to preserve the leading zeros in PROJECT_VERSION_{MAJOR,MINOR,PATCH,TWEAK} --cmake_policy(SET CMP0065 OLD) # default export policy, required for self-dlopen - cmake_policy(SET CMP0135 NEW) # policy to set the timestamps of extracted contents to the time of extraction - - project(nifi-minifi-cpp VERSION 0.99.1) -diff --git a/minifi_main/CMakeLists.txt b/minifi_main/CMakeLists.txt -index 62eb234f..1a2e9e0e 100644 ---- a/minifi_main/CMakeLists.txt -+++ b/minifi_main/CMakeLists.txt -@@ -69,7 +69,6 @@ target_link_libraries(minifiexe spdlog libsodium gsl-lite argparse ${LIBMINIFI}) - - set_target_properties(minifiexe PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") - set_target_properties(minifiexe PROPERTIES OUTPUT_NAME minifi) --set_target_properties(minifiexe PROPERTIES ENABLE_EXPORTS True) - if (WIN32) - target_compile_definitions(minifiexe PUBLIC SERVICE_NAME="Apache NiFi MINiFi") - endif() diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.2.bb similarity index 86% rename from meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb rename to meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.2.bb index 28c1063ceb..4ac5b87ba9 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.2.bb @@ -4,8 +4,8 @@ data collection approach that supplements the core tenets of NiFi in dataflow \ management, focusing on the collection of data at the source of its creation." HOMEPAGE = "https://nifi.apache.org/minifi/index.html" SECTION = "console/network" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4c5fc3bbd872752266d21f5f167ce297" +LICENSE = "Apache-2.0 & MIT & BSD-2-Clause & BSD-3-Clause & BSL-1.0 & Zlib & ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cb72a6f151096df9e2f5f01b6bf9d735" SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=main \ git://github.com/martinmoene/expected-lite.git;protocol=https;branch=master;name=expected-lite;destsuffix=${S}/thirdparty/expected-lite-src \ @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=mai git://github.com/chriskohlhoff/asio.git;protocol=https;branch=master;name=asio;destsuffix=${S}/thirdparty/asio-src \ git://github.com/fmtlib/fmt.git;protocol=https;branch=master;name=fmt;destsuffix=${S}/thirdparty/fmt-src \ git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x;tag=v1.15.3;name=spdlog;destsuffix=${S}/thirdparty/spdlog-src \ + git://github.com/danielaparker/jsoncons.git;protocol=https;branch=master;name=jsoncons;destsuffix=${S}/thirdparty/jsoncons-src \ ${DEBIAN_MIRROR}/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz;name=ossp-uuid;subdir=${S}/thirdparty \ https://download.libsodium.org/libsodium/releases/libsodium-1.0.19.tar.gz;name=libsodium;subdir=${S}/thirdparty \ file://0001-Do-not-use-bundled-packages.patch \ @@ -26,17 +27,16 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=mai file://0005-generateVersion.sh-set-correct-buildrev.patch \ file://0006-CMakeLists.txt-do-not-use-ccache.patch \ file://0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch \ - file://0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch \ file://0001-Add-missing-include-for-malloc-free.patch;patchdir=thirdparty/fmt-src \ file://0001-generateVersion.sh-set-BUILD_DATE-to-SOURCE_DATE_EPO.patch \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ " -# minifi-cpp: 0.99.1 -SRCREV = "78d53ed154c71f1fabbaff0366d44ed3b32754e6" -# expected-lite: 0.6.3 -SRCREV_expected-lite = "c8ffab649ba56e43c731b7017a69ddaebe2e1893" +# minifi-cpp: 0.99.2 +SRCREV = "92fb88dca9aaff75b5c6795d25d6e437649c1c77" +# expected-lite: 0.9.0 +SRCREV_expected-lite = "e45e8d5f295d54efe9cace331b9e9f5efa8a84c3" # range-v3: 0.12.0 SRCREV_range-v3 = "a81477931a8aa2ad025c6bda0609f38e09e4d7ec" # magic-enum: 0.9.6 @@ -47,14 +47,16 @@ SRCREV_argparse = "af442b4da0cd7a07b56fa709bd16571889dc7fda" SRCREV_gsl-lite = "755ba124b54914e672737acace6a9314f59e8d6f" # date: 3.0.3 SRCREV_date = "5bdb7e6f31fac909c090a46dbd9fea27b6e609a4" -# asio: 1.29.0 -SRCREV_asio = "814f67e730e154547aea3f4d99f709cbdf1ea4a0" -# fmt: 11.1.4 -SRCREV_fmt = "123913715afeb8a437e6388b4473fcc4753e1c9a" +# asio: 1.34.2 +SRCREV_asio = "ed6aa8a13d51dfc6c00ae453fc9fb7df5d6ea963" +# fmt: 11.2.0 +SRCREV_fmt = "40626af88bd7df9a5fb80be7b25ac85b122d6c21" # spdlog: 1.15.3 SRCREV_spdlog = "6fa36017cfd5731d617e1a934f0e5ea9c4445b13" +# jsoncons: 1.3.2 +SRCREV_jsoncons = "64b9da1e9f15eeff4ec9d6bc856538db542118f2" -SRCREV_FORMAT .= "_expected-lite_range-v3_magic-enum_argparse_gsl-lite_date_asio_fmt_spdlog" +SRCREV_FORMAT .= "_expected-lite_range-v3_magic-enum_argparse_gsl-lite_date_asio_fmt_spdlog_jsoncons" # ossp-uuid: 1.6.2 SRC_URI[ossp-uuid.sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" @@ -64,7 +66,7 @@ SRC_URI[libsodium.sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd83 inherit pkgconfig cmake systemd -DEPENDS = "virtual/crypt bison-native flex-native flex openssl curl zlib xz bzip2 yaml-cpp zstd lz4" +DEPENDS = "virtual/crypt bison-native flex-native flex openssl curl zlib xz bzip2 yaml-cpp zstd lz4 pugixml" OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" @@ -95,6 +97,8 @@ EXTRA_OECMAKE = " \ -DENABLE_KAFKA=OFF \ -DENABLE_BZIP2=ON \ -DENABLE_LZMA=ON \ + -DENABLE_COUCHBASE=OFF \ + -DENABLE_LLAMACPP=OFF \ -DSKIP_TESTS=ON \ -DMINIFI_OPENSSL_SOURCE=SYSTEM \ -DMINIFI_LIBCURL_SOURCE=SYSTEM \ @@ -103,6 +107,7 @@ EXTRA_OECMAKE = " \ -DMINIFI_LIBXML2_SOURCE=SYSTEM \ -DMINIFI_CATCH2_SOURCE=SYSTEM \ -DMINIFI_ZLIB_SOURCE=SYSTEM \ + -DMINIFI_PUGIXML_SOURCE=SYSTEM \ -DMINIFI_FMT_SOURCE=BUILD \ -DMINIFI_SPDLOG_SOURCE=BUILD \ -DFETCHCONTENT_SOURCE_DIR_GSL-LITE=${S}/thirdparty/gsl-lite-src \ @@ -114,6 +119,7 @@ EXTRA_OECMAKE = " \ -DFETCHCONTENT_SOURCE_DIR_ARGPARSE=${S}/thirdparty/argparse-src \ -DFETCHCONTENT_SOURCE_DIR_FMT=${S}/thirdparty/fmt-src \ -DFETCHCONTENT_SOURCE_DIR_SPDLOG=${S}/thirdparty/spdlog-src \ + -DFETCHCONTENT_SOURCE_DIR_JSONCONS=${S}/thirdparty/jsoncons-src \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DENABLE_SYSTEMD=ON', '-DENABLE_SYSTEMD=OFF', d)} \ -DBUILD_IDENTIFIER=${PV} \ " @@ -147,19 +153,19 @@ do_compile:prepend() { do_install() { DESTDIR='${WORKDIR}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} MINIFI_BIN=${bindir} - MINIFI_HOME=${sysconfdir}/minifi - MINIFI_RUN=${localstatedir}/lib/minifi - MINIFI_LOG=${localstatedir}/log/minifi + MINIFI_HOME=${sysconfdir}/nifi-minifi-cpp + MINIFI_RUN=${localstatedir}/lib/nifi-minifi-cpp + MINIFI_LOG=${localstatedir}/log/nifi-minifi-cpp install -m 755 -d ${D}${MINIFI_BIN} - install -m 755 -d ${D}${MINIFI_HOME}/conf - install -m 755 -d ${D}${localstatedir}/lib/minifi + install -m 755 -d ${D}${MINIFI_HOME} + install -m 755 -d ${D}${MINIFI_RUN} - for i in encrypt-config minifi minifi.sh minificontroller; do + for i in minifi-encrypt-config minifi minifi.sh minifi-controller; do install -m 755 ${WORKDIR}/minifi-install/usr/bin/${i} ${D}${MINIFI_BIN} done for i in config.yml minifi-log.properties minifi.properties minifi-uid.properties; do - install -m 644 ${WORKDIR}/minifi-install/usr/conf/${i} ${D}${MINIFI_HOME}/conf + install -m 644 ${WORKDIR}/minifi-install/usr/conf/${i} ${D}${MINIFI_HOME} done install -m 755 -d ${D}${libdir}/minifi-extensions @@ -175,19 +181,19 @@ do_install() { sed -i "s|bin_dir=.*|bin_dir=${MINIFI_BIN}|g" ${D}${MINIFI_BIN}/minifi.sh sed -i "s|#appender.rolling.directory=.*|appender.rolling.directory=${MINIFI_LOG}|g" \ - ${D}${MINIFI_HOME}/conf/minifi-log.properties + ${D}${MINIFI_HOME}/minifi-log.properties sed -i "s|nifi.provenance.repository.directory.default=.*|nifi.provenance.repository.directory.default=${MINIFI_RUN}/provenance_repository|g" \ - ${D}${MINIFI_HOME}/conf/minifi.properties + ${D}${MINIFI_HOME}/minifi.properties sed -i "s|nifi.flowfile.repository.directory.default=.*|nifi.flowfile.repository.directory.default=${MINIFI_RUN}/flowfile_repository|g" \ - ${D}${MINIFI_HOME}/conf/minifi.properties + ${D}${MINIFI_HOME}/minifi.properties sed -i "s|nifi.database.content.repository.directory.default=.*|nifi.database.content.repository.directory.default=${MINIFI_RUN}/content_repository|g" \ - ${D}${MINIFI_HOME}/conf/minifi.properties - sed -i "s|nifi.flow.configuration.file=.*|nifi.flow.configuration.file=${MINIFI_HOME}/conf/config.yml|g" \ - ${D}${MINIFI_HOME}/conf/minifi.properties + ${D}${MINIFI_HOME}/minifi.properties + sed -i "s|nifi.flow.configuration.file=.*|nifi.flow.configuration.file=${MINIFI_HOME}/config.yml|g" \ + ${D}${MINIFI_HOME}/minifi.properties sed -i "s|nifi.python.processor.dir=.*|nifi.python.processor.dir=${libexecdir}/minifi-python|g" \ - ${D}${MINIFI_HOME}/conf/minifi.properties + ${D}${MINIFI_HOME}/minifi.properties sed -i "s|nifi.extension.path=.*|nifi.extension.path=${libdir}/minifi-extensions/*|g" \ - ${D}${MINIFI_HOME}/conf/minifi.properties + ${D}${MINIFI_HOME}/minifi.properties if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -m 755 -d ${D}${sysconfdir}/tmpfiles.d