8000 util-linux/util-linux-libuuid: upgrade from 2.40.4 to 2.41 · openembedded/openembedded-core@65f88db · GitHub
[go: up one dir, main page]
Skip to content

Commit 65f88db

Browse files
ChenQi1989rpurdie
ChenQi1989
authored and
rpurdie
committed
util-linux/util-linux-libuuid: upgrade from 2.40.4 to 2.41
License-Update: add EUPL-1.2. See util-linux/util-linux@74f3265 The run-ptest script is changed to use --builddir. This is because util-linux upstream does not have much priority on testing the --use-system-commands option. For example, with --use-system-commands, we have two failed test cases: kill/decode and lsfd/mkfds-foreign-sockets. With --builddir, all test cases succeed. I created PR for the kill/decode issue: util-linux/util-linux#3571. The root cause is obvious for kill/decode. But the root cause for lsfd/mkfds-foreign-sockets is not obvious, at least to me. So instead of spending time fixing test case issues for --use-system-commands, we'd better just use --builddir. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 parent d9d5ed2 commit 65f88db

10 files changed

+17
-218
lines changed

‎meta/recipes-core/util-linux/util-linux-libuuid_2.40.4.bb renamed to ‎meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# To allow util-linux to optionally build-depend on cryptsetup, libuuid is
2-
# split out of the main recipe, as it's needed by cryptsetup
3-
41
require util-linux.inc
52

63
inherit autotools gettext pkgconfig

‎meta/recipes-core/util-linux/util-linux.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,22 @@ disk partitioning, kernel message management, filesystem creation, and system lo
66

77
SECTION = "base"
88

9-
LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT"
9+
LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT & EUPL-1.2"
1010
LICENSE:${PN}-fcntl-lock = "MIT"
1111
LICENSE:${PN}-fdisk = "GPL-1.0-or-later"
1212
LICENSE:${PN}-libblkid = "LGPL-2.1-or-later"
1313
LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later"
1414
LICENSE:${PN}-libmount = "LGPL-2.1-or-later"
1515
LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later"
16+
LICENSE:${PN}-coresched 8000 = "EUPL-1.2"
1617

17-
LIC_FILES_CHKSUM = "file://README.licensing;md5=ddd58b6c94da86ff4f03e91208eb9cfc \
18+
LIC_FILES_CHKSUM = "file://README.licensing;md5=55e895a80bdd4ffc65e167a76d2e7569 \
1819
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
1920
file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
2021
file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
2122
file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \
2223
file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \
24+
file://Documentation/licenses/COPYING.EUPL-1.2;md5=c075d2767167a2355b23392018a1cbbd \
2325
file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \
2426
file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \
2527
file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \
@@ -38,10 +40,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
3840
file://display_testname_for_subtest.patch \
3941
file://avoid_parallel_tests.patch \
4042
file://fcntl-lock.c \
41-
file://0001-cfdisk-add-sector-size-commanand-line-option.patch \
42-
file://0002-sfdisk-add-sector-size-commanand-line-option.patch \
4343
"
4444

45-
SRC_URI[sha256sum] = "5c1daf733b04e9859afdc3bd87cc481180ee0f88b5c0946b16fdec931975fb79"
45+
SRC_URI[sha256sum] = "81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6"
4646

4747
CVE_PRODUCT = "util-linux"

‎meta/recipes-core/util-linux/util-linux/0001-cfdisk-add-sector-size-commanand-line-option.patch

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎meta/recipes-core/util-linux/util-linux/0002-sfdisk-add-sector-size-commanand-line-option.patch

Lines changed: 0 additions & 105 deletions
This file was deleted.

‎meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From da58b4150f6932de36c962ea657713bcf4ea44be Mon Sep 17 00:00:00 2001
1+
From 43030388e831642d36cb7b9d4b63755e9696714a Mon Sep 17 00:00:00 2001
22
From: Tudor Florea <tudor.florea@enea.com>
33
Date: Mon, 14 Jun 2021 14:00:31 +0200
44
Subject: [PATCH] util-linux: Add ptest
@@ -14,7 +14,7 @@ Upstream-Status: Inappropriate
1414
1 file changed, 1 insertion(+), 1 deletion(-)
1515

1616
diff --git a/configure.ac b/configure.ac
17-
index 651ef2b..2a8012e 100644
17+
index 43a23a5..4a84531 100644
1818
--- a/configure.ac
1919
+++ b/configure.ac
2020
@@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4])

‎meta/recipes-core/util-linux/util-linux/configure-sbindir.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0387d71516c978899cfd556ca512f530a212b4a9 Mon Sep 17 00:00:00 2001
1+
From 378998bf82e3b6ff46569077b29f95e72b734681 Mon Sep 17 00:00:00 2001
22
From: Phil Blundell <pb@pbcl.net>
33
Date: Mon, 24 Sep 2012 07:24:51 +0100
44
Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected
@@ -14,7 +14,7 @@ Upstream-Status: Inappropriate [configuration]
1414
1 file changed, 4 insertions(+), 1 deletion(-)
1515

