diff options
author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2023-08-09 09:45:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-10 09:18:54 +0100 |
commit | a05abc02facc1d82866cc272f3b836a01f2b1051 (patch) | |
tree | f34ec9b610718a7e5146b04550162b202635d30c | |
parent | 06335eab2fc5824e95c0e727eadac2e2cbeea03f (diff) | |
download | poky-a05abc02facc1d82866cc272f3b836a01f2b1051.tar.gz |
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>
-rw-r--r-- | meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch | 58 | ||||
-rw-r--r-- | meta/recipes-connectivity/kea/kea_2.5.0.bb (renamed from meta/recipes-connectivity/kea/kea_2.2.0.bb) | 5 |
2 files changed, 61 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch new file mode 100644 index 0000000000..645b5a2de3 --- /dev/null +++ b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> | ||
3 | Date: Tue, 8 Aug 2023 19:03:13 +0100 | ||
4 | Subject: [PATCH] kea: fix reproducible build failure | ||
5 | |||
6 | New version of Kea has started using path of build-dir instead of | ||
7 | src-dir which results in reproducible builds failure. | ||
8 | Use src-dir as is used in v2.2.0 | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
11 | |||
12 | Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> | ||
13 | --- | ||
14 | src/bin/admin/kea-admin.in | 8 ++++---- | ||
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in | ||
18 | index 034a0ee..8ab11ab 100644 | ||
19 | --- a/src/bin/admin/kea-admin.in | ||
20 | +++ b/src/bin/admin/kea-admin.in | ||
21 | @@ -51,14 +51,14 @@ dump_qry="" | ||
22 | if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then | ||
23 | . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh" | ||
24 | else | ||
25 | - . "@abs_top_builddir@/src/bin/admin/admin-utils.sh" | ||
26 | + . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" | ||
27 | fi | ||
28 | |||
29 | # Find the installed kea-lfc if available. Fallback to sources otherwise. | ||
30 | if test -x "@sbindir@/kea-lfc"; then | ||
31 | kea_lfc="@sbindir@/kea-lfc" | ||
32 | else | ||
33 | - kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc" | ||
34 | + kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc" | ||
35 | fi | ||
36 | |||
37 | # Prints out usage version. | ||
38 | @@ -355,7 +355,7 @@ mysql_upgrade() { | ||
39 | # Check if there are any files in it | ||
40 | num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) | ||
41 | if [ "$num_files" -eq 0 ]; then | ||
42 | - upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql | ||
43 | + upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql | ||
44 | |||
45 | # Check if the scripts directory exists at all. | ||
46 | if [ ! -d ${upgrade_scripts_dir} ]; then | ||
47 | @@ -405,7 +405,7 @@ pgsql_upgrade() { | ||
48 | # Check if there are any files in it | ||
49 | num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) | ||
50 | if [ "$num_files" -eq 0 ]; then | ||
51 | - upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql | ||
52 | + upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql | ||
53 | |||
54 | # Check if the scripts directory exists at all. | ||
55 | if [ ! -d ${upgrade_scripts_dir} ]; then | ||
56 | -- | ||
57 | 2.39.2 | ||
58 | |||
diff --git a/meta/recipes-connectivity/kea/kea_2.2.0.bb b/meta/recipes-connectivity/kea/kea_2.5.0.bb index 2c2e5a74dd..cf341b2f01 100644 --- a/meta/recipes-connectivity/kea/kea_2.2.0.bb +++ b/meta/recipes-connectivity/kea/kea_2.5.0.bb | |||
@@ -3,7 +3,7 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It | |||
3 | HOMEPAGE = "http://kea.isc.org" | 3 | HOMEPAGE = "http://kea.isc.org" |
4 | SECTION = "connectivity" | 4 | SECTION = "connectivity" |
5 | LICENSE = "MPL-2.0" | 5 | LICENSE = "MPL-2.0" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=97ce14bdd2733f5b84ab5e29380d057d" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea061fa0188838072c4248c1318ec131" |
7 | 7 | ||
8 | DEPENDS = "boost log4cplus openssl" | 8 | DEPENDS = "boost log4cplus openssl" |
9 | 9 | ||
@@ -17,8 +17,9 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ | |||
17 | file://fix-multilib-conflict.patch \ | 17 | file://fix-multilib-conflict.patch \ |
18 | file://fix_pid_keactrl.patch \ | 18 | file://fix_pid_keactrl.patch \ |
19 | file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ | 19 | file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ |
20 | file://0001-kea-fix-reproducible-build-failure.patch \ | ||
20 | " | 21 | " |
21 | SRC_URI[sha256sum] = "da7d90ca62a772602dac6e77e507319038422895ad68eeb142f1487d67d531d2" | 22 | SRC_URI[sha256sum] = "5b1553cd50928976925b82e5f7f2792f8e9e9244cad66820bc640fb3d50428f8" |
22 | 23 | ||
23 | inherit autotools systemd update-rc.d upstream-version-is-even | 24 | inherit autotools systemd update-rc.d upstream-version-is-even |
24 | 25 | ||