kea: upgrade to v2.5.0

Changes:
Update license checksum: change in copyright year.
Update sha256sum for new version.

An additinal patch to fix the reproducible build failure.

(From OE-Core rev: 4048ddf7fdd6859c43aeb82d85ee0851b3a9177b)

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Sudip Mukherjee
2023-08-09 09:45:50 +01:00
committed by Richard Purdie
parent 06335eab2f
commit a05abc02fa
2 changed files with 61 additions and 2 deletions

View File

@@ -0,0 +1,58 @@
From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Date: Tue, 8 Aug 2023 19:03:13 +0100
Subject: [PATCH] kea: fix reproducible build failure
New version of Kea has started using path of build-dir instead of
src-dir which results in reproducible builds failure.
Use src-dir as is used in v2.2.0
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
src/bin/admin/kea-admin.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 034a0ee..8ab11ab 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -51,14 +51,14 @@ dump_qry=""
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
else
- . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+ . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
fi
# Find the installed kea-lfc if available. Fallback to sources otherwise.
if test -x "@sbindir@/kea-lfc"; then
kea_lfc="@sbindir@/kea-lfc"
else
- kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc"
+ kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc"
fi
# Prints out usage version.
@@ -355,7 +355,7 @@ mysql_upgrade() {
# Check if there are any files in it
num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
if [ "$num_files" -eq 0 ]; then
- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql
+ upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql
# Check if the scripts directory exists at all.
if [ ! -d ${upgrade_scripts_dir} ]; then
@@ -405,7 +405,7 @@ pgsql_upgrade() {
# Check if there are any files in it
num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l)
if [ "$num_files" -eq 0 ]; then
- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql
+ upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql
# Check if the scripts directory exists at all.
if [ ! -d ${upgrade_scripts_dir} ]; then
--
2.39.2

View File

@@ -3,7 +3,7 @@ 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=97ce14bdd2733f5b84ab5e29380d057d"
LIC_FILES_CHKSUM = "file://COPYING;md5=ea061fa0188838072c4248c1318ec131"
DEPENDS = "boost log4cplus openssl"
@@ -17,8 +17,9 @@ 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-kea-fix-reproducible-build-failure.patch \
"
SRC_URI[sha256sum] = "da7d90ca62a772602dac6e77e507319038422895ad68eeb142f1487d67d531d2"
SRC_URI[sha256sum] = "5b1553cd50928976925b82e5f7f2792f8e9e9244cad66820bc640fb3d50428f8"
inherit autotools systemd update-rc.d upstream-version-is-even