1616
diff --git a/configure.ac b/configure.ac
17-
index 23594ff..651ef2b 100644
17+
index a5d9102..43a23a5 100644
1818
--- a/configure.ac
1919
+++ b/configure.ac
2020
@@ -110,7 +110,10 @@ AC_SUBST([runstatedir])

‎meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 45450d0339cd7ee27f53c0f2fac1cc74ed9bbfb8 Mon Sep 17 00:00:00 2001
1+
From 728c2abd889d225535008c3e7a1eef4b8a0aeea2 Mon Sep 17 00:00:00 2001
22
From: Tudor Florea <tudor.florea@enea.com>
33
Date: Thu, 3 Dec 2015 04:08:00 +0100
44
Subject: [PATCH] Display testname for subtest
@@ -10,10 +10,10 @@ Upstream-Status: Pending
1010
1 file changed, 1 insertion(+), 1 deletion(-)
1111

1212
diff --git a/tests/functions.sh b/tests/functions.sh
13-
index 5fe5ba0..a6c703e 100644
13+
index 1d7a425..b1f0986 100644
1414
--- a/tests/functions.sh
1515
+++ b/tests/functions.sh
16-
@@ -450,7 +450,7 @@ function ts_init_subtest {
16+
@@ -455,7 +455,7 @@ function ts_init_subtest {
1717

1818
if [ "$TS_PARSABLE" != "yes" ]; then
1919
[ $TS_NSUBTESTS -eq 1 ] && echo

‎meta/recipes-core/util-linux/util-linux/ptest.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f9be73c3e2b0a4f0923950dcb058be85d3ee8ed7 Mon Sep 17 00:00:00 2001
1+
From 18bf6aded9b2a75185ae4b23a41cd2e4322c5e31 Mon Sep 17 00:00:00 2001
22
From: Tudor Florea <tudor.florea@enea.com>
33
Date: Thu, 3 Dec 2015 04:08:00 +0100
44
Subject: [PATCH] Define TESTS variable
@@ -10,10 +10,10 @@ Upstream-Status: Pending
1010
1 file changed, 1 insertion(+)
1111

1212
diff --git a/Makefile.am b/Makefile.am
13-
index 50ab8d0..7e2340d 100644
13+
index 01e9970..c3313ff 100644
1414
--- a/Makefile.am
1515
+++ b/Makefile.am
16-
@@ -64,6 +64,7 @@ tmpfiles_DATA =
16+
@@ -66,6 +66,7 @@ sysusers_DATA =
1717
dist_bashcompletion_DATA =
1818
check_PROGRAMS =
1919
dis F438 t_check_SCRIPTS =

‎meta/recipes-core/util-linux/util-linux/run-ptest

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ if [ "x$UDEV_PID" != "x" ]; then
99
/etc/init.d/udev stop
1010
fi
1111

12-
current_path=$(readlink -f $0)
13-
export bindir=$(dirname $current_path)
14-
export PATH=$bindir/bin:$PATH
15-
1612
# losetup tests will be skipped and/or fail otherwise
1713
modprobe loop
1814

@@ -25,7 +21,7 @@ mount --make-shared /
2521
# lsfd/option-inet has races in the test script:
2622
# https://github.com/util-linux/util-linux/issues/2399
2723
# lsfd/mkfds-bpf* have issues with the gcc 15 upgrade
28-
./tests/run.sh --use-system-commands --parsable --show-diff --exclude='lsfd/option-inet lsfd/mkfds-bpf-map lsfd/mkfds-bpf-prog' | sed -u '{
24+
./tests/run.sh --builddir=@PTEST_PATH@ --parsable --show-diff --exclude='lsfd/option-inet lsfd/mkfds-bpf-map lsfd/mkfds-bpf-prog' | sed -u '{
2925
s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/
3026
s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/
3127
s/^\(.*\):\(.*\) \.\.\. SKIPPED \(.*\)$/SKIP: \1:\2 \3/

‎meta/recipes-core/util-linux/util-linux_2.40.4.bb renamed to ‎meta/recipes-core/util-linux/util-linux_2.41.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ do_install_ptest() {
355355
cp ${B}/config.h ${D}${PTEST_PATH}
356356

357357
sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest
358+
sed -i 's|@PTEST_PATH@|${PTEST_PATH}|g' ${D}${PTEST_PATH}/run-ptest
358359

359360
# chfn needs PAM
360361
if ! ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then

0 commit comments

Comments
 (0)
0