From patchwork Fri Jun 16 03:51:21 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: 25797 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 98D8AC2FC04 for ; Fri, 16 Jun 2023 03:51:29 +0000 (UTC) Received: from a27-29.smtp-out.us-west-2.amazonses.com (a27-29.smtp-out.us-west-2.amazonses.com [54.240.27.29]) by mx.groups.io with SMTP id smtpd.web10.816.1686887482516053385 for ; Thu, 15 Jun 2023 20:51:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=AbKUXP9L; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.29, mailfrom: 01010188c254416b-8c1bf31d-fd0e-483d-9b79-015ef030ff7d-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=1686887481; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=X47lsAHHUcluwuTE+LhegzGVX27u1EI7N2T2sRLC+rU=; b=AbKUXP9LJOXSbu0m90Q2Oiq68Vg5cePvEu9eWlpHlpheqVe/sj86H9Tt1mGF0qIP bTrYA60bdVM5XD74hgl0JOJDL59QhkCCNI8sEVZnluq+4ZjzhKK9DeHbz7B9N9DfznH CGtrh5i9JB85j6Utcq2ZqdoTaCmmoubljQE2y6TA= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1686887481; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=X47lsAHHUcluwuTE+LhegzGVX27u1EI7N2T2sRLC+rU=; b=jeHTVGphuCrBsO6XC2QLr3SIDQy9AvZGcCiTMrmMEKwSquHfgHMLvUjLwqOIJh0j 4P3P9NNHSXZo418OZuQnLeT1VWwnQDo5m+cahf/M8LGEpnWPJwYoa1LiT5mU7DiioOJ QnjTcwhaNtqhq7tZiPQlIsRn7IitAmTa11RCSyg4= MIME-Version: 1.0 From: auh@yoctoproject.org To: Chen Qi Cc: openembedded-core@lists.openembedded.org Subject: [AUH] util-linux: upgrading to 2.39 FAILED Message-ID: <01010188c254416b-8c1bf31d-fd0e-483d-9b79-015ef030ff7d-000000@us-west-2.amazonses.com> Date: Fri, 16 Jun 2023 03:51:21 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.06.16-54.240.27.29 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, 16 Jun 2023 03:51:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/182901 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *util-linux* to *2.39* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-util-linux-upgrade-2.38.1-2.39.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 6e95cf5c28a8992f4649e8f7840963e0d79f4fe0 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 15 Jun 2023 08:04:42 +0000 Subject: [PATCH] util-linux: upgrade 2.38.1 -> 2.39 --- meta/recipes-core/util-linux/util-linux.inc | 8 ++- .../0001-check-for-sys-pidfd.h.patch | 53 ------------------- ...configure.ac-Improve-check-for-magic.patch | 40 -------------- ...til-linux_2.38.1.bb => util-linux_2.39.bb} | 22 ++++++++ 4 files changed, 25 insertions(+), 98 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-check-for-sys-pidfd.h.patch delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-configure.ac-Improve-check-for-magic.patch rename meta/recipes-core/util-linux/{util-linux_2.38.1.bb => util-linux_2.39.bb} (95%) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 3868b1c41d..204ad020b9 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=0fd5c050c6187d2bf0a4492b7f4e33da \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=12ae7768a65ec8f2e44d930df9cb43fa \ 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 \ @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ file://libfdisk/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ -" + " FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" @@ -35,8 +35,6 @@ 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-check-for-sys-pidfd.h.patch \ - file://0001-configure.ac-Improve-check-for-magic.patch \ " -SRC_URI[sha256sum] = "60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f" +SRC_URI[sha256sum] = "32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb" diff --git a/meta/recipes-core/util-linux/util-linux/0001-check-for-sys-pidfd.h.patch b/meta/recipes-core/util-linux/util-linux/0001-check-for-sys-pidfd.h.patch deleted file mode 100644 index 19f57f14bc..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-check-for-sys-pidfd.h.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 548bc568f3c735e53fb5b0a5ab6473a3f1457b91 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 7 Aug 2022 14:39:19 -0700 -Subject: [PATCH] check for sys/pidfd.h - -This header in newer glibc defines the signatures of functions -pidfd_send_signal() and pidfd_open() and when these functions are -defined by libc then we need to include the relevant header to get -the definitions. Clang 15+ has started to error out when function -signatures are missing. - -Fixes errors like -misc-utils/kill.c:402:6: error: call to undeclared function 'pidfd_send_signal'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - if (pidfd_send_signal(pfd, ctl->numsig, &info, 0) < 0) - -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/1769] -Signed-off-by: Khem Raj ---- - configure.ac | 1 + - include/pidfd-utils.h | 4 +++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a511e93de..fd7d9245f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -342,6 +342,7 @@ AC_CHECK_HEADERS([ \ - sys/mkdev.h \ - sys/mount.h \ - sys/param.h \ -+ sys/pidfd.h \ - sys/prctl.h \ - sys/resource.h \ - sys/sendfile.h \ -diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h -index eddede976..d9e33cbc5 100644 ---- a/include/pidfd-utils.h -+++ b/include/pidfd-utils.h -@@ -4,8 +4,10 @@ - #ifdef HAVE_SYS_SYSCALL_H - # include - # if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open) -+# ifdef HAVE_SYS_PIDFD_H -+# include -+# endif - # include -- - # ifndef HAVE_PIDFD_SEND_SIGNAL - static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, - unsigned int flags) --- -2.37.1 - diff --git a/meta/recipes-core/util-linux/util-linux/0001-configure.ac-Improve-check-for-magic.patch b/meta/recipes-core/util-linux/util-linux/0001-configure.ac-Improve-check-for-magic.patch deleted file mode 100644 index 00611fe578..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-configure.ac-Improve-check-for-magic.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 263381ddd46eea2293c70bc811273b66bc52087b Mon Sep 17 00:00:00 2001 -From: Mateusz Marciniec -Date: Fri, 19 Aug 2022 14:47:49 +0200 -Subject: [PATCH] configure.ac: Improve check for magic - -Check whether magic.h header exists before defining HAVE_MAGIC. - -Despite library availability there still can be missing header. -Current test doesn't cover that possibility which will lead compilation -to fail in case of separate sysroot. - -Upstream-Status: Backport -[https://github.com/util-linux/util-linux/commit/263381ddd46eea2293c70bc811273b66bc52087b] - -Signed-off-by: Mateusz Marciniec -Signed-off-by: Tomasz Dziendzielski ---- - configure.ac | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index daa8f0dca..968a0daf0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1570,8 +1570,10 @@ AC_ARG_WITH([libmagic], - ) - AS_IF([test "x$with_libmagic" = xno], [have_magic=no], [ - AC_CHECK_LIB([magic], [magic_open], [ -- AC_DEFINE([HAVE_MAGIC], [1], [Define to 1 if you have the libmagic present.]) -- MAGIC_LIBS="-lmagic" -+ AC_CHECK_HEADER(magic.h, [ -+ AC_DEFINE([HAVE_MAGIC], [1], [Define to 1 if you have the libmagic present.]) -+ MAGIC_LIBS="-lmagic" -+ ]) - ]) - ]) - AC_SUBST([MAGIC_LIBS]) --- -2.37.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.38.1.bb b/meta/recipes-core/util-linux/util-linux_2.39.bb similarity index 95% rename from meta/recipes-core/util-linux/util-linux_2.38.1.bb rename to meta/recipes-core/util-linux/util-linux_2.39.bb index 9ea7a04e8a..e8f8a42dab 100644 --- a/meta/recipes-core/util-linux/util-linux_2.38.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.39.bb @@ -1,3 +1,25 @@ +# 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 +# @@ -9,6 +9,8 @@ +# * GPL-2.0 - GNU General Public License version 2 +# +# * LGPL-2.1-or-later - GNU Lesser General Public License 2.1 or any later version +# + +# + * BSD-2-Clause - Simplified BSD License +# +# * BSD-3-Clause - BSD 3-Clause "New" or "Revised" License +# +# +# + require util-linux.inc #gtk-doc is not enabled as it requires xmlto which requires util-linux