From patchwork Mon Jan 1 13:11:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 37193 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 01D31C48BEB for ; Mon, 1 Jan 2024 13:12:09 +0000 (UTC) Received: from a27-45.smtp-out.us-west-2.amazonses.com (a27-45.smtp-out.us-west-2.amazonses.com [54.240.27.45]) by mx.groups.io with SMTP id smtpd.web11.4629.1704114719584323553 for ; Mon, 01 Jan 2024 05:11:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=gvnH/HhL; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=CzwPPsg9; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.45, mailfrom: 0101018cc52707c0-d3732bac-632a-42c4-a8b6-165d82bfa202-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=1704114718; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=TzQhCLsiwBWPFPZvysmE8f0EZqe21E+BwKj5DudNpGo=; b=gvnH/HhLAXfCo83UKJdnktEvfjU6VlvjSTNql+coodS6uxkbrk+/N2qv9W2uzJx+ bCXG8CXTpugaTDbTgpwxHJ/8JP/NK4HeApPWwkzRH/QwkvilNKvC8iD83PXAYvknHvj KcxTphaFpyr9rLrG/gHf1Iz7XHPNW2rJ8Nwo+5Tk= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1704114718; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=TzQhCLsiwBWPFPZvysmE8f0EZqe21E+BwKj5DudNpGo=; b=CzwPPsg9/6lKf3mADqyxXIiNnEN1tQ0IcyCrAl69gYnMGWUx2ou8a6QyBMRkGfOi XFvp+wa7CSbSqgj4mnNm88i8+SzptYo/hK+c11jKrXBWY42/4iiVtj7RjPR+DAovA3o ssyMr60qHO7iaL/+uVnHazJBWfwD3ouUjwO5gCHo= MIME-Version: 1.0 From: auh@yoctoproject.org To: Chen Qi Cc: openembedded-core@lists.openembedded.org Subject: [AUH] util-linux-libuuid: upgrading to 2.39.3 FAILED Message-ID: <0101018cc52707c0-d3732bac-632a-42c4-a8b6-165d82bfa202-000000@us-west-2.amazonses.com> Date: Mon, 1 Jan 2024 13:11:58 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.01.01-54.240.27.45 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 ; Mon, 01 Jan 2024 13:12:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193118 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *util-linux-libuuid* to *2.39.3* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-util-linux-libuuid-upgrade-2.39.2-2.39.3.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 42ae2724b9c8c6ff8c83baab652bebad5214a753 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 1 Jan 2024 05:44:28 +0000 Subject: [PATCH] util-linux-libuuid: upgrade 2.39.2 -> 2.39.3 --- ...2.39.2.bb => util-linux-libuuid_2.39.3.bb} | 29 ++++++++++++++ meta/recipes-core/util-linux/util-linux.inc | 5 +-- ...ls-include-libgen.h-for-basename-API.patch | 9 +++-- ...Use-4K-buffer-size-instead-of-BUFSIZ.patch | 38 ------------------- .../util-linux/avoid_parallel_tests.patch | 4 +- .../util-linux/configure-sbindir.patch | 19 +++++++--- .../display_testname_for_subtest.patch | 12 +++--- .../util-linux/util-linux/ptest.patch | 4 +- 8 files changed, 61 insertions(+), 59 deletions(-) rename meta/recipes-core/util-linux/{util-linux-libuuid_2.39.2.bb => util-linux-libuuid_2.39.3.bb} (30%) delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.39.3.bb similarity index 30% rename from meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb rename to meta/recipes-core/util-linux/util-linux-libuuid_2.39.3.bb index 5d759aed94..687e4327c8 100644 --- a/meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb +++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.39.3.bb @@ -1,3 +1,32 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- README.licensing +# +++ README.licensing +# @@ -2,11 +2,13 @@ +# The project util-linux doesn't use the same license for all of the code. +# There is code under: +# +# - * GPL-3.0-or-later - GNU General Public License version 3, or any later version +# + * GPL-1.0-or-later - GNU General Public License version 1, or any later version +# + +# + * GPL-2.0 - GNU General Public License version 2 +# +# * GPL-2.0-or-later - GNU General Public License version 2, or any later version +# +# - * GPL-2.0 - GNU General Public License version 2 +# + * GPL-3.0-or-later - GNU General Public License version 3, or any later version +# +# * LGPL-2.1-or-later - GNU Lesser General Public License 2.1 or any later version +# +# +# + # To allow util-linux to optionally build-depend on cryptsetup, libuuid is # split out of the main recipe, as it's needed by cryptsetup diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e3bef5acfc..044d9861de 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -12,7 +12,7 @@ LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" LICENSE:${PN}-libmount = "LGPL-2.1-or-later" LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://README.licensing;md5=12ae7768a65ec8f2e44d930df9cb43fa \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=6b0e0a2320e66e62eef9b8149a6faec4 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -35,8 +35,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch \ file://0001-login-utils-include-libgen.h-for-basename-API.patch \ " -SRC_URI[sha256sum] = "87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f" +SRC_URI[sha256sum] = "7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f" diff --git a/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch b/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch index 2b9897ade1..7fca689583 100644 --- a/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch +++ b/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch @@ -1,4 +1,4 @@ -From 6581cf8ac95b99b5a35fea88c52646558d05b5e7 Mon Sep 17 00:00:00 2001 +From 2b63e0aae67b8c00217300b9b7b3e0fc1db886a4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Dec 2023 19:59:46 -0800 Subject: [PATCH] login-utils: include libgen.h for basename API @@ -17,10 +17,13 @@ Fixes Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2615] Signed-off-by: Khem Raj + --- - login-utils/su-common.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + login-utils/su-common.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) +diff --git a/login-utils/su-common.c b/login-utils/su-common.c +index b674920..3297c78 100644 --- a/login-utils/su-common.c +++ b/login-utils/su-common.c @@ -26,6 +26,7 @@ diff --git a/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch b/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch deleted file mode 100644 index 4d7487c4f7..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 95b0405338440cf5cd6d4b2b5c66cda8bf381b28 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 15 Sep 2023 00:18:18 -0700 -Subject: [PATCH] lscpu: Use 4K buffer size instead of BUFSIZ - -Some lines in /proc/cpuinfo can be large e.g. flags and can then -truncate them in displaying them - -BUFSIZ can vary quite a bit e.g. glibc/linux systems its 8192 -but on musl/linux and OSX its 1024, on mingW it is 256, some tests e.g. -x86_64-64cpu-linux6.2.tar.gz has added really long line for cpu flags -line which is greater than 1024 characters and hence this test fails -on musl because lscpu -s reports truncated string - -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2492] -Signed-off-by: Khem Raj ---- - sys-utils/lscpu-cputype.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c -index 3fd5f7a3c..c8f72ab8a 100644 ---- a/sys-utils/lscpu-cputype.c -+++ b/sys-utils/lscpu-cputype.c -@@ -462,7 +462,9 @@ static int cpuinfo_parse_cache(struct lscpu_cxt *cxt, int keynum, char *data) - int lscpu_read_cpuinfo(struct lscpu_cxt *cxt) - { - FILE *fp; -- char buf[BUFSIZ]; -+ /* Used to be BUFSIZ which is small on some platforms e.g, musl, -+ * therefore hardcode to 4K */ -+ char buf[4096]; - size_t i; - struct lscpu_cputype *ct; - struct cpuinfo_parser _pr = { .cxt = cxt }, *pr = &_pr; --- -2.42.0 - diff --git a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch index f1cbdb3beb..d027b4d11e 100644 --- a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch +++ b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From ee3c7812e1efa6719af68b994804f0e6caceabd8 Mon Sep 17 00:00:00 2001 +From 989f04be9f9e59eb9c8234503ecd81cc9c2ec67e Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Mon, 14 Jun 2021 14:00:31 +0200 Subject: [PATCH] util-linux: Add ptest @@ -15,7 +15,7 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 5664f9f..075ef27 100644 +index 890212f..870e817 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4]) diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch index e475289f65..916dda3232 100644 --- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch @@ -1,3 +1,8 @@ +From 9196bd921e08b97f87549f89f75fb9eb48b6b850 Mon Sep 17 00:00:00 2001 +From: Phil Blundell +Date: Mon, 24 Sep 2012 07:24:51 +0100 +Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected + util-linux: take ${sbindir} from the environment if it is set there fix the test, the [ ] syntax was getting eaten by autoconf @@ -5,11 +10,15 @@ Signed-off-by: Phil Blundell Signed-off-by: Saul Wold +Date: Thu, 3 Dec 2015 04:08:00 +0100 +Subject: [PATCH] Display testname for subtest Signed-off-by: Tudor Florea Upstream-Status: Pending @@ -8,10 +11,10 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functions.sh b/tests/functions.sh -index 5246605..b24dc15 100644 +index 5a562a3..098145e 100644 --- a/tests/functions.sh +++ b/tests/functions.sh -@@ -320,7 +320,7 @@ function ts_init_subtest { +@@ -437,7 +437,7 @@ function ts_init_subtest { if [ "$TS_PARSABLE" != "yes" ]; then [ $TS_NSUBTESTS -eq 1 ] && echo @@ -20,6 +23,3 @@ index 5246605..b24dc15 100644 fi } --- -2.8.3 - diff --git a/meta/recipes-core/util-linux/util-linux/ptest.patch b/meta/recipes-core/util-linux/util-linux/ptest.patch index ba2bd3f6ac..dff2900665 100644 --- a/meta/recipes-core/util-linux/util-linux/ptest.patch +++ b/meta/recipes-core/util-linux/util-linux/ptest.patch @@ -1,4 +1,4 @@ -From af073c13ef184ca75811df688e0a0a25827b36c3 Mon Sep 17 00:00:00 2001 +From bdb7f4ec2c32250b0c5245f4a33c5d15881ff977 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 3 Dec 2015 04:08:00 +0100 Subject: [PATCH] Define TESTS variable @@ -11,7 +11,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am -index 886598d..1cf4346 100644 +index effbb02..7d2bd1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ systemdsystemunit_DATA =