diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2024-01-03 12:42:06 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-09 22:59:28 +0000 |
commit | cf7152a4cb4c5796de79ade23f348b431a81f544 (patch) | |
tree | 1b24056d0a44354f83ed306ed8648a871b7049b0 | |
parent | 070aa227057e4913cf77c2465393a5a8398d5641 (diff) | |
download | poky-cf7152a4cb4c5796de79ade23f348b431a81f544.tar.gz |
util-linux/util-linux-libuuid: ugprade from 2.39.2 to 2.39.3
License-Update:
===============
GPL-1.0-or-later is added. fdisk.c is licensed under it.
0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch is dropped as
it's been in the new version.
(From OE-Core rev: 9a0bd46e6988b2da446f89864131639dde63c6d0)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-libuuid_2.39.3.bb (renamed from meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 8 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch | 9 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch | 38 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch | 4 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/configure-sbindir.patch | 19 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch | 12 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/ptest.patch | 4 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.39.3.bb (renamed from meta/recipes-core/util-linux/util-linux_2.39.2.bb) | 0 |
9 files changed, 34 insertions, 60 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.39.3.bb index 5d759aed94..5d759aed94 100644 --- a/meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb +++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.39.3.bb | |||
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e3bef5acfc..4e9d22f269 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -6,13 +6,14 @@ disk partitioning, kernel message management, filesystem creation, and system lo | |||
6 | 6 | ||
7 | SECTION = "base" | 7 | SECTION = "base" |
8 | 8 | ||
9 | LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause" | 9 | LICENSE = "GPL-1.0-or-later & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause" |
10 | LICENSE:${PN}-fdisk = "GPL-1.0-or-later" | ||
10 | LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" | 11 | LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" |
11 | LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" | 12 | LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" |
12 | LICENSE:${PN}-libmount = "LGPL-2.1-or-later" | 13 | LICENSE:${PN}-libmount = "LGPL-2.1-or-later" |
13 | LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" | 14 | LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" |
14 | 15 | ||
15 | LIC_FILES_CHKSUM = "file://README.licensing;md5=12ae7768a65ec8f2e44d930df9cb43fa \ | 16 | LIC_FILES_CHKSUM = "file://README.licensing;md5=6b0e0a2320e66e62eef9b8149a6faec4 \ |
16 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 17 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
17 | file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 18 | file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
18 | file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ | 19 | file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ |
@@ -35,8 +36,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin | |||
35 | file://run-ptest \ | 36 | file://run-ptest \ |
36 | file://display_testname_for_subtest.patch \ | 37 | file://display_testname_for_subtest.patch \ |
37 | file://avoid_parallel_tests.patch \ | 38 | file://avoid_parallel_tests.patch \ |
38 | file://0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch \ | ||
39 | file://0001-login-utils-include-libgen.h-for-basename-API.patch \ | 39 | file://0001-login-utils-include-libgen.h-for-basename-API.patch \ |
40 | " | 40 | " |
41 | 41 | ||
42 | SRC_URI[sha256sum] = "87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f" | 42 | SRC_URI[sha256sum] = "7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f" |
diff --git a/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch b/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch index 2b9897ade1..6258710e1e 100644 --- a/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch +++ b/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6581cf8ac95b99b5a35fea88c52646558d05b5e7 Mon Sep 17 00:00:00 2001 | 1 | From d44e3ad1f6f8b5c1b3098bb7d537943a4c21d22f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 3 Dec 2023 19:59:46 -0800 | 3 | Date: Sun, 3 Dec 2023 19:59:46 -0800 |
4 | Subject: [PATCH] login-utils: include libgen.h for basename API | 4 | Subject: [PATCH] login-utils: include libgen.h for basename API |
@@ -17,10 +17,13 @@ Fixes | |||
17 | 17 | ||
18 | Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2615] | 18 | Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2615] |
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
20 | |||
20 | --- | 21 | --- |
21 | login-utils/su-common.c | 8 ++++++-- | 22 | login-utils/su-common.c | 10 +++++++--- |
22 | 1 file changed, 6 insertions(+), 2 deletions(-) | 23 | 1 file changed, 7 insertions(+), 3 deletions(-) |
23 | 24 | ||
25 | diff --git a/login-utils/su-common.c b/login-utils/su-common.c | ||
26 | index b674920..3297c78 100644 | ||
24 | --- a/login-utils/su-common.c | 27 | --- a/login-utils/su-common.c |
25 | +++ b/login-utils/su-common.c | 28 | +++ b/login-utils/su-common.c |
26 | @@ -26,6 +26,7 @@ | 29 | @@ -26,6 +26,7 @@ |
diff --git a/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch b/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch deleted file mode 100644 index 4d7487c4f7..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 95b0405338440cf5cd6d4b2b5c66cda8bf381b28 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 15 Sep 2023 00:18:18 -0700 | ||
4 | Subject: [PATCH] lscpu: Use 4K buffer size instead of BUFSIZ | ||
5 | |||
6 | Some lines in /proc/cpuinfo can be large e.g. flags and can then | ||
7 | truncate them in displaying them | ||
8 | |||
9 | BUFSIZ can vary quite a bit e.g. glibc/linux systems its 8192 | ||
10 | but on musl/linux and OSX its 1024, on mingW it is 256, some tests e.g. | ||
11 | x86_64-64cpu-linux6.2.tar.gz has added really long line for cpu flags | ||
12 | line which is greater than 1024 characters and hence this test fails | ||
13 | on musl because lscpu -s reports truncated string | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2492] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | sys-utils/lscpu-cputype.c | 4 +++- | ||
19 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c | ||
22 | index 3fd5f7a3c..c8f72ab8a 100644 | ||
23 | --- a/sys-utils/lscpu-cputype.c | ||
24 | +++ b/sys-utils/lscpu-cputype.c | ||
25 | @@ -462,7 +462,9 @@ static int cpuinfo_parse_cache(struct lscpu_cxt *cxt, int keynum, char *data) | ||
26 | int lscpu_read_cpuinfo(struct lscpu_cxt *cxt) | ||
27 | { | ||
28 | FILE *fp; | ||
29 | - char buf[BUFSIZ]; | ||
30 | + /* Used to be BUFSIZ which is small on some platforms e.g, musl, | ||
31 | + * therefore hardcode to 4K */ | ||
32 | + char buf[4096]; | ||
33 | size_t i; | ||
34 | struct lscpu_cputype *ct; | ||
35 | struct cpuinfo_parser _pr = { .cxt = cxt }, *pr = &_pr; | ||
36 | -- | ||
37 | 2.42.0 | ||
38 | |||
diff --git a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch index f1cbdb3beb..85ad7a5575 100644 --- a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch +++ b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ee3c7812e1efa6719af68b994804f0e6caceabd8 Mon Sep 17 00:00:00 2001 | 1 | From 0b05e4695a0616badef71dfa459a00ef6ff1b521 Mon Sep 17 00:00:00 2001 |
2 | From: Tudor Florea <tudor.florea@enea.com> | 2 | From: Tudor Florea <tudor.florea@enea.com> |
3 | Date: Mon, 14 Jun 2021 14:00:31 +0200 | 3 | Date: Mon, 14 Jun 2021 14:00:31 +0200 |
4 | Subject: [PATCH] util-linux: Add ptest | 4 | Subject: [PATCH] util-linux: Add ptest |
@@ -15,7 +15,7 @@ Upstream-Status: Inappropriate | |||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
18 | index 5664f9f..075ef27 100644 | 18 | index 890212f..870e817 100644 |
19 | --- a/configure.ac | 19 | --- a/configure.ac |
20 | +++ b/configure.ac | 20 | +++ b/configure.ac |
21 | @@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4]) | 21 | @@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4]) |
diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch index e475289f65..75adeca188 100644 --- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From c79222a9a5e3425c55e150edc0b7ac59c573aa2f Mon Sep 17 00:00:00 2001 | ||
2 | From: Phil Blundell <pb@pbcl.net> | ||
3 | Date: Mon, 24 Sep 2012 07:24:51 +0100 | ||
4 | Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected | ||
5 | |||
1 | util-linux: take ${sbindir} from the environment if it is set there | 6 | util-linux: take ${sbindir} from the environment if it is set there |
2 | fix the test, the [ ] syntax was getting eaten by autoconf | 7 | fix the test, the [ ] syntax was getting eaten by autoconf |
3 | 8 | ||
@@ -5,11 +10,15 @@ Signed-off-by: Phil Blundell <pb@pbcl.net> | |||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com | 10 | Signed-off-by: Saul Wold <sgw@linux.intel.com |
6 | Upstream-Status: Inappropriate [configuration] | 11 | Upstream-Status: Inappropriate [configuration] |
7 | 12 | ||
8 | Index: util-linux-2.31/configure.ac | 13 | --- |
9 | =================================================================== | 14 | configure.ac | 5 ++++- |
10 | --- util-linux-2.31.orig/configure.ac | 15 | 1 file changed, 4 insertions(+), 1 deletion(-) |
11 | +++ util-linux-2.31/configure.ac | 16 | |
12 | @@ -89,7 +89,10 @@ AC_SUBST([runstatedir]) | 17 | diff --git a/configure.ac b/configure.ac |
18 | index 36c24b4..890212f 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -102,7 +102,10 @@ AC_SUBST([runstatedir]) | ||
13 | usrbin_execdir='${exec_prefix}/bin' | 22 | usrbin_execdir='${exec_prefix}/bin' |
14 | AC_SUBST([usrbin_execdir]) | 23 | AC_SUBST([usrbin_execdir]) |
15 | 24 | ||
diff --git a/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch b/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch index 417ca1d98f..815ae9c915 100644 --- a/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch +++ b/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Display testname for subtest | 1 | From fc5de1de898fd1a372a2fd2fa493dc57323a029d Mon Sep 17 00:00:00 2001 |
2 | From: Tudor Florea <tudor.florea@enea.com> | ||
3 | Date: Thu, 3 Dec 2015 04:08:00 +0100 | ||
4 | Subject: [PATCH] Display testname for subtest | ||
2 | 5 | ||
3 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | 6 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> |
4 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
@@ -8,10 +11,10 @@ Upstream-Status: Pending | |||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
9 | 12 | ||
10 | diff --git a/tests/functions.sh b/tests/functions.sh | 13 | diff --git a/tests/functions.sh b/tests/functions.sh |
11 | index 5246605..b24dc15 100644 | 14 | index 5a562a3..098145e 100644 |
12 | --- a/tests/functions.sh | 15 | --- a/tests/functions.sh |
13 | +++ b/tests/functions.sh | 16 | +++ b/tests/functions.sh |
14 | @@ -320,7 +320,7 @@ function ts_init_subtest { | 17 | @@ -437,7 +437,7 @@ function ts_init_subtest { |
15 | 18 | ||
16 | if [ "$TS_PARSABLE" != "yes" ]; then | 19 | if [ "$TS_PARSABLE" != "yes" ]; then |
17 | [ $TS_NSUBTESTS -eq 1 ] && echo | 20 | [ $TS_NSUBTESTS -eq 1 ] && echo |
@@ -20,6 +23,3 @@ index 5246605..b24dc15 100644 | |||
20 | fi | 23 | fi |
21 | } | 24 | } |
22 | 25 | ||
23 | -- | ||
24 | 2.8.3 | ||
25 | |||
diff --git a/meta/recipes-core/util-linux/util-linux/ptest.patch b/meta/recipes-core/util-linux/util-linux/ptest.patch index ba2bd3f6ac..6221de7182 100644 --- a/meta/recipes-core/util-linux/util-linux/ptest.patch +++ b/meta/recipes-core/util-linux/util-linux/ptest.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From af073c13ef184ca75811df688e0a0a25827b36c3 Mon Sep 17 00:00:00 2001 | 1 | From d0a69ce80c579cbb7627a2f20e8b92e006a8d8ad Mon Sep 17 00:00:00 2001 |
2 | From: Tudor Florea <tudor.florea@enea.com> | 2 | From: Tudor Florea <tudor.florea@enea.com> |
3 | Date: Thu, 3 Dec 2015 04:08:00 +0100 | 3 | Date: Thu, 3 Dec 2015 04:08:00 +0100 |
4 | Subject: [PATCH] Define TESTS variable | 4 | Subject: [PATCH] Define TESTS variable |
@@ -11,7 +11,7 @@ Upstream-Status: Pending | |||
11 | 1 file changed, 1 insertion(+) | 11 | 1 file changed, 1 insertion(+) |
12 | 12 | ||
13 | diff --git a/Makefile.am b/Makefile.am | 13 | diff --git a/Makefile.am b/Makefile.am |
14 | index 886598d..1cf4346 100644 | 14 | index effbb02..7d2bd1e 100644 |
15 | --- a/Makefile.am | 15 | --- a/Makefile.am |
16 | +++ b/Makefile.am | 16 | +++ b/Makefile.am |
17 | @@ -57,6 +57,7 @@ systemdsystemunit_DATA = | 17 | @@ -57,6 +57,7 @@ systemdsystemunit_DATA = |
diff --git a/meta/recipes-core/util-linux/util-linux_2.39.2.bb b/meta/recipes-core/util-linux/util-linux_2.39.3.bb index 8c08167401..8c08167401 100644 --- a/meta/recipes-core/util-linux/util-linux_2.39.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.39.3.bb | |||