From: Chen Qi Date: Wed, 3 Jan 2024 04:42:06 +0000 (+0800) Subject: util-linux/util-linux-libuuid: ugprade from 2.39.2 to 2.39.3 X-Git-Tag: uninative-4.4~527 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a0bd46e6988b2da446f89864131639dde63c6d0;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git 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. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- 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 similarity index 100% rename from meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb rename to 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 e3bef5acfc5..4e9d22f2690 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 SECTION = "base" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause" +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" +LICENSE:${PN}-fdisk = "GPL-1.0-or-later" 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=12ae7768a65ec8f2e44d930df9cb43fa \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=6b0e0a2320e66e62eef9b8149a6faec4 \ 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 \ @@ -35,8 +36,7 @@ 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-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch \ file://0001-login-utils-include-libgen.h-for-basename-API.patch \ " -SRC_URI[sha256sum] = "87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f" +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 2b9897ade12..6258710e1e5 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 @@ -From 6581cf8ac95b99b5a35fea88c52646558d05b5e7 Mon Sep 17 00:00:00 2001 +From d44e3ad1f6f8b5c1b3098bb7d537943a4c21d22f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Dec 2023 19:59:46 -0800 Subject: [PATCH] login-utils: include libgen.h for basename API @@ -17,10 +17,13 @@ Fixes Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2615] Signed-off-by: Khem Raj + --- - login-utils/su-common.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + login-utils/su-common.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) +diff --git a/login-utils/su-common.c b/login-utils/su-common.c +index b674920..3297c78 100644 --- a/login-utils/su-common.c +++ b/login-utils/su-common.c @@ -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 4d7487c4f74..00000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-4K-buffer-size-instead-of-BUFSIZ.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 95b0405338440cf5cd6d4b2b5c66cda8bf381b28 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 15 Sep 2023 00:18:18 -0700 -Subject: [PATCH] lscpu: Use 4K buffer size instead of BUFSIZ - -Some lines in /proc/cpuinfo can be large e.g. flags and can then -truncate them in displaying them - -BUFSIZ can vary quite a bit e.g. glibc/linux systems its 8192 -but on musl/linux and OSX its 1024, on mingW it is 256, some tests e.g. -x86_64-64cpu-linux6.2.tar.gz has added really long line for cpu flags -line which is greater than 1024 characters and hence this test fails -on musl because lscpu -s reports truncated string - -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2492] -Signed-off-by: Khem Raj ---- - sys-utils/lscpu-cputype.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c -index 3fd5f7a3c..c8f72ab8a 100644 ---- a/sys-utils/lscpu-cputype.c -+++ b/sys-utils/lscpu-cputype.c -@@ -462,7 +462,9 @@ static int cpuinfo_parse_cache(struct lscpu_cxt *cxt, int keynum, char *data) - int lscpu_read_cpuinfo(struct lscpu_cxt *cxt) - { - FILE *fp; -- char buf[BUFSIZ]; -+ /* Used to be BUFSIZ which is small on some platforms e.g, musl, -+ * therefore hardcode to 4K */ -+ char buf[4096]; - size_t i; - struct lscpu_cputype *ct; - struct cpuinfo_parser _pr = { .cxt = cxt }, *pr = &_pr; --- -2.42.0 - 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 f1cbdb3beba..85ad7a5575c 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 @@ -From ee3c7812e1efa6719af68b994804f0e6caceabd8 Mon Sep 17 00:00:00 2001 +From 0b05e4695a0616badef71dfa459a00ef6ff1b521 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Mon, 14 Jun 2021 14:00:31 +0200 Subject: [PATCH] util-linux: Add ptest @@ -15,7 +15,7 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 5664f9f..075ef27 100644 +index 890212f..870e817 100644 --- a/configure.ac +++ b/configure.ac @@ -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 e475289f65f..75adeca188f 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 @@ +From c79222a9a5e3425c55e150edc0b7ac59c573aa2f Mon Sep 17 00:00:00 2001 +From: Phil Blundell +Date: Mon, 24 Sep 2012 07:24:51 +0100 +Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected + util-linux: take ${sbindir} from the environment if it is set there fix the test, the [ ] syntax was getting eaten by autoconf @@ -5,11 +10,15 @@ Signed-off-by: Phil Blundell Signed-off-by: Saul Wold +Date: Thu, 3 Dec 2015 04:08:00 +0100 +Subject: [PATCH] Display testname for subtest Signed-off-by: Tudor Florea Upstream-Status: Pending @@ -8,10 +11,10 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functions.sh b/tests/functions.sh -index 5246605..b24dc15 100644 +index 5a562a3..098145e 100644 --- a/tests/functions.sh +++ b/tests/functions.sh -@@ -320,7 +320,7 @@ function ts_init_subtest { +@@ -437,7 +437,7 @@ function ts_init_subtest { if [ "$TS_PARSABLE" != "yes" ]; then [ $TS_NSUBTESTS -eq 1 ] && echo @@ -20,6 +23,3 @@ index 5246605..b24dc15 100644 fi } --- -2.8.3 - diff --git a/meta/recipes-core/util-linux/util-linux/ptest.patch b/meta/recipes-core/util-linux/util-linux/ptest.patch index ba2bd3f6ac3..6221de71829 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 @@ -From af073c13ef184ca75811df688e0a0a25827b36c3 Mon Sep 17 00:00:00 2001 +From d0a69ce80c579cbb7627a2f20e8b92e006a8d8ad Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 3 Dec 2015 04:08:00 +0100 Subject: [PATCH] Define TESTS variable @@ -11,7 +11,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am -index 886598d..1cf4346 100644 +index effbb02..7d2bd1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 similarity index 100% rename from meta/recipes-core/util-linux/util-linux_2.39.2.bb rename to meta/recipes-core/util-linux/util-linux_2.39.3.bb