From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Trevor Gamblin <tgamblin@baylibre.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core][PATCH v2] util-linux: upgrade 2.38.1 -> 2.39
Date: Fri, 9 Jun 2023 00:41:06 +0200 [thread overview]
Message-ID: <202306082241067d52a916@mail.local> (raw)
In-Reply-To: <20230606204249afd53fbb@mail.local>
On 06/06/2023 22:42:49+0200, Alexandre Belloni wrote:
> Hello,
>
> This causes multiple failures:
>
> Mips and ppc:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/7198/steps/12/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/7196/steps/13/logs/stdio
>
> | mips-poky-linux-gcc -meb -mabi=32 -mhard-float -march=mips32r2 -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 --sysroot=/home/pokybuild/yocto-worker/qemumips/build/build/tmp/work/mips32r2-poky-linux/util-linux/2.39-r0/recipe-sysroot -DHAVE_CONFIG_H -I. -I../util-linux-2.39 -include config.h -I../util-linux-2.39/include -DLOCALEDIR=\"/usr/share/locale\" -D_PATH_RUNSTATEDIR=\"/run\" -D_PATH_SYSCONFSTATICDIR=\"/usr/lib\" -fsigned-char -fno-common -Wall -Wextra -Waddress-of-packed-member -Wdiscarded-qualifiers -Wformat-security -Wimplicit-function-declaration -Wmissing-declarations -Wmissing-parameter-type -Wmissing-prototypes -Wnested-externs -Wno-missing-field-initializers -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wsign-compare -Wstrict-prototypes -Wtype-limits -Wuninitialized -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-parameter -Wunused-result -Wunused-variable -Werror=sequence-point -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map -fmacro-prefix-map=/home/pokybuild/yocto-worker/qemumips/build/build/tmp/work/mips32r2-poky-linux/util-linux/2.39-r0/util-linux-2.39=/usr/src/debug/util-linux/2.39-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/qemumips/build/build/tmp/work/mips32r2-poky-linux/util-linux/2.39-r0/util-linux-2.39=/usr/src/debug/util-linux/2.39-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/qemumips/build/build/tmp/work/mips32r2-poky-linux/util-linux/2.39-r0/build=/usr/src/debug/util-linux/2.39-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/qemumips/build/build/tmp/work/mips32r2-poky-linux/util-linux/2.39-r0/build=/usr/src/debug/util-linux/2.39-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/qemumips/build/build/tmp/work/mips32r2-poky-linux/util-linux/2.39-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/qemumips/build/build/tmp/work/mips32r2-poky-linux/util-linux/2.39-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/qemumips/build/build/tmp/work/mips32r2-poky-linux/util-linux/2.39-r0/recipe-sysroot-native= -c -o tests/helpers/test_enosys.o ../util-linux-2.39/tests/helpers/test_enosys.c
> | ../util-linux-2.39/tests/helpers/test_enosys.c:57:6: error: #error Unknown target architecture
> | 57 | # error Unknown target architecture
> | | ^~~~~
> | make: *** [Makefile:10075: tests/helpers/test_enosys.o] Error 1
> | ERROR: oe_runmake failed
>
>
> oe-selftest:
>
> 2023-06-05 23:49:03,868 - oe-selftest - INFO - incompatible_lic.NoGPL3InImagesTests.test_core_image_full_cmdline_weston (subunit.RemotedTestCase)
> 2023-06-05 23:49:03,870 - oe-selftest - INFO - ... FAIL
>
> ERROR: core-image-weston-1.0-r0 do_rootfs: Package util-linux-sulogin cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/oe-selftest-debian/build/build-st-2841616/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0-r0/temp/log.do_rootfs.428774
> NOTE: recipe core-image-weston-1.0-r0: task do_rootfs: Failed
> ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-graphics/images/core-image-weston.bb:do_rootfs) failed with exit code '1'
> ERROR: core-image-full-cmdline-1.0-r0 do_rootfs: Package util-linux cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/oe-selftest-debian/build/build-st-2841616/tmp/work/qemux86_64-poky-linux/core-image-full-cmdline/1.0-r0/temp/log.do_rootfs.554152
> NOTE: recipe core-image-full-cmdline-1.0-r0: task do_rootfs: Failed
> ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-extended/images/core-image-full-cmdline.bb:do_rootfs) failed with exit code '1'
>
>
Also, new ptest failures:
{'util-linux': ['lsfd:_--inet_option',
'mount:_fstab-fallback:_[04]_subdir',
'mount:_fstab-fallback']}
> On 02/06/2023 10:41:24-0400, Trevor Gamblin wrote:
> > util-linux's ChangeLog file simply points to the git log, and there are
> > numerous changes between 2.38.1 and 2.39:
> >
> > https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/log
> >
> > There is a notable license change - README.licensing adds the
> > BSD-2-Clause variant between these versions, but there is no
> > corresponding file in Documentation/licenses; it's been added it under
> > LICENSE in the recipe along with a reference to the common-licenses
> > version. The README.licensing file also lists GPL-3.0-or-later for
> > some of the code, so add it as well and include a checksum.
> >
> > Two patches were removed since they're included in 2.39 upstream.
> >
> > Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
> > ---
> > v2 properly deletes the two patch files instead of simply removing them
> > from the recipe.
> > ...d_2.38.1.bb => util-linux-libuuid_2.39.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 --------------
> > ...til-linux_2.38.1.bb => util-linux_2.39.bb} | 0
> > 5 files changed, 5 insertions(+), 98 deletions(-)
> > rename meta/recipes-core/util-linux/{util-linux-libuuid_2.38.1.bb => util-linux-libuuid_2.39.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.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.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.bb
> > diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> > index 3868b1c41d..f9e6fb7d21 100644
> > --- a/meta/recipes-core/util-linux/util-linux.inc
> > +++ b/meta/recipes-core/util-linux/util-linux.inc
> > @@ -6,16 +6,18 @@ 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-3.0-or-later & 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-3.0-or-later;md5=1ebbd3e34237af26da5dc08a4e440464 \
> > file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> > file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
> > + file://${COREBASE}/meta/files/common-licenses/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \
> > file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \
> > file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \
> > file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \
> > @@ -35,8 +37,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 <raj.khem@gmail.com>
> > -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 <raj.khem@gmail.com>
> > ----
> > - 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 <sys/syscall.h>
> > - # if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open)
> > -+# ifdef HAVE_SYS_PIDFD_H
> > -+# include <sys/pidfd.h>
> > -+# endif
> > - # include <sys/types.h>
> > --
> > - # 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 <mateuszmar2@gmail.com>
> > -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 <mateuszmar2@gmail.com>
> > -Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
> > ----
> > - 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 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.bb
> > --
> > 2.40.1
> >
>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#182333): https://lists.openembedded.org/g/openembedded-core/message/182333
> > Mute This Topic: https://lists.openembedded.org/mt/99287629/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
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2023-06-08 22:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 14:41 [OE-core][PATCH v2] util-linux: upgrade 2.38.1 -> 2.39 Trevor Gamblin
2023-06-06 20:42 ` Alexandre Belloni
2023-06-08 22:41 ` Alexandre Belloni [this message]
2023-06-09 15:21 ` Ross Burton
2023-06-09 15:44 ` Trevor Gamblin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202306082241067d52a916@mail.local \
--to=alexandre.belloni@bootlin.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=tgamblin@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.