From patchwork Fri Dec 15 14:17:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 36446 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40C0BC48BEE for ; Fri, 15 Dec 2023 14:17:54 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web10.63130.1702649861996945090 for ; Fri, 15 Dec 2023 06:17:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=HMhTCJtY; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=TecPN2Hg; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.193, mailfrom: 0101018c6dd7141e-5f37d14e-0038-4703-9840-695520e8c95f-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1702649861; h=Content-Type:MIME-Version:From:To:Subject:Message-Id:Date; bh=M3x+MTVHo6aT6LudWPRLBnonMySNja1AKJoWTyQTnlQ=; b=HMhTCJtYHLmLghTNLT6LKzosR64OOTXOwn4vfLawQ037K00r9Z3jcyBG/m0QXSsJ q3V+BqddAjS3ow5J0P2DAr++QTCiLJW+a4c8As8Pzsy7k4qgoWq0aQKwGgE4K4JlLNl gV6GnMqPyGAJ3VLHKXvildCLiIVDNxOyet0f9M/8= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1702649861; h=Content-Type:MIME-Version:From:To:Subject:Message-Id:Date:Feedback-ID; bh=M3x+MTVHo6aT6LudWPRLBnonMySNja1AKJoWTyQTnlQ=; b=TecPN2Hgi2hnqEgaHms83CLeN/r337HTyP1UyBGG8K30DsYc1l50xfjXtBTH+EqI CKXS/zZcgWicTwSoUztDaUXGpN2Zp+QCNbdM47vyp1h+SAQmWpmnrqxqVMtwQF+X2T5 rgRcaGhert3efd9XBpJWqLTfTOBtSRnnxNqURHWk= MIME-Version: 1.0 From: auh@yoctoproject.org To: openembedded-core@lists.openembedded.org Subject: [AUH] kea: upgrading to 2.4.1 SUCCEEDED Message-ID: <0101018c6dd7141e-5f37d14e-0038-4703-9840-695520e8c95f-000000@us-west-2.amazonses.com> Date: Fri, 15 Dec 2023 14:17:41 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.12.15-54.240.27.193 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 15 Dec 2023 14:17:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192435 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *kea* to *2.4.1* has Succeeded. Next steps: - apply the patch: git am 0001-kea-upgrade-2.4.0-2.4.1.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 6d14e891e8240941a4c7f56f85a503cb0754df26 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 15 Dec 2023 05:34:43 +0000 Subject: [PATCH] kea: upgrade 2.4.0 -> 2.4.1 --- .../files/0001-kea-fix-reproducible-build-failure.patch | 6 ++---- ...lib-log-logger_unittest_support.cc-do-not-write-.patch | 2 +- .../kea/files/fix-multilib-conflict.patch | 8 ++++---- meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch | 6 +++--- .../kea/{kea_2.4.0.bb => kea_2.4.1.bb} | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) rename meta/recipes-connectivity/kea/{kea_2.4.0.bb => kea_2.4.1.bb} (97%) 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 index 8a5bd00302..b0e44dae46 100644 --- 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 @@ -1,4 +1,4 @@ -From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001 +From 35e1dc4b46753143de029fad224b1f2ea292461e Mon Sep 17 00:00:00 2001 From: Sudip Mukherjee Date: Tue, 8 Aug 2023 19:03:13 +0100 Subject: [PATCH] kea: fix reproducible build failure @@ -14,6 +14,7 @@ Upstream has confirmed the patch will not be accepted but discussions with upstream is still going on, we might have a proper solution later. Signed-off-by: Sudip Mukherjee + --- src/bin/admin/kea-admin.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) @@ -57,6 +58,3 @@ index 034a0ee..8ab11ab 100644 # Check if the scripts directory exists at all. if [ ! -d ${upgrade_scripts_dir} ]; then --- -2.39.2 - diff --git a/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch b/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch index 94fbd12737..453e78a141 100644 --- a/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch +++ b/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch @@ -1,4 +1,4 @@ -From 841924e1fe8db2bff3eab8d37634ef08f86c00ec Mon Sep 17 00:00:00 2001 +From aa2c562a36aef4fd8cd3028ddfe0d32d4a9a61cc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 10 Nov 2020 15:57:03 +0000 Subject: [PATCH] src/lib/log/logger_unittest_support.cc: do not write build diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch index 451b409c88..7875cf1c00 100644 --- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch @@ -1,4 +1,4 @@ -From d027b1d85a8c1a0193b6e4a00083d3038d699a59 Mon Sep 17 00:00:00 2001 +From 1a58649fbf0f0f8db10ea40e68eb4ebbad532680 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 22 Sep 2020 15:02:33 +0800 Subject: [PATCH] There are conflict of config files between kea and lib32-kea: @@ -35,10 +35,10 @@ index e6ae8b8..50a3092 100644 // "param1": "foo" // } diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre -index 26bf163..49ddb0a 100644 +index 6edb8a1..b2a7385 100644 --- a/src/bin/keactrl/kea-dhcp4.conf.pre +++ b/src/bin/keactrl/kea-dhcp4.conf.pre -@@ -252,7 +252,7 @@ +@@ -255,7 +255,7 @@ // // of all devices serviced by Kea, including their identifiers // // (like MAC address), their location in the network, times // // when they were active etc. @@ -47,7 +47,7 @@ index 26bf163..49ddb0a 100644 // "parameters": { // "path": "/var/lib/kea", // "base-name": "kea-forensic4" -@@ -269,7 +269,7 @@ +@@ -272,7 +272,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. diff --git a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch index b7c2fd4f0d..87305e1da2 100644 --- a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch +++ b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch @@ -1,4 +1,4 @@ -From 18f4f6206c248d6169aa67b3ecf16bf54e9292e8 Mon Sep 17 00:00:00 2001 +From 8ecc12a3b03d2e8509c2cbcdbfe1ff71b6afcad2 Mon Sep 17 00:00:00 2001 From: Armin kuster Date: Wed, 14 Oct 2020 22:48:31 -0700 Subject: [PATCH] Busybox does not support ps -p so use pgrep @@ -13,10 +13,10 @@ Signed-off-by: Armin kuster 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in -index ae5bd8e..e9f9b73 100644 +index 450e997..c353ca9 100644 --- a/src/bin/keactrl/keactrl.in +++ b/src/bin/keactrl/keactrl.in -@@ -151,8 +151,8 @@ check_running() { +@@ -149,8 +149,8 @@ check_running() { # Get the PID from the PID file (if it exists) get_pid_from_file "${proc_name}" if [ ${_pid} -gt 0 ]; then diff --git a/meta/recipes-connectivity/kea/kea_2.4.0.bb b/meta/recipes-connectivity/kea/kea_2.4.1.bb similarity index 97% rename from meta/recipes-connectivity/kea/kea_2.4.0.bb rename to meta/recipes-connectivity/kea/kea_2.4.1.bb index 316468754e..c3aa4dc8f0 100644 --- a/meta/recipes-connectivity/kea/kea_2.4.0.bb +++ b/meta/recipes-connectivity/kea/kea_2.4.1.bb @@ -19,7 +19,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ file://0001-kea-fix-reproducible-build-failure.patch \ " -SRC_URI[sha256sum] = "3a33cd08dc3319ff544e6bbf2c0429042106f4051ebe115dc1bb2625c95003f7" +SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a" inherit autotools systemd update-rc.d upstream-version-is-even