From mboxrd@z Thu Jan 1 00:00:00 1970 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 378A2C001DE for ; Fri, 28 Jul 2023 13:13:27 +0000 (UTC) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by mx.groups.io with SMTP id smtpd.web10.31794.1690550000389155654 for ; Fri, 28 Jul 2023 06:13:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=mxPYdM+4; spf=pass (domain: bootlin.com, ip: 217.70.183.193, mailfrom: alexandre.belloni@bootlin.com) Received: by mail.gandi.net (Postfix) with ESMTPSA id 084D224000C; Fri, 28 Jul 2023 13:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1690549998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=15zbLbkWVDr1A0I+m02N/Jw2vfNZ/IzrnYxNkunRBw4=; b=mxPYdM+4/vPQO2e6nsQHuUQ0VaPBdJBuTESTVY6cT6ZyYJtI8N5TD5oCzt4s46SFWLQfHz EKa0ZztinF7usCN+NCqhEiFNgHC69zgTZiezxGZVelxjm7z6A8VNQRcfQjdgyghMJhxQ8C cLfZmoHcPR6OB65LImg6FNs9JjyIiBzMC78Br7hj7uSj9B20X/EAwh7Wumh1bRjpJKI7Qh VHDXVlDjm+TAWQWTtNISiwkD3oKXCLgEylz3siQuhqGDvqWzmCEqSoK5IFpaclgzGIjV7Y SVsUyavfGOcbUs4MX2VEO4PZC9W1hYrwT6t2oUdczOc8CE+ojn+Td9De9qpg/g== Date: Fri, 28 Jul 2023 15:13:17 +0200 From: Alexandre Belloni To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org, Alexander Kanavin Subject: Re: [OE-core] [PATCH 12/21] util-linux: upgrade 2.38.1 -> 2.39.1 Message-ID: <20230728131317ca8fba29@mail.local> References: <20230727143627.3718496-1-alex@linutronix.de> <20230727143627.3718496-12-alex@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230727143627.3718496-12-alex@linutronix.de> X-GND-Sasl: alexandre.belloni@bootlin.com 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, 28 Jul 2023 13:13:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/185029 Hello, I got a new ptest failure twice with this patch: 'util-linux': ['lsfd:_--inet_option'] I don't see it on your run, I'm wondering what is in my branch that causes it. On 27/07/2023 16:36:18+0200, Alexander Kanavin wrote: > License-update: added bsd-2-clause > https://github.com/util-linux/util-linux/commit/faeb1b64b36ededd1a0b62555cad65f002d47ac6 > > Signed-off-by: Alexander Kanavin > --- > ...2.38.1.bb => util-linux-libuuid_2.39.1.bb} | 0 > meta/recipes-core/util-linux/util-linux.inc | 10 ++-- > .../0001-check-for-sys-pidfd.h.patch | 53 ------------------- > ...configure.ac-Improve-check-for-magic.patch | 40 -------------- > .../util-linux/util-linux/run-ptest | 6 +++ > ...l-linux_2.38.1.bb => util-linux_2.39.1.bb} | 0 > 6 files changed, 10 insertions(+), 99 deletions(-) > rename meta/recipes-core/util-linux/{util-linux-libuuid_2.38.1.bb => util-linux-libuuid_2.39.1.bb} (100%) > 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.1.bb} (100%) > > diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.38.1.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.39.1.bb > similarity index 100% > rename from meta/recipes-core/util-linux/util-linux-libuuid_2.38.1.bb > rename to meta/recipes-core/util-linux/util-linux-libuuid_2.39.1.bb > diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc > index 3868b1c41d3..99ce2a24b0a 100644 > --- a/meta/recipes-core/util-linux/util-linux.inc > +++ b/meta/recipes-core/util-linux/util-linux.inc > @@ -6,13 +6,13 @@ disk partitioning, kernel message management, filesystem creation, and system lo > > SECTION = "base" > > -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & BSD-3-Clause & BSD-4-Clause" > +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause" > LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" > 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] = "890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b" > 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 19f57f14bc7..00000000000 > --- 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 00611fe5788..00000000000 > --- 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/run-ptest b/meta/recipes-core/util-linux/util-linux/run-ptest > index 097107cd095..e25e9d10823 100644 > --- a/meta/recipes-core/util-linux/util-linux/run-ptest > +++ b/meta/recipes-core/util-linux/util-linux/run-ptest > @@ -16,6 +16,12 @@ export PATH=$bindir/bin:$PATH > # losetup tests will be skipped and/or fail otherwise > modprobe loop > > +# required for mount/fallback test to pass > +# systemd does this by default, but ptest images do not use it > +# see https://man7.org/linux/man-pages/man7/mount_namespaces.7.html > +# for a long description of mount namespaces in Linux > +mount --make-shared / > + > ./tests/run.sh --use-system-commands --parsable --show-diff | sed -u '{ > s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/ > s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/ > diff --git a/meta/recipes-core/util-linux/util-linux_2.38.1.bb b/meta/recipes-core/util-linux/util-linux_2.39.1.bb > similarity index 100% > rename from meta/recipes-core/util-linux/util-linux_2.38.1.bb > rename to meta/recipes-core/util-linux/util-linux_2.39.1.bb > -- > 2.30.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#184951): https://lists.openembedded.org/g/openembedded-core/message/184951 > Mute This Topic: https://lists.openembedded.org/mt/100391613/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com