| Message ID | 20230809084550.9390-1-sudipm.mukherjee@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 4048ddf7fdd6859c43aeb82d85ee0851b3a9177b |
| Headers | show |
| Series | [v2] kea: upgrade to v2.5.0 | expand |
On Wed, 9 Aug 2023 at 10:45, Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote: > .../kea/{kea_2.2.0.bb => kea_2.5.0.bb} | 5 +- 2.5.0 is a development series. The update should be to 2.4.x instead which is stable. https://kb.isc.org/docs/aa-00896#kea-updated-as-of-122022 Please always verify the latest version with 'devtool latest-version kea' first. > +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] Reproducibility fixes are always eligible for upstream submission, please do so and include the link. Even if the patch is unsuitable for direct upstream merge, at least it alerts maintainers to the problem. Alex
Hi Alex, On Wed, 9 Aug 2023 at 09:55, Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > On Wed, 9 Aug 2023 at 10:45, Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote: > > .../kea/{kea_2.2.0.bb => kea_2.5.0.bb} | 5 +- > > 2.5.0 is a development series. The update should be to 2.4.x instead > which is stable. > https://kb.isc.org/docs/aa-00896#kea-updated-as-of-122022 > > Please always verify the latest version with 'devtool latest-version kea' first. > > > +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] > > Reproducibility fixes are always eligible for upstream submission, > please do so and include the link. Even if the patch is unsuitable for > direct upstream merge, at least it alerts maintainers to the problem. Yeah, I know and I always try to send any patches upstream first. But in this case there seems to be no way to do it. I have tried with https://gitlab.isc.org/isc-projects/kea/ but they are not allowing gmail or any non-corporate email address to register or login. Also tried to login via authenticating with gitlab/github but that also did not work. So, I have subscribed to kea-dev mailing list and reported there with the same patch. https://lists.isc.org/pipermail/kea-dev/2023-August/001010.html
On Wed, 9 Aug 2023 at 12:05, Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote: > Yeah, I know and I always try to send any patches upstream first. > But in this case there seems to be no way to do it. > > I have tried with https://gitlab.isc.org/isc-projects/kea/ but they > are not allowing gmail > or any non-corporate email address to register or login. Also tried to > login via authenticating > with gitlab/github but that also did not work. I just managed to log in with github authentication, so if you can try from a different ISP, I'd appreciate. Alex
On Wed, 9 Aug 2023 at 11:22, Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > On Wed, 9 Aug 2023 at 12:05, Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote: > > Yeah, I know and I always try to send any patches upstream first. > > But in this case there seems to be no way to do it. > > > > I have tried with https://gitlab.isc.org/isc-projects/kea/ but they > > are not allowing gmail > > or any non-corporate email address to register or login. Also tried to > > login via authenticating > > with gitlab/github but that also did not work. > > I just managed to log in with github authentication, so if you can try > from a different ISP, I'd appreciate. There seems to be no way to submit a MR or patch. I have used another email (non-gmail) to register, but it did not allow me to fork and raise MR. So I have opened an issue - https://gitlab.isc.org/isc-projects/kea/-/issues/3007
On Wed, 9 Aug 2023 at 13:08, Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote: > There seems to be no way to submit a MR or patch. I have used another > email (non-gmail) to register, but it did not allow me to fork and > raise MR. So I have opened an issue - > https://gitlab.isc.org/isc-projects/kea/-/issues/3007 https://gitlab.isc.org/isc-projects/kea/-/blob/master/CONTRIBUTING.md explains how to do it. The key step is: "ask someone from the ISC team to give you permission to fork Kea (ask @tomek, @vicky, @ondrej or @godfryd or basically anyone from the Kea dev team)" I suppose they will do that once someone reads the issue, until then you can refer to the ticket in oe-core submission (but pls roll back to 2.4.x). Alex
On Wed, 9 Aug 2023 at 12:21, Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > On Wed, 9 Aug 2023 at 13:08, Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote: > > There seems to be no way to submit a MR or patch. I have used another > > email (non-gmail) to register, but it did not allow me to fork and > > raise MR. So I have opened an issue - > > https://gitlab.isc.org/isc-projects/kea/-/issues/3007 > > https://gitlab.isc.org/isc-projects/kea/-/blob/master/CONTRIBUTING.md > explains how to do it. The key step is: > > "ask someone from the ISC team to give you permission to fork Kea (ask > @tomek, @vicky, @ondrej or @godfryd or basically anyone from the Kea > dev team)" > > I suppose they will do that once someone reads the issue, until then > you can refer to the ticket in oe-core submission (but pls roll back > to 2.4.x). v2.4 will also have the same problem. This change was introduced in v2.3, so anything v2.2+ will have the problem. Anyways, I will resubmit the upgrade patch here after upstream has resolved the problem.
On Wed, 9 Aug 2023 at 14:20, Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote: > > I suppose they will do that once someone reads the issue, until then > > you can refer to the ticket in oe-core submission (but pls roll back > > to 2.4.x). > > v2.4 will also have the same problem. This change was introduced in > v2.3, so anything v2.2+ will have the problem. > Anyways, I will resubmit the upgrade patch here after upstream has > resolved the problem. You don't need to wait. You can backport to 2.4 what you submitted in the ticket. We generally trust that people who submit patches will carry them to upstream merge, adjusting and interacting with upstream as needed. Alex
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 @@ +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 + diff --git a/meta/recipes-connectivity/kea/kea_2.2.0.bb b/meta/recipes-connectivity/kea/kea_2.5.0.bb similarity index 92% rename from meta/recipes-connectivity/kea/kea_2.2.0.bb rename to 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 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
Changes: Update license checksum: change in copyright year. Update sha256sum for new version. An additinal patch to fix the reproducible build failure. Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> --- ...1-kea-fix-reproducible-build-failure.patch | 58 +++++++++++++++++++ .../kea/{kea_2.2.0.bb => kea_2.5.0.bb} | 5 +- 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch rename meta/recipes-connectivity/kea/{kea_2.2.0.bb => kea_2.5.0.bb} (92%)