Skip to contentSkip to conversation

minifi-cpp: upgrade 0.99.1 -> 0.99.2

PATCH In review Li Zhou 1 participant 2 messages Jun 8 – Jun 9

lore
Share & tools
lore

Li Zhou

author
#0 lore raw

PATCH 1/1 minifi-cpp: upgrade 0.99.1 -> 0.99.2

Below changes are done for upgrading minifi-cpp from 0.99.1 to 0.99.2. Updated below patches:
0001-Do-not-use-bundled-packages.patch 0003-Fix-libsodium-build.patch
Removed below patch for it is available in new version:
0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch
Updated third-party components' versions to be aligned with new version's release note:
expected-lite 0.6.3->0.9.0
asio 1.29.0->1.34.2
fmt 11.1.4->11.2.0
Added new third-party component: jsoncons 1.3.2.
Added DEPENDS on pugixml 1.15 (use the version provided by system). Added new configs to disable unnecessary third-party components. Aligned file names and installation paths with new version 0.99.2. Correct LICENSE.

ChangeLog:
https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65145325

License-Update: Added BSL-1.0 (jsoncons) and fixed typo in
concurrentqueue description. [1]
Removed TinyXml2 (Zlib license) from LICENSE and Zlib license is needed by other bundled components. [2] No new license type. Changed protobuf from "within gRPC" to standalone bundling. [3] Added MIT license (llama.cpp). [4]
Added benchmark (ALv2) to LICENSE/NOTICE. No new license since Apache-2.0 already present. [5]

[1] https://github.com/apache/nifi-minifi-cpp/commit/e25a247a4
[2] https://github.com/apache/nifi-minifi-cpp/commit/f28961cfb
[3] https://github.com/apache/nifi-minifi-cpp/commit/97087b22e
[4] https://github.com/apache/nifi-minifi-cpp/commit/8602b76d2
[5] https://github.com/apache/nifi-minifi-cpp/commit/54a643c72

---
 .../0001-Do-not-use-bundled-packages.patch    | 82 +++++++++++++------
 .../files/0003-Fix-libsodium-build.patch      | 11 ++-
 ...MP0065-OLD-removed-in-cmake-4.0-remo.patch | 42 ----------
 ...ifi-cpp_0.99.1.bb => minifi-cpp_0.99.2.bb} | 62 +++++++-------
 4 files changed, 99 insertions(+), 98 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/minifi-cpp/files/0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch
 rename meta-oe/recipes-extended/minifi-cpp/{minifi-cpp_0.99.1.bb => minifi-cpp_0.99.2.bb} (86%)
meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch +58 -24
index 68fd1ee3e0..98044877cd 100644
@@ -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 <[email protected]>
 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 <[email protected]>
+[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 <[email protected]>
 ---
- 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)
meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch +7 -4
index 10d9965ef4..db2434723b 100644
@@ -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 <[email protected]>
 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 <[email protected]>
+[lz: Adapted the patch for context changes when upgrading
+from 0.99.1 to 0.99.2.]
+Signed-off-by: Li Zhou <[email protected]>
 ---
  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}")
meta-oe/recipes-extended/minifi-cpp/files/0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch deleted +0 -42

42 lines not on this page · raw message

meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.2.bb renamed from meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb +34 -28

142 lines not on this page · raw message

Signature · 1 line
2.34.1
author
#1 lore raw

Please ignore this patch and I will send a new patch later. Thanks.