boost-build-native: upgrade 1.87 -> 1.89
PATCH v4 1/3 boost-build-native: upgrade 1.87 -> 1.89
From: Gyorgy Sarvari <[email protected]>
Changelog: https://www.boost.org/releases/1.89.0/
---
v2: Rebased
v3: No change
v4: No change
...st-build-native_1.87.0.bb => boost-build-native_1.89.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/boost/{boost-build-native_1.87.0.bb => boost-build-native_1.89.0.bb} (88%)meta/recipes-support/boost/boost-build-native_1.89.0.bb renamed from meta/recipes-support/boost/boost-build-native_1.87.0.bb +2 -2
@@ -6,8 +6,8 @@ SECTION = "devel" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master" -SRCREV = "4a52d8c06635435b64e31a56eaf7ca5dc912a71d" +SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master;tag=boost-${PV}" +SRCREV = "be69c44857e34fae250aa1321808a05c1d88bfde" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P<pver>(\d+(\.\d+)+))"
PATCH v4 2/3 boost: upgrade 1.88.0 -> 1.89.0
From: Gyorgy Sarvari <[email protected]>
Changelog: https://www.boost.org/releases/1.89.0/
---
v2: Rebased
v3: No change
v4: No change
.../boost/{boost-1.88.0.inc => boost-1.89.0.inc} | 2 +-
...1-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch | 2 +-
.../boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch | 2 +-
meta/recipes-support/boost/{boost_1.88.0.bb => boost_1.89.0.bb} | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-support/boost/{boost-1.88.0.inc => boost-1.89.0.inc} (90%)
rename meta/recipes-support/boost/{boost_1.88.0.bb => boost_1.89.0.bb} (100%)meta/recipes-support/boost/boost-1.89.0.inc renamed from meta/recipes-support/boost/boost-1.88.0.inc +1 -1
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "https://archives.boost.io/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "46d9d2c06637b219270877c9e16155cbd015b6dc84349af064c088e9b5b12f7b" +SRC_URI[sha256sum] = "85a33fa22621b4f314f8e85e1a5e2a9363d22e4f4992925d4bb3bc631b5a0c7a" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +1 -1
@@ -16,7 +16,7 @@ diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam index b7825d4e6..ed7e39baf 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1144,156 +1144,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : +@@ -1143,156 +1143,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : <architecture>$(architecture)/<instruction-set>$(instruction-set) : $(values) ; }
meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch +1 -1
@@ -16,7 +16,7 @@ diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam index ed7e39baf..90513f84a 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -377,22 +377,6 @@ local rule compile-link-flags ( * ) +@@ -375,22 +375,6 @@ local rule compile-link-flags ( * ) compile-link-flags <link>shared/<target-os>$(non-windows) : -fPIC ; }
meta/recipes-support/boost/boost_1.89.0.bb renamed from meta/recipes-support/boost/boost_1.88.0.bb +0 -0
PATCH v4 3/3 kea: Upgrade to 3.0 LTS release
In reply to Khem Raj* Drop backported patch and refresh remaining
* Add fixes to build with boost 1.89.0
* Switch to meson build system
* Delete meson-info files
There’s no Meson built-in switch to stop creating intro-*.json in the build dir (that’s by design), only to stop installing them is possible. for runtime, Kea doesn’t read it, this is just build metadata
License-Update: Removed remaining coroutine references [1]
[1] https://github.com/isc-projects/kea/commit/93bab7a99f82e2ceadca14a7a6a2440cd69fb8c8
---
v2: same as v1 as no v1 was submitted
v3: Add License-Update fix RPATHs in solibs
v4: Do not install meson-info files, fixes reproducible builds
.../files/0001-build-boost-1.89.0-fixes.patch | 53 ++++++++
...ake-kea-environment-available-to-lfc.patch | 96 --------------
...se-a-runtime-safe-interpreter-string.patch | 123 ++++++++++++++++++
.../0001-mk_cfgrpt.sh-strip-prefixes.patch | 54 ++++++++
...er_unittest_support.cc-do-not-write-.patch | 4 +-
.../kea/files/fix-multilib-conflict.patch | 16 +--
.../kea/files/fix_pid_keactrl.patch | 11 +-
.../kea/{kea_2.6.4.bb => kea_3.0.1.bb} | 31 +++--
8 files changed, 258 insertions(+), 130 deletions(-)
create mode 100644 meta/recipes-connectivity/kea/files/0001-build-boost-1.89.0-fixes.patch
delete mode 100644 meta/recipes-connectivity/kea/files/0001-make-kea-environment-available-to-lfc.patch
create mode 100644 meta/recipes-connectivity/kea/files/0001-meson-use-a-runtime-safe-interpreter-string.patch
create mode 100644 meta/recipes-connectivity/kea/files/0001-mk_cfgrpt.sh-strip-prefixes.patch
rename meta/recipes-connectivity/kea/{kea_2.6.4.bb => kea_3.0.1.bb} (71%)meta/recipes-connectivity/kea/files/0001-build-boost-1.89.0-fixes.patch new file +53 -0
@@ -0,0 +1,53 @@ +From cf6af9219ba688fcd01d73a392dd1306d2b7a9e6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 27 Aug 2025 22:20:09 -0700 +Subject: [PATCH] build: boost 1.89.0 fixes + +Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2771/] +Signed-off-by: Khem Raj <[email protected]> +--- + meson.build | 2 +- + src/lib/asiodns/io_fetch.cc | 1 + + src/lib/asiolink/interval_timer.cc | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +--- a/meson.build ++++ b/meson.build +@@ -189,7 +189,7 @@ message(f'Detected system "@SYSTEM@".') + + #### Dependencies + +-boost_dep = dependency('boost', version: '>=1.66', modules: ['system']) ++boost_dep = dependency('boost', version: '>=1.66') + dl_dep = dependency('dl') + threads_dep = dependency('threads') + add_project_dependencies(boost_dep, dl_dep, threads_dep, language: ['cpp']) +@@ -1094,7 +1094,7 @@ pkg.generate( + if TARGETS_GEN_MESSAGES.length() > 0 + alias_target('messages', TARGETS_GEN_MESSAGES) + else +- error( ++ warning( + 'No messages to generate. This is probably an error in the meson.build files.', + ) + endif +--- a/src/lib/asiodns/io_fetch.cc ++++ b/src/lib/asiodns/io_fetch.cc +@@ -22,6 +22,7 @@ + #include <dns/rcode.h> + #include <util/io.h> + ++#include <boost/asio/deadline_timer.hpp> + #include <boost/scoped_ptr.hpp> + #include <boost/date_time/posix_time/posix_time_types.hpp> + +--- a/src/lib/asiolink/interval_timer.cc ++++ b/src/lib/asiolink/interval_timer.cc +@@ -9,6 +9,7 @@ + #include <asiolink/interval_timer.h> + #include <asiolink/io_service.h> + ++#include <boost/asio/deadline_timer.hpp> + #include <boost/enable_shared_from_this.hpp> + #include <boost/noncopyable.hpp> + #include <boost/shared_ptr.hpp>
meta/recipes-connectivity/kea/files/0001-make-kea-environment-available-to-lfc.patch deleted +0 -96
96 lines not on this page · raw message
meta/recipes-connectivity/kea/files/0001-meson-use-a-runtime-safe-interpreter-string.patch new file +123 -0
123 lines not on this page · raw message
meta/recipes-connectivity/kea/files/0001-mk_cfgrpt.sh-strip-prefixes.patch new file +54 -0
54 lines not on this page · raw message
meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch +1 -3
@@ -13,11 +13,9 @@ Signed-off-by: Alexander Kanavin <[email protected]> src/lib/log/logger_unittest_support.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/lib/log/logger_unittest_support.cc b/src/lib/log/logger_unittest_support.cc -index fc01c6e..f46d17e 100644 --- a/src/lib/log/logger_unittest_support.cc +++ b/src/lib/log/logger_unittest_support.cc -@@ -84,7 +84,7 @@ void initLogger(isc::log::Severity severity, int dbglevel) { +@@ -84,7 +84,7 @@ void initLogger(isc::log::Severity sever const char* localfile = getenv("KEA_LOGGER_LOCALMSG"); // Set a directory for creating lockfiles when running tests
meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +5 -11
@@ -24,11 +24,9 @@ Signed-off-by: Lei Maohui <[email protected]> src/bin/keactrl/kea-dhcp6.conf.pre | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) -diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre -index e6ae8b8..50a3092 100644 --- a/src/bin/keactrl/kea-ctrl-agent.conf.pre +++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre -@@ -51,7 +51,8 @@ +@@ -85,7 +85,8 @@ // Agent will fail to start. "hooks-libraries": [ // {
@@ -38,8 +36,6 @@ index e6ae8b8..50a3092 100644 // "parameters": { // "param1": "foo" // } -diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre -index 6edb8a1..b2a7385 100644 --- a/src/bin/keactrl/kea-dhcp4.conf.pre +++ b/src/bin/keactrl/kea-dhcp4.conf.pre @@ -255,7 +255,7 @@
@@ -49,9 +45,9 @@ index 6edb8a1..b2a7385 100644 - // "library": "@libdir@/kea/hooks/libdhcp_legal_log.so", + // "library": "$libdir/kea/hooks/libdhcp_legal_log.so", // "parameters": { - // "path": "/var/lib/kea", // "base-name": "kea-forensic4" -@@ -272,7 +272,7 @@ + // } +@@ -271,7 +271,7 @@ // // of specific options or perhaps even a combination of several // // options and fields to uniquely identify a client. Those scenarios // // are addressed by the Flexible Identifiers hook application.
@@ -60,8 +56,6 @@ index 6edb8a1..b2a7385 100644 // "parameters": { // "identifier-expression": "relay4[2].hex" // } -diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre -index 271021b..5b85854 100644 --- a/src/bin/keactrl/kea-dhcp6.conf.pre +++ b/src/bin/keactrl/kea-dhcp6.conf.pre @@ -201,7 +201,7 @@
@@ -71,9 +65,9 @@ index 271021b..5b85854 100644 - // "library": "@libdir@/kea/hooks/libdhcp_legal_log.so", + // "library": "$libdir/kea/hooks/libdhcp_legal_log.so", // "parameters": { - // "path": "/var/lib/kea", // "base-name": "kea-forensic6" -@@ -218,7 +218,7 @@ + // } +@@ -217,7 +217,7 @@ // // of specific options or perhaps even a combination of several // // options and fields to uniquely identify a client. Those scenarios // // are addressed by the Flexible Identifiers hook application.
meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch +3 -8
@@ -15,21 +15,16 @@ Signed-off-by: Trevor Gamblin <[email protected]> src/bin/keactrl/keactrl.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in -index cccfdac303..20ae2e6ec5 100644 --- a/src/bin/keactrl/keactrl.in +++ b/src/bin/keactrl/keactrl.in -@@ -146,8 +146,8 @@ check_running() { +@@ -157,8 +157,8 @@ check_running() { # Get the PID from the PID file (if it exists) get_pid_from_file "${proc_name}" - if [ ${_pid} -gt 0 ]; then + if [ "${_pid}" -gt 0 ]; then - # Use ps to check if PID is alive -- if ps -p ${_pid} 1>/dev/null; then +- if ps -p "${_pid}" 1>/dev/null; then + # Use pgrep and grep to check if PID is alive + if pgrep -v 1 | grep ${_pid} 1>/dev/null; then # No error, so PID IS ALIVE _running=1 fi --- -2.39.2 -
meta/recipes-connectivity/kea/kea_3.0.1.bb renamed from meta/recipes-connectivity/kea/kea_2.6.4.bb +19 -12
@@ -3,11 +3,11 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It HOMEPAGE = "http://kea.isc.org" SECTION = "connectivity" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ee16e7280a6cf2a1487717faf33190dc" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb634ed1d923b8b8fd1ed7ffc9b70ae4" DEPENDS = "boost log4cplus openssl" -SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ +SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.xz \ file://kea-dhcp4.service \ file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \
@@ -17,11 +17,15 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix-multilib-conflict.patch \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ - file://0001-make-kea-environment-available-to-lfc.patch \ + file://0001-build-boost-1.89.0-fixes.patch \ + file://0001-meson-use-a-runtime-safe-interpreter-string.patch \ + file://0001-mk_cfgrpt.sh-strip-prefixes.patch \ " -SRC_URI[sha256sum] = "6806405e4d559abc10febd2c273dc6e2bc6ac42767afa5ca20b118ffba84a671" +SRC_URI[sha256sum] = "ec84fec4bb7f6b9d15a82e755a571e9348eb4d6fbc62bb3f6f1296cd7a24c566" -inherit autotools systemd update-rc.d upstream-version-is-even +inherit meson pkgconfig systemd update-rc.d upstream-version-is-even + +EXTRA_OECONF += "-Dcrypto=openssl -Drunstatedir=${runtimedir} -Dkrb5=disabled -Dnetconf=disabled" INITSCRIPT_NAME = "kea-dhcp4-server" INITSCRIPT_PARAMS = "defaults 30"
@@ -40,20 +44,18 @@ BUILD_OPTIMIZATION:remove:mipsel = " -Og" BUILD_OPTIMIZATION:append:mipsel = " -O" CXXFLAGS:remove = "-fvisibility-inlines-hidden" -EXTRA_OECONF = "--with-boost-libs=-lboost_system \ - --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \ - --with-openssl=${STAGING_DIR_TARGET}${prefix}" do_configure:prepend() { # replace abs_top_builddir to avoid introducing the build path # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in + export STRIP_PREFIXES="${RECIPE_SYSROOT_NATIVE}:${RECIPE_SYSROOT}:${WORKDIR}:${B}" } # patch out build host paths for reproducibility do_compile:prepend:class-target() { - sed -i -e "s,${WORKDIR},,g" ${B}/config.report + sed -i -e "s,${WORKDIR},,g" ${B}/config.report } do_install:append() {
@@ -65,7 +67,10 @@ do_install:append() { sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl - sed -i "s:${B}:@abs_top_builddir_placeholder@:g" ${D}${sbindir}/kea-admin + sed -i -e "s:${B}:@abs_top_builddir_placeholder@:g" \ + -e "s:${S}:@abs_top_srcdir_placeholder@:g" \ + ${D}${sbindir}/kea-admin + rm -rf ${D}${datadir}/${BPN}/meson-info } do_install:append() {
@@ -74,7 +79,9 @@ do_install:append() { CONFFILES:${PN} = "${sysconfdir}/kea/keactrl.conf" +PACKAGES =+ "${PN}-python" +FILES:${PN}-python = "${nonarch_libdir}/python*/site-packages/*" +RDEPENDS:${PN}-python = "python3" + FILES:${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" FILES:${PN} += "${libdir}/hooks/*.so" - -PARALLEL_MAKEINST = ""