mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 18:32:15 +02:00
util-linux: upgrade 2.38.1 -> 2.39.1
License-update: added bsd-2-clause
faeb1b64b3
(From OE-Core rev: 30b6031be6c9b7870f618391dd492834615b0aed)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
a193e855e0
commit
65bc175907
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -16,7 +16,15 @@ export PATH=$bindir/bin:$PATH
|
||||
# losetup tests will be skipped and/or fail otherwise
|
||||
modprobe loop
|
||||
|
||||
./tests/run.sh --use-system-commands --parsable --show-diff | sed -u '{
|
||||
# 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 /
|
||||
|
||||
# lsfd/option-inet has races in the test script:
|
||||
# https://github.com/util-linux/util-linux/issues/2399
|
||||
./tests/run.sh --use-system-commands --parsable --show-diff --exclude=lsfd/option-inet | sed -u '{
|
||||
s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/
|
||||
s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/
|
||||
s/^\(.*\):\(.*\) \.\.\. SKIPPED \(.*\)$/SKIP: \1:\2 \3/
|
||||
|
||||
Reference in New Issue
Block a user