diff options
Diffstat (limited to 'meta/recipes-core')
45 files changed, 395 insertions, 545 deletions
diff --git a/meta/recipes-core/base-files/base-files/0001-add-nss-resolve-to-nsswitch.patch b/meta/recipes-core/base-files/base-files/0001-add-nss-resolve-to-nsswitch.patch deleted file mode 100644 index a6e39e0956..0000000000 --- a/meta/recipes-core/base-files/base-files/0001-add-nss-resolve-to-nsswitch.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 830abe652428d9d31780c3ace121635ad7b64274 Mon Sep 17 00:00:00 2001 | ||
2 | From: Eero Aaltonen <eero.aaltonen@vaisala.com> | ||
3 | Date: Wed Sep 27 15:50:48 2023 +0300 | ||
4 | Subject: [PATCH] Add nss-resolve to the Name Service Switch (NSS) | ||
5 | |||
6 | Add `nss-resolve` so that `systemd-resolved` is used for name | ||
7 | resolution with glibc `gethostbyname` calls. | ||
8 | |||
9 | Upstream-Status: Inappropriate [no upstream, configuration]. | ||
10 | |||
11 | Signed-off-by: Eero Aaltonen <eero.aaltonen@vaisala.com> | ||
12 | --- | ||
13 | nsswitch.conf | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/nsswitch.conf b/nsswitch.conf | ||
17 | index 06f03d2..34b165c 100644 | ||
18 | --- a/nsswitch.conf | ||
19 | +++ b/nsswitch.conf | ||
20 | @@ -8,7 +8,7 @@ passwd: compat | ||
21 | group: compat | ||
22 | shadow: compat | ||
23 | |||
24 | -hosts: files dns | ||
25 | +hosts: resolve [!UNAVAIL=return] files dns | ||
26 | networks: files | ||
27 | |||
28 | protocols: db files | ||
29 | -- | ||
30 | 2.25.1 | ||
31 | |||
diff --git a/meta/recipes-core/base-files/base-files/nsswitch-resolved.conf b/meta/recipes-core/base-files/base-files/nsswitch-resolved.conf new file mode 100644 index 0000000000..ec6ce156b5 --- /dev/null +++ b/meta/recipes-core/base-files/base-files/nsswitch-resolved.conf | |||
@@ -0,0 +1,20 @@ | |||
1 | # /etc/nsswitch.conf | ||
2 | # | ||
3 | # Example configuration of GNU Name Service Switch functionality. | ||
4 | # If you have the `glibc-doc' and `info' packages installed, try: | ||
5 | # `info libc "Name Service Switch"' for information about this file. | ||
6 | |||
7 | passwd: compat | ||
8 | group: compat | ||
9 | shadow: compat | ||
10 | gshadow: files | ||
11 | |||
12 | hosts: resolve [!UNAVAIL=return] files dns | ||
13 | networks: files | ||
14 | |||
15 | protocols: db files | ||
16 | services: db files | ||
17 | ethers: db files | ||
18 | rpc: db files | ||
19 | |||
20 | netgroup: nis | ||
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 60253fcd42..59b084d141 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb | |||
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
11 | 11 | ||
12 | SRC_URI = "file://rotation \ | 12 | SRC_URI = "file://rotation \ |
13 | file://nsswitch.conf \ | 13 | file://nsswitch.conf \ |
14 | file://nsswitch-resolved.conf \ | ||
14 | file://motd \ | 15 | file://motd \ |
15 | file://hosts \ | 16 | file://hosts \ |
16 | file://host.conf \ | 17 | file://host.conf \ |
@@ -23,7 +24,6 @@ SRC_URI = "file://rotation \ | |||
23 | file://share/dot.profile \ | 24 | file://share/dot.profile \ |
24 | file://licenses/GPL-2 \ | 25 | file://licenses/GPL-2 \ |
25 | " | 26 | " |
26 | SRC_URI:append:libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd systemd-resolved', ' file://0001-add-nss-resolve-to-nsswitch.patch', '', d)}" | ||
27 | 27 | ||
28 | S = "${WORKDIR}/sources" | 28 | S = "${WORKDIR}/sources" |
29 | UNPACKDIR = "${S}" | 29 | UNPACKDIR = "${S}" |
@@ -124,7 +124,7 @@ do_install () { | |||
124 | } | 124 | } |
125 | 125 | ||
126 | do_install:append:libc-glibc () { | 126 | do_install:append:libc-glibc () { |
127 | install -m 0644 ${S}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf | 127 | install -m 0644 ${S}/${@bb.utils.contains('DISTRO_FEATURES', 'systemd systemd-resolved', 'nsswitch-resolved.conf', 'nsswitch.conf', d)} ${D}${sysconfdir}/nsswitch.conf |
128 | } | 128 | } |
129 | 129 | ||
130 | DISTRO_VERSION[vardepsexclude] += "DATE" | 130 | DISTRO_VERSION[vardepsexclude] += "DATE" |
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 638b40c758..4ebaeb92c9 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -16,6 +16,7 @@ SECTION = "base" | |||
16 | # Whether to split the suid apps into a seperate binary | 16 | # Whether to split the suid apps into a seperate binary |
17 | BUSYBOX_SPLIT_SUID ?= "1" | 17 | BUSYBOX_SPLIT_SUID ?= "1" |
18 | 18 | ||
19 | CFLAGS:append:toolchain-clang = " -DBB_GLOBAL_CONST=''" | ||
19 | export EXTRA_CFLAGS = "${CFLAGS}" | 20 | export EXTRA_CFLAGS = "${CFLAGS}" |
20 | export EXTRA_LDFLAGS = "${LDFLAGS}" | 21 | export EXTRA_LDFLAGS = "${LDFLAGS}" |
21 | 22 | ||
diff --git a/meta/recipes-core/busybox/busybox/0001-hwclock-Check-for-SYS_settimeofday-before-calling-sy.patch b/meta/recipes-core/busybox/busybox/0001-hwclock-Check-for-SYS_settimeofday-before-calling-sy.patch new file mode 100644 index 0000000000..11ef2b6824 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-hwclock-Check-for-SYS_settimeofday-before-calling-sy.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 4e1eafc6e0de3e58cac9f62e57b552eddb50ca8e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 7 Mar 2021 17:30:24 -0800 | ||
4 | Subject: [PATCH] hwclock: Check for SYS_settimeofday before calling syscall | ||
5 | |||
6 | Some newer architectures e.g. RISCV32 have 64bit time_t from get go and | ||
7 | thusly do not have gettimeofday_time64/settimeofday_time64 implemented | ||
8 | therefore check for SYS_settimeofday definition before making the | ||
9 | syscall. Fixes build for riscv32 and it will bail out at runtime. | ||
10 | |||
11 | This issue has been discussed on the musl mailing list, and | ||
12 | the musl developers' opinion is that Busybox is wrong: | ||
13 | |||
14 | https://www.openwall.com/lists/musl/2024/03/03/2 | ||
15 | https://www.openwall.com/lists/musl/2024/04/07/2 | ||
16 | |||
17 | The correct fix isn't clear, and in the mean time, the patch | ||
18 | turns the build issue into a runtime error only on the problematic | ||
19 | architecture (riscv32), which seems like a reasonable trade-off | ||
20 | |||
21 | Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2021-March/088583.html]] | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | --- | ||
24 | util-linux/hwclock.c | 7 +++++-- | ||
25 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c | ||
28 | index c3fd0eb57..dea9c9a55 100644 | ||
29 | --- a/util-linux/hwclock.c | ||
30 | +++ b/util-linux/hwclock.c | ||
31 | @@ -132,6 +132,7 @@ static void show_clock(const char **pp_rtcname, int utc) | ||
32 | |||
33 | static void set_kernel_tz(const struct timezone *tz) | ||
34 | { | ||
35 | + int ret = 1; | ||
36 | #if LIBC_IS_MUSL | ||
37 | /* musl libc does not pass tz argument to syscall | ||
38 | * because "it's deprecated by POSIX, therefore it's fine | ||
39 | @@ -140,9 +141,11 @@ static void set_kernel_tz(const struct timezone *tz) | ||
40 | #if !defined(SYS_settimeofday) && defined(SYS_settimeofday_time32) | ||
41 | # define SYS_settimeofday SYS_settimeofday_time32 | ||
42 | #endif | ||
43 | - int ret = syscall(SYS_settimeofday, NULL, tz); | ||
44 | +#if defined(SYS_settimeofday) | ||
45 | + ret = syscall(SYS_settimeofday, NULL, tz); | ||
46 | +#endif | ||
47 | #else | ||
48 | - int ret = settimeofday(NULL, tz); | ||
49 | + ret = settimeofday(NULL, tz); | ||
50 | #endif | ||
51 | if (ret) | ||
52 | bb_simple_perror_msg_and_die("settimeofday"); | ||
diff --git a/meta/recipes-core/busybox/busybox_1.37.0.bb b/meta/recipes-core/busybox/busybox_1.37.0.bb index 85f22ada53..9f7ded3354 100644 --- a/meta/recipes-core/busybox/busybox_1.37.0.bb +++ b/meta/recipes-core/busybox/busybox_1.37.0.bb | |||
@@ -54,6 +54,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
54 | file://0002-start-stop-daemon-fix-tests.patch \ | 54 | file://0002-start-stop-daemon-fix-tests.patch \ |
55 | file://0003-start-stop-false.patch \ | 55 | file://0003-start-stop-false.patch \ |
56 | file://0001-archival-disallow-path-traversals-CVE-2023-39810.patch \ | 56 | file://0001-archival-disallow-path-traversals-CVE-2023-39810.patch \ |
57 | file://0001-hwclock-Check-for-SYS_settimeofday-before-calling-sy.patch \ | ||
57 | " | 58 | " |
58 | SRC_URI:append:libc-musl = " file://musl.cfg" | 59 | SRC_URI:append:libc-musl = " file://musl.cfg" |
59 | SRC_URI:append:x86-64 = " file://sha_accel.cfg" | 60 | SRC_URI:append:x86-64 = " file://sha_accel.cfg" |
diff --git a/meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch b/meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch deleted file mode 100644 index 95d7aca809..0000000000 --- a/meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 7eada35b4fbb48e7fe430d1b18dae7d191f84f8e Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Mon, 17 Feb 2025 02:27:09 -0800 | ||
4 | Subject: [PATCH 2/2] cksum: port to 32-bit uint_fast32_t | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | * src/cksum_vmull.c (cksum_vmull): Don’t assume | ||
10 | uint_fast32_t can hold 64 bits. | ||
11 | Problem reported by Alyssa Ross (Bug#76360). | ||
12 | |||
13 | Upstream-Status: Backport [7eada35b4fbb48e7fe430d1b18dae7d191f84f8e] | ||
14 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
15 | --- | ||
16 | NEWS | 3 +++ | ||
17 | src/cksum_vmull.c | 7 +++++-- | ||
18 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/src/cksum_vmull.c b/src/cksum_vmull.c | ||
21 | index 7611c4244..0ff81e225 100644 | ||
22 | --- a/src/cksum_vmull.c | ||
23 | +++ b/src/cksum_vmull.c | ||
24 | @@ -92,7 +92,9 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out) | ||
25 | data = bswap_neon (data); | ||
26 | /* XOR in initial CRC value (for us 0 so no effect), or CRC value | ||
27 | calculated for previous BUFLEN buffer from fread */ | ||
28 | - xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (crc << 32)); | ||
29 | + | ||
30 | + uint64_t wcrc = crc; | ||
31 | + xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32)); | ||
32 | crc = 0; | ||
33 | data = veorq_u64 (data, xor_crc); | ||
34 | data3 = vld1q_u64 ((uint64_t *) (datap + 1)); | ||
35 | @@ -193,7 +195,8 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out) | ||
36 | { | ||
37 | data = vld1q_u64 ((uint64_t *) (datap)); | ||
38 | data = bswap_neon (data); | ||
39 | - xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (crc << 32)); | ||
40 | + uint64_t wcrc = crc; | ||
41 | + xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32)); | ||
42 | crc = 0; | ||
43 | data = veorq_u64 (data, xor_crc); | ||
44 | while (bytes_read >= 32) | ||
45 | -- | ||
46 | 2.45.2 | ||
47 | |||
diff --git a/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch b/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch deleted file mode 100644 index 97a6357ab9..0000000000 --- a/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 7cb2d20cfa2a27191255031d231cd41917dcffe8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Mon, 26 Dec 2016 16:10:35 +0800 | ||
4 | Subject: [PATCH] local.mk: fix cross compiling problem | ||
5 | |||
6 | We meet the following error when cross compiling. | ||
7 | | Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop. | ||
8 | This patch fixes this problem. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
13 | --- | ||
14 | src/local.mk | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/src/local.mk b/src/local.mk | ||
18 | index 96ee941..cdd47d6 100644 | ||
19 | --- a/src/local.mk | ||
20 | +++ b/src/local.mk | ||
21 | @@ -704,4 +704,4 @@ cu_install_program = @INSTALL@ | ||
22 | else | ||
23 | cu_install_program = src/ginstall | ||
24 | endif | ||
25 | -INSTALL = $(cu_install_program) -c | ||
26 | +INSTALL_PROGRAM = $(cu_install_program) | ||
diff --git a/meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch b/meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch deleted file mode 100644 index b1a92875a6..0000000000 --- a/meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch +++ /dev/null | |||
@@ -1,101 +0,0 @@ | |||
1 | From 43a63408630e5064317823702518099f0ea652dd Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com> | ||
3 | Date: Fri, 17 Jan 2025 17:29:34 +0000 | ||
4 | Subject: [PATCH] ls: fix crash with --context | ||
5 | |||
6 | * src/ls.c (main): Flag that we need to stat() | ||
7 | if we're going to get security context (call file_has_aclinfo_cache). | ||
8 | (file_has_aclinfo_cache): Be defensive and only lookup the device | ||
9 | for the file if the stat has been performed. | ||
10 | (has_capability_cache): Likewise. | ||
11 | * tests/ls/selinux-segfault.sh: Add a test case. | ||
12 | * NEWS: Mention the bug fix. | ||
13 | Reported by Bruno Haible. | ||
14 | |||
15 | Upstream-Status: Backport | ||
16 | [https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=915004f403cb25fadb207ddfdbe6a2f43bd44fac] | ||
17 | |||
18 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
19 | --- | ||
20 | NEWS | 3 +++ | ||
21 | src/ls.c | 10 +++++----- | ||
22 | tests/ls/selinux-segfault.sh | 3 +++ | ||
23 | 3 files changed, 11 insertions(+), 5 deletions(-) | ||
24 | |||
25 | diff --git a/NEWS b/NEWS | ||
26 | index 3799f75..65867f9 100644 | ||
27 | --- a/NEWS | ||
28 | +++ b/NEWS | ||
29 | @@ -4,6 +4,9 @@ GNU coreutils NEWS -*- outline -*- | ||
30 | |||
31 | ** Bug fixes | ||
32 | |||
33 | + `ls -Z dir` would crash. | ||
34 | + [bug introduced in coreutils-9.6] | ||
35 | + | ||
36 | cp fixes support for --update=none-fail, which would have been | ||
37 | rejected as an invalid option. | ||
38 | [bug introduced in coreutils-9.5] | ||
39 | diff --git a/src/ls.c b/src/ls.c | ||
40 | index 3215360..f67167f 100644 | ||
41 | --- a/src/ls.c | ||
42 | +++ b/src/ls.c | ||
43 | @@ -1768,7 +1768,7 @@ main (int argc, char **argv) | ||
44 | |||
45 | format_needs_stat = ((sort_type == sort_time) | (sort_type == sort_size) | ||
46 | | (format == long_format) | ||
47 | - | print_block_size | print_hyperlink); | ||
48 | + | print_block_size | print_hyperlink | print_scontext); | ||
49 | format_needs_type = ((! format_needs_stat) | ||
50 | & (recursive | print_with_color | print_scontext | ||
51 | | directories_first | ||
52 | @@ -3309,7 +3309,7 @@ file_has_aclinfo_cache (char const *file, struct fileinfo *f, | ||
53 | static int unsupported_scontext_err; | ||
54 | static dev_t unsupported_device; | ||
55 | |||
56 | - if (f->stat.st_dev == unsupported_device) | ||
57 | + if (f->stat_ok && f->stat.st_dev == unsupported_device) | ||
58 | { | ||
59 | ai->buf = ai->u.__gl_acl_ch; | ||
60 | ai->size = 0; | ||
61 | @@ -3322,7 +3322,7 @@ file_has_aclinfo_cache (char const *file, struct fileinfo *f, | ||
62 | errno = 0; | ||
63 | int n = file_has_aclinfo (file, ai, flags); | ||
64 | int err = errno; | ||
65 | - if (n <= 0 && !acl_errno_valid (err)) | ||
66 | + if (f->stat_ok && n <= 0 && !acl_errno_valid (err)) | ||
67 | { | ||
68 | unsupported_return = n; | ||
69 | unsupported_scontext = ai->scontext; | ||
70 | @@ -3342,14 +3342,14 @@ has_capability_cache (char const *file, struct fileinfo *f) | ||
71 | found that has_capability fails indicating lack of support. */ | ||
72 | static dev_t unsupported_device; | ||
73 | |||
74 | - if (f->stat.st_dev == unsupported_device) | ||
75 | + if (f->stat_ok && f->stat.st_dev == unsupported_device) | ||
76 | { | ||
77 | errno = ENOTSUP; | ||
78 | return 0; | ||
79 | } | ||
80 | |||
81 | bool b = has_capability (file); | ||
82 | - if ( !b && !acl_errno_valid (errno)) | ||
83 | + if (f->stat_ok && !b && !acl_errno_valid (errno)) | ||
84 | unsupported_device = f->stat.st_dev; | ||
85 | return b; | ||
86 | } | ||
87 | diff --git a/tests/ls/selinux-segfault.sh b/tests/ls/selinux-segfault.sh | ||
88 | index 11623ac..1cac2b5 100755 | ||
89 | --- a/tests/ls/selinux-segfault.sh | ||
90 | +++ b/tests/ls/selinux-segfault.sh | ||
91 | @@ -30,4 +30,7 @@ mkdir sedir || framework_failure_ | ||
92 | ln -sf missing sedir/broken || framework_failure_ | ||
93 | returns_ 1 ls -L -R -Z -m sedir > out || fail=1 | ||
94 | |||
95 | +# ls 9.6 would segfault with the following | ||
96 | +ls -Z . > out || fail=1 | ||
97 | + | ||
98 | Exit $fail | ||
99 | -- | ||
100 | 2.34.1 | ||
101 | |||
diff --git a/meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch b/meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch deleted file mode 100644 index 0794532bdf..0000000000 --- a/meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | tests/df: Fix intermittent test failure | ||
2 | |||
3 | The test writes to the disk and means the space used changes. If this | ||
4 | crosses a number boundary, the heading spacing can change: | ||
5 | |||
6 | -Filesystem 1024-blocks Used Available Capacity Mounted on | ||
7 | +Filesystem 1024-blocks Used Available Capacity Mounted on | ||
8 | |||
9 | The test is to make sure the 1024 blocks element remains the same and | ||
10 | the spacing doesn't matter. Therefore strip any duplicate spaces using tr. | ||
11 | |||
12 | Submitted: https://github.com/coreutils/coreutils/pull/88 | ||
13 | Upstream-Status: Backport [https://github.com/coreutils/coreutils/commit/c5725c8c4bb21903490a48035286d0f94463642e] | ||
14 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
15 | |||
16 | Index: coreutils-9.5/tests/df/df-P.sh | ||
17 | =================================================================== | ||
18 | --- coreutils-9.5.orig/tests/df/df-P.sh | ||
19 | +++ coreutils-9.5/tests/df/df-P.sh | ||
20 | @@ -20,8 +20,8 @@ | ||
21 | print_ver_ df | ||
22 | |||
23 | |||
24 | - df -P . > t1 || fail=1 | ||
25 | -BLOCK_SIZE=1M df -P . > t2 || fail=1 | ||
26 | + df -P . | tr -s ' ' > t1 || fail=1 | ||
27 | +BLOCK_SIZE=1M df -P . | tr -s ' ' > t2 || fail=1 | ||
28 | |||
29 | # Since file system utilization may be changing, compare only df's header line. | ||
30 | # That records the block size. E.g., for "1M", it would be: | ||
diff --git a/meta/recipes-core/coreutils/coreutils_9.6.bb b/meta/recipes-core/coreutils/coreutils_9.7.bb index 6e1867f3e4..091e1ea2c5 100644 --- a/meta/recipes-core/coreutils/coreutils_9.6.bb +++ b/meta/recipes-core/coreutils/coreutils_9.7.bb | |||
@@ -15,13 +15,9 @@ inherit autotools gettext texinfo | |||
15 | 15 | ||
16 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ | 16 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ |
17 | file://remove-usr-local-lib-from-m4.patch \ | 17 | file://remove-usr-local-lib-from-m4.patch \ |
18 | file://0001-local.mk-fix-cross-compiling-problem.patch \ | ||
19 | file://intermittent-testfailure.patch \ | ||
20 | file://0001-ls-fix-crash-with-context.patch \ | ||
21 | file://0001-cksum-port-to-32-bit-uint_fast32_t.patch \ | ||
22 | file://run-ptest \ | 18 | file://run-ptest \ |
23 | " | 19 | " |
24 | SRC_URI[sha256sum] = "7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283" | 20 | SRC_URI[sha256sum] = "e8bb26ad0293f9b5a1fc43fb42ba970e312c66ce92c1b0b16713d7500db251bf" |
25 | 21 | ||
26 | # http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842 | 22 | # http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842 |
27 | # | 23 | # |
@@ -184,7 +180,6 @@ RRECOMMENDS:${PN}-dev += "${DEVDEPS}" | |||
184 | do_install_ptest () { | 180 | do_install_ptest () { |
185 | install -d ${D}${PTEST_PATH}/tests | 181 | install -d ${D}${PTEST_PATH}/tests |
186 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests | 182 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests |
187 | sed -i 's/ginstall/install/g' `grep -R ginstall ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq` | ||
188 | install -d ${D}${PTEST_PATH}/build-aux | 183 | install -d ${D}${PTEST_PATH}/build-aux |
189 | install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ | 184 | install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ |
190 | install -Dm 0644 ${B}/lib/config.h ${D}${PTEST_PATH}/lib/config.h | 185 | install -Dm 0644 ${B}/lib/config.h ${D}${PTEST_PATH}/lib/config.h |
@@ -198,7 +193,6 @@ do_install_ptest () { | |||
198 | sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile | 193 | sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile |
199 | sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile | 194 | sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile |
200 | sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile | 195 | sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile |
201 | sed -i '/^built_programs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile | ||
202 | sed -i '/^CC =/s/ --sysroot=.*recipe-sysroot/ /g' ${D}${PTEST_PATH}/Makefile | 196 | sed -i '/^CC =/s/ --sysroot=.*recipe-sysroot/ /g' ${D}${PTEST_PATH}/Makefile |
203 | sed -i '/^BUILD_LDFLAGS =/d' ${D}${PTEST_PATH}/Makefile | 197 | sed -i '/^BUILD_LDFLAGS =/d' ${D}${PTEST_PATH}/Makefile |
204 | chmod -R 777 ${D}${PTEST_PATH} | 198 | chmod -R 777 ${D}${PTEST_PATH} |
@@ -211,7 +205,14 @@ do_install_ptest () { | |||
211 | 205 | ||
212 | # Tweak test d_type-check to use python3 instead of python | 206 | # Tweak test d_type-check to use python3 instead of python |
213 | sed -i "1s@.*@#!/usr/bin/python3@" ${D}${PTEST_PATH}/tests/d_type-check | 207 | sed -i "1s@.*@#!/usr/bin/python3@" ${D}${PTEST_PATH}/tests/d_type-check |
214 | 208 | ||
209 | # Fix for single-binary | ||
210 | for prog in ${D}${PTEST_PATH}/src/*; do | ||
211 | if [ -f $prog ]; then | ||
212 | sed -i "1s@#!.*/src/coreutils @#!${bindir}/coreutils @" $prog | ||
213 | fi | ||
214 | done | ||
215 | |||
215 | # handle multilib | 216 | # handle multilib |
216 | sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest | 217 | sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest |
217 | } | 218 | } |
diff --git a/meta/recipes-core/dropbear/dropbear/0001-Fix-proxycmd-without-netcat.patch b/meta/recipes-core/dropbear/dropbear/0001-Fix-proxycmd-without-netcat.patch new file mode 100644 index 0000000000..967b66322f --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear/0001-Fix-proxycmd-without-netcat.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | From 5cc0127000db5f7567b54d0495fb91a8e452fe09 Mon Sep 17 00:00:00 2001 | ||
2 | From: Konstantin Demin <rockdrilla@gmail.com> | ||
3 | Date: Fri, 9 May 2025 22:39:35 +0300 | ||
4 | Subject: [PATCH] Fix proxycmd without netcat | ||
5 | |||
6 | fixes e5a0ef27c2 "Execute multihop commands directly, no shell" | ||
7 | |||
8 | Signed-off-by: Konstantin Demin <rockdrilla@gmail.com> | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/mkj/dropbear/commit/5cc0127000db5f7567b54d0495fb91a8e452fe09] | ||
11 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
12 | --- | ||
13 | src/cli-main.c | 12 +++++++++++- | ||
14 | 1 file changed, 11 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/cli-main.c b/src/cli-main.c | ||
17 | index 2fafa88..0a052a3 100644 | ||
18 | --- a/src/cli-main.c | ||
19 | +++ b/src/cli-main.c | ||
20 | @@ -77,7 +77,11 @@ int main(int argc, char ** argv) { | ||
21 | } | ||
22 | |||
23 | #if DROPBEAR_CLI_PROXYCMD | ||
24 | - if (cli_opts.proxycmd || cli_opts.proxyexec) { | ||
25 | + if (cli_opts.proxycmd | ||
26 | +#if DROPBEAR_CLI_MULTIHOP | ||
27 | + || cli_opts.proxyexec | ||
28 | +#endif | ||
29 | + ) { | ||
30 | cli_proxy_cmd(&sock_in, &sock_out, &proxy_cmd_pid); | ||
31 | if (signal(SIGINT, kill_proxy_sighandler) == SIG_ERR || | ||
32 | signal(SIGTERM, kill_proxy_sighandler) == SIG_ERR || | ||
33 | @@ -110,11 +114,13 @@ static void shell_proxy_cmd(const void *user_data_cmd) { | ||
34 | dropbear_exit("Failed to run '%s'\n", cmd); | ||
35 | } | ||
36 | |||
37 | +#if DROPBEAR_CLI_MULTIHOP | ||
38 | static void exec_proxy_cmd(const void *unused) { | ||
39 | (void)unused; | ||
40 | run_command(cli_opts.proxyexec[0], cli_opts.proxyexec, ses.maxfd); | ||
41 | dropbear_exit("Failed to run '%s'\n", cli_opts.proxyexec[0]); | ||
42 | } | ||
43 | +#endif | ||
44 | |||
45 | static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) { | ||
46 | char * cmd_arg = NULL; | ||
47 | @@ -145,9 +151,11 @@ static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) { | ||
48 | cmd_arg = m_malloc(shell_cmdlen); | ||
49 | snprintf(cmd_arg, shell_cmdlen, "exec %s", cli_opts.proxycmd); | ||
50 | exec_fn = shell_proxy_cmd; | ||
51 | +#if DROPBEAR_CLI_MULTIHOP | ||
52 | } else { | ||
53 | /* No shell */ | ||
54 | exec_fn = exec_proxy_cmd; | ||
55 | +#endif | ||
56 | } | ||
57 | |||
58 | ret = spawn_command(exec_fn, cmd_arg, sock_out, sock_in, NULL, pid_out); | ||
59 | @@ -159,6 +167,7 @@ static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) { | ||
60 | cleanup: | ||
61 | m_free(cli_opts.proxycmd); | ||
62 | m_free(cmd_arg); | ||
63 | +#if DROPBEAR_CLI_MULTIHOP | ||
64 | if (cli_opts.proxyexec) { | ||
65 | char **a = NULL; | ||
66 | for (a = cli_opts.proxyexec; *a; a++) { | ||
67 | @@ -166,6 +175,7 @@ cleanup: | ||
68 | } | ||
69 | m_free(cli_opts.proxyexec); | ||
70 | } | ||
71 | +#endif | ||
72 | } | ||
73 | |||
74 | static void kill_proxy_sighandler(int UNUSED(signo)) { | ||
diff --git a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch index 9c1dd3f606..0687e5dab1 100644 --- a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch +++ b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch | |||
@@ -12,7 +12,7 @@ diff --git a/src/default_options.h b/src/default_options.h | |||
12 | index 6e970bb..ccc8b47 100644 | 12 | index 6e970bb..ccc8b47 100644 |
13 | --- a/src/default_options.h | 13 | --- a/src/default_options.h |
14 | +++ b/src/default_options.h | 14 | +++ b/src/default_options.h |
15 | @@ -311,7 +311,7 @@ group1 in Dropbear server too */ | 15 | @@ -317,7 +317,7 @@ group1 in Dropbear server too */ |
16 | 16 | ||
17 | /* The command to invoke for xauth when using X11 forwarding. | 17 | /* The command to invoke for xauth when using X11 forwarding. |
18 | * "-q" for quiet */ | 18 | * "-q" for quiet */ |
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch b/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch deleted file mode 100644 index a20781d31d..0000000000 --- a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From c8a0c8e87b772576f3a431c3b4cacaf5aa001dcc Mon Sep 17 00:00:00 2001 | ||
2 | From: Joseph Reynolds <joseph.reynolds1@ibm.com> | ||
3 | Date: Thu, 20 Jun 2019 16:29:15 -0500 | ||
4 | Subject: [PATCH] dropbear: new feature: disable-weak-ciphers | ||
5 | |||
6 | This feature disables all CBC, SHA1, and diffie-hellman group1 ciphers | ||
7 | in the dropbear ssh server and client since they're considered weak ciphers | ||
8 | and we want to support the stong algorithms. | ||
9 | |||
10 | Upstream-Status: Inappropriate [configuration] | ||
11 | Signed-off-by: Joseph Reynolds <joseph.reynolds1@ibm.com> | ||
12 | --- | ||
13 | src/default_options.h | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/default_options.h b/src/default_options.h | ||
17 | index 12768d1..2b07497 100644 | ||
18 | --- a/src/default_options.h | ||
19 | +++ b/src/default_options.h | ||
20 | @@ -197,7 +197,7 @@ IMPORTANT: Some options will require "make clean" after changes */ | ||
21 | * Small systems should generally include either curve25519 or ecdh for performance. | ||
22 | * curve25519 is less widely supported but is faster | ||
23 | */ | ||
24 | -#define DROPBEAR_DH_GROUP14_SHA1 1 | ||
25 | +#define DROPBEAR_DH_GROUP14_SHA1 0 | ||
26 | #define DROPBEAR_DH_GROUP14_SHA256 1 | ||
27 | #define DROPBEAR_DH_GROUP16 0 | ||
28 | #define DROPBEAR_CURVE25519 1 | ||
diff --git a/meta/recipes-core/dropbear/dropbear_2024.86.bb b/meta/recipes-core/dropbear/dropbear_2025.88.bb index be246a0ccd..f203763b17 100644 --- a/meta/recipes-core/dropbear/dropbear_2024.86.bb +++ b/meta/recipes-core/dropbear/dropbear_2025.88.bb | |||
@@ -19,11 +19,12 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ | |||
19 | file://dropbear@.service \ | 19 | file://dropbear@.service \ |
20 | file://dropbear.socket \ | 20 | file://dropbear.socket \ |
21 | file://dropbear.default \ | 21 | file://dropbear.default \ |
22 | file://0001-Fix-proxycmd-without-netcat.patch \ | ||
22 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 23 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
23 | ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \ | ||
24 | " | 24 | " |
25 | 25 | ||
26 | SRC_URI[sha256sum] = "e78936dffc395f2e0db099321d6be659190966b99712b55c530dd0a1822e0a5e" | 26 | SRC_URI[sha256sum] = "783f50ea27b17c16da89578fafdb6decfa44bb8f6590e5698a4e4d3672dc53d4" |
27 | MIRRORS += "http://matt.ucc.asn.au/dropbear/releases/ https://dropbear.nl/mirror/releases/" | ||
27 | 28 | ||
28 | PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ | 29 | PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ |
29 | file://0006-dropbear-configuration-file.patch \ | 30 | file://0006-dropbear-configuration-file.patch \ |
@@ -47,10 +48,9 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" | |||
47 | BINCOMMANDS = "dbclient ssh scp" | 48 | BINCOMMANDS = "dbclient ssh scp" |
48 | EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' | 49 | EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' |
49 | 50 | ||
50 | PACKAGECONFIG ?= "disable-weak-ciphers ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" | 51 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
51 | PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}" | 52 | PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}" |
52 | PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt" | 53 | PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt" |
53 | PACKAGECONFIG[disable-weak-ciphers] = "" | ||
54 | PACKAGECONFIG[enable-x11-forwarding] = "" | 54 | PACKAGECONFIG[enable-x11-forwarding] = "" |
55 | 55 | ||
56 | # This option appends to CFLAGS and LDFLAGS from OE | 56 | # This option appends to CFLAGS and LDFLAGS from OE |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.1.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.2.bb index acec7e9676..acec7e9676 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.84.2.bb | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.84.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.84.2.bb index ef80cc47cf..ef80cc47cf 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.84.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.84.2.bb | |||
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index d00bfe4c65..38e75aab61 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -234,7 +234,7 @@ SRC_URI:append:class-native = " file://relocate-modules.patch \ | |||
234 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ | 234 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ |
235 | " | 235 | " |
236 | 236 | ||
237 | SRC_URI[sha256sum] = "2b4bc2ec49611a5fc35f86aca855f2ed0196e69e53092bab6bb73396bf30789a" | 237 | SRC_URI[sha256sum] = "88e960dd937057407d61fcb3b45a860704b25923c37ae2478b85f2ecb5a4021f" |
238 | 238 | ||
239 | # Find any meson cross files in FILESPATH that are relevant for the current | 239 | # Find any meson cross files in FILESPATH that are relevant for the current |
240 | # build (using siteinfo) and add them to EXTRA_OEMESON. | 240 | # build (using siteinfo) and add them to EXTRA_OEMESON. |
diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index e048f75c5d..fb62a4af94 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc | |||
@@ -23,3 +23,5 @@ ARM_INSTRUCTION_SET:armv6 = "arm" | |||
23 | COMPATIBLE_HOST:libc-musl:class-target = "null" | 23 | COMPATIBLE_HOST:libc-musl:class-target = "null" |
24 | 24 | ||
25 | PV = "2.41+git" | 25 | PV = "2.41+git" |
26 | |||
27 | TOOLCHAIN = "gcc" | ||
diff --git a/meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch b/meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch new file mode 100644 index 0000000000..6ea5adafa2 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch | |||
@@ -0,0 +1,81 @@ | |||
1 | From 55ed199fdb55a1a600616ba14ad0feedcf828d86 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Marko <peter.marko@siemens.com> | ||
3 | Date: Mon, 26 May 2025 21:11:14 +0200 | ||
4 | Subject: [PATCH] Revert "cmake: Fix installation directories in | ||
5 | libxml2-config.cmake" | ||
6 | |||
7 | This reverts commit 75dde50b20215a2a3a445b62f36a67c8ed337cab. | ||
8 | |||
9 | Upstream-Status: Inappropriate [upstream ticket https://gitlab.gnome.org/GNOME/libxml2/-/issues/898#note_2452864] | ||
10 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
11 | --- | ||
12 | configure.ac | 11 ----------- | ||
13 | libxml2-config.cmake.in | 11 +++++++---- | ||
14 | meson.build | 3 --- | ||
15 | 3 files changed, 7 insertions(+), 18 deletions(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 40e75151..d21ebfe5 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -1061,17 +1061,6 @@ AC_SUBST(XML_PRIVATE_LIBS) | ||
22 | AC_SUBST(XML_PRIVATE_CFLAGS) | ||
23 | AC_SUBST(XML_INCLUDEDIR) | ||
24 | |||
25 | -# for libxml2-config.cmake.in | ||
26 | -AX_RECURSIVE_EVAL(["$bindir"], [INSTALL_BINDIR]) | ||
27 | -AX_RECURSIVE_EVAL(["$includedir"], [INSTALL_INCLUDEDIR]) | ||
28 | -AX_RECURSIVE_EVAL(["$libdir"], [INSTALL_LIBDIR]) | ||
29 | -AC_SUBST(INSTALL_BINDIR) | ||
30 | -AC_SUBST(INSTALL_INCLUDEDIR) | ||
31 | -AC_SUBST(INSTALL_LIBDIR) | ||
32 | -AM_SUBST_NOTMAKE(INSTALL_BINDIR) | ||
33 | -AM_SUBST_NOTMAKE(INSTALL_INCLUDEDIR) | ||
34 | -AM_SUBST_NOTMAKE(INSTALL_LIBDIR) | ||
35 | - | ||
36 | AX_RECURSIVE_EVAL(["$sysconfdir"], [XML_SYSCONFDIR]) | ||
37 | AC_DEFINE_UNQUOTED([XML_SYSCONFDIR], ["$XML_SYSCONFDIR"], | ||
38 | [System configuration directory (/etc)]) | ||
39 | diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in | ||
40 | index 4945dda4..31036805 100644 | ||
41 | --- a/libxml2-config.cmake.in | ||
42 | +++ b/libxml2-config.cmake.in | ||
43 | @@ -24,17 +24,20 @@ | ||
44 | # LibXml2::LibXml2 - the LibXml2 library | ||
45 | # LibXml2::xmllint - the xmllint command-line executable | ||
46 | |||
47 | +get_filename_component(_libxml2_rootdir ${CMAKE_CURRENT_LIST_DIR}/../../../ ABSOLUTE) | ||
48 | + | ||
49 | set(LIBXML2_VERSION_MAJOR @LIBXML_MAJOR_VERSION@) | ||
50 | set(LIBXML2_VERSION_MINOR @LIBXML_MINOR_VERSION@) | ||
51 | set(LIBXML2_VERSION_MICRO @LIBXML_MICRO_VERSION@) | ||
52 | set(LIBXML2_VERSION_STRING "@VERSION@") | ||
53 | set(LIBXML2_DEFINITIONS "@XML_CFLAGS@") | ||
54 | -set(LIBXML2_INCLUDE_DIR @INSTALL_INCLUDEDIR@/libxml2) | ||
55 | -set(LIBXML2_LIBRARY_DIR @INSTALL_LIBDIR@) | ||
56 | +set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir}) | ||
57 | +set(LIBXML2_INCLUDE_DIR ${_libxml2_rootdir}/include/libxml2) | ||
58 | +set(LIBXML2_LIBRARY_DIR ${_libxml2_rootdir}/lib) | ||
59 | |||
60 | find_library(LIBXML2_LIBRARY NAMES xml2 HINTS ${LIBXML2_LIBRARY_DIR} NO_DEFAULT_PATH) | ||
61 | -find_program(LIBXML2_XMLCATALOG_EXECUTABLE NAMES xmlcatalog HINTS @INSTALL_BINDIR@ NO_DEFAULT_PATH) | ||
62 | -find_program(LIBXML2_XMLLINT_EXECUTABLE NAMES xmllint HINTS @INSTALL_BINDIR@ NO_DEFAULT_PATH) | ||
63 | +find_program(LIBXML2_XMLCATALOG_EXECUTABLE NAMES xmlcatalog HINTS ${_libxml2_rootdir}/bin NO_DEFAULT_PATH) | ||
64 | +find_program(LIBXML2_XMLLINT_EXECUTABLE NAMES xmllint HINTS ${_libxml2_rootdir}/bin NO_DEFAULT_PATH) | ||
65 | |||
66 | set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY}) | ||
67 | set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR}) | ||
68 | diff --git a/meson.build b/meson.build | ||
69 | index 4c59211d..3e5f25d3 100644 | ||
70 | --- a/meson.build | ||
71 | +++ b/meson.build | ||
72 | @@ -599,9 +599,6 @@ config_cmake = configuration_data() | ||
73 | config_cmake.set('LIBXML_MAJOR_VERSION', v_maj) | ||
74 | config_cmake.set('LIBXML_MINOR_VERSION', v_min) | ||
75 | config_cmake.set('LIBXML_MICRO_VERSION', v_mic) | ||
76 | -config_cmake.set('INSTALL_BINDIR', dir_bin) | ||
77 | -config_cmake.set('INSTALL_INCLUDEDIR', dir_include) | ||
78 | -config_cmake.set('INSTALL_LIBDIR', dir_lib) | ||
79 | config_cmake.set('VERSION', meson.project_version()) | ||
80 | config_cmake.set('WITH_HTTP', want_http.to_int().to_string()) | ||
81 | config_cmake.set('WITH_ICONV', want_iconv.to_int().to_string()) | ||
diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch index 1c8c13ab5c..789aeca119 100644 --- a/meta/recipes-core/libxml/libxml2/install-tests.patch +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch | |||
@@ -15,7 +15,7 @@ diff --git a/Makefile.am b/Makefile.am | |||
15 | index 4cb9a5c..8adcd7e 100644 | 15 | index 4cb9a5c..8adcd7e 100644 |
16 | --- a/Makefile.am | 16 | --- a/Makefile.am |
17 | +++ b/Makefile.am | 17 | +++ b/Makefile.am |
18 | @@ -27,6 +27,16 @@ check_PROGRAMS = \ | 18 | @@ -26,6 +26,16 @@ check_PROGRAMS = \ |
19 | testparser \ | 19 | testparser \ |
20 | testrecurse | 20 | testrecurse |
21 | 21 | ||
@@ -29,6 +29,6 @@ index 4cb9a5c..8adcd7e 100644 | |||
29 | + cp -r $(srcdir)/result $(DESTDIR)$(ptestdir) | 29 | + cp -r $(srcdir)/result $(DESTDIR)$(ptestdir) |
30 | + cp -r $(srcdir)/python/tests $(DESTDIR)$(ptestdir)/python | 30 | + cp -r $(srcdir)/python/tests $(DESTDIR)$(ptestdir)/python |
31 | + | 31 | + |
32 | bin_PROGRAMS = xmllint xmlcatalog | 32 | bin_PROGRAMS = xmllint |
33 | 33 | ||
34 | bin_SCRIPTS = xml2-config | 34 | bin_SCRIPTS = xml2-config |
diff --git a/meta/recipes-core/libxml/libxml2/run-ptest b/meta/recipes-core/libxml/libxml2/run-ptest index f252a78f17..cbbdd5592f 100755 --- a/meta/recipes-core/libxml/libxml2/run-ptest +++ b/meta/recipes-core/libxml/libxml2/run-ptest | |||
@@ -5,7 +5,7 @@ set -e | |||
5 | export LC_ALL=en_US.UTF-8 | 5 | export LC_ALL=en_US.UTF-8 |
6 | 6 | ||
7 | # testModule isn't that useful and hard-codes buildtree, so we don't run that | 7 | # testModule isn't that useful and hard-codes buildtree, so we don't run that |
8 | TESTS="runtest runsuite testrecurse testchar testdict testThreads runxmlconf testapi" | 8 | TESTS="runtest runsuite testrecurse testchar testdict runxmlconf testapi testlimits testparser" |
9 | 9 | ||
10 | for T in $TESTS; do | 10 | for T in $TESTS; do |
11 | echo Running $T | 11 | echo Running $T |
diff --git a/meta/recipes-core/libxml/libxml2_2.13.8.bb b/meta/recipes-core/libxml/libxml2_2.14.3.bb index e82e0e8ec3..da75cbe450 100644 --- a/meta/recipes-core/libxml/libxml2_2.13.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.14.3.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libxml2" | |||
4 | BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" | 4 | BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" |
5 | SECTION = "libs" | 5 | SECTION = "libs" |
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://Copyright;md5=f437ed9058e8e5135e47c01e973376ba \ | 7 | LIC_FILES_CHKSUM = "file://Copyright;md5=5873615e8a9ecbf5c8857c4312ee05d6 \ |
8 | file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \ | 8 | file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \ |
9 | file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \ | 9 | file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \ |
10 | " | 10 | " |
@@ -17,9 +17,10 @@ inherit gnomebase | |||
17 | SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testtar \ | 17 | SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testtar \ |
18 | file://run-ptest \ | 18 | file://run-ptest \ |
19 | file://install-tests.patch \ | 19 | file://install-tests.patch \ |
20 | file://0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | SRC_URI[archive.sha256sum] = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a" | 23 | SRC_URI[archive.sha256sum] = "6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833" |
23 | SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" | 24 | SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" |
24 | 25 | ||
25 | # Disputed as a security issue, but fixed in d39f780 | 26 | # Disputed as a security issue, but fixed in d39f780 |
@@ -27,11 +28,8 @@ CVE_STATUS[CVE-2023-45322] = "disputed: issue requires memory allocation to fail | |||
27 | 28 | ||
28 | BINCONFIG = "${bindir}/xml2-config" | 29 | BINCONFIG = "${bindir}/xml2-config" |
29 | 30 | ||
30 | PACKAGECONFIG ??= "python \ | 31 | PACKAGECONFIG ??= "python" |
31 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ | ||
32 | " | ||
33 | PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" | 32 | PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" |
34 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | ||
35 | 33 | ||
36 | inherit autotools pkgconfig binconfig-disabled ptest | 34 | inherit autotools pkgconfig binconfig-disabled ptest |
37 | 35 | ||
diff --git a/meta/recipes-core/newlib/libgloss_git.bb b/meta/recipes-core/newlib/libgloss_git.bb index 3c97a7f296..92bb81050b 100644 --- a/meta/recipes-core/newlib/libgloss_git.bb +++ b/meta/recipes-core/newlib/libgloss_git.bb | |||
@@ -21,8 +21,12 @@ do_install:append() { | |||
21 | install -d ${D}${libdir} | 21 | install -d ${D}${libdir} |
22 | mv -v ${D}${prefix}/${TARGET_SYS}/lib/* ${D}${libdir} | 22 | mv -v ${D}${prefix}/${TARGET_SYS}/lib/* ${D}${libdir} |
23 | 23 | ||
24 | # Remove original directory | 24 | # Remove original directory |
25 | rmdir -p --ignore-fail-on-non-empty ${D}${prefix}/${TARGET_SYS}/lib | 25 | rmdir -p --ignore-fail-on-non-empty ${D}${prefix}/${TARGET_SYS}/lib |
26 | # Remove empty include dir | ||
27 | rmdir ${D}/${prefix}/${TARGET_SYS}/include | ||
28 | rmdir ${D}/${prefix}/${TARGET_SYS}/ | ||
29 | |||
26 | } | 30 | } |
27 | 31 | ||
28 | # Split packages correctly | 32 | # Split packages correctly |
diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc index 50113ba433..5b5025148e 100644 --- a/meta/recipes-core/newlib/newlib.inc +++ b/meta/recipes-core/newlib/newlib.inc | |||
@@ -8,16 +8,16 @@ LIC_FILES_CHKSUM = " \ | |||
8 | file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | 8 | file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ |
9 | file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ | 9 | file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ |
10 | file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ | 10 | file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://COPYING.LIBGLOSS;md5=c0469b6ebb847a75781066be515f032d \ | 11 | file://COPYING.LIBGLOSS;md5=faa6f6ad545714df2a7d1276ed899f15 \ |
12 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ | 12 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ |
13 | file://COPYING.NEWLIB;md5=4f1a15846ffee91e352418563e1bce27 \ | 13 | file://COPYING.NEWLIB;md5=61255563bbcda142f581b94591b6a589 \ |
14 | file://newlib/libc/posix/COPYRIGHT;md5=103468ff1982be840fdf4ee9f8b51bbf \ | 14 | file://newlib/libc/posix/COPYRIGHT;md5=103468ff1982be840fdf4ee9f8b51bbf \ |
15 | " | 15 | " |
16 | 16 | ||
17 | BASEVER = "4.4.0" | 17 | BASEVER = "4.5.0" |
18 | PV = "${BASEVER}+git" | 18 | PV = "${BASEVER}+git" |
19 | SRC_URI = "git://sourceware.org/git/newlib-cygwin.git;protocol=https;branch=main" | 19 | SRC_URI = "git://sourceware.org/git/newlib-cygwin.git;protocol=https;branch=main" |
20 | SRCREV = "ad11e2587f83d61357a32c61c36d72ea4f39315e" | 20 | SRCREV = "5e5e51f1dc56a99eb4648c28e00d73b6ea44a8b0" |
21 | 21 | ||
22 | INHIBIT_DEFAULT_DEPS = "1" | 22 | INHIBIT_DEFAULT_DEPS = "1" |
23 | DEPENDS = "virtual/cross-cc" | 23 | DEPENDS = "virtual/cross-cc" |
diff --git a/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch b/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch index 73910535a7..4a20548c61 100644 --- a/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch +++ b/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch | |||
@@ -21,11 +21,9 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
21 | BaseTools/Conf/tools_def.template | 18 +++++++++--------- | 21 | BaseTools/Conf/tools_def.template | 18 +++++++++--------- |
22 | 1 file changed, 9 insertions(+), 9 deletions(-) | 22 | 1 file changed, 9 insertions(+), 9 deletions(-) |
23 | 23 | ||
24 | diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template | ||
25 | index 14f3b643c4..4987488e88 100755 | ||
26 | --- a/BaseTools/Conf/tools_def.template | 24 | --- a/BaseTools/Conf/tools_def.template |
27 | +++ b/BaseTools/Conf/tools_def.template | 25 | +++ b/BaseTools/Conf/tools_def.template |
28 | @@ -896,7 +896,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_ | 26 | @@ -920,7 +920,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --a |
29 | *_*_*_DTC_PATH = DEF(DTC_BIN) | 27 | *_*_*_DTC_PATH = DEF(DTC_BIN) |
30 | 28 | ||
31 | # All supported GCC archs except LOONGARCH64 support -mstack-protector-guard=global, so set that on everything except LOONGARCH64 | 29 | # All supported GCC archs except LOONGARCH64 support -mstack-protector-guard=global, so set that on everything except LOONGARCH64 |
@@ -34,7 +32,7 @@ index 14f3b643c4..4987488e88 100755 | |||
34 | DEFINE GCC_IA32_X64_CC_FLAGS = -mstack-protector-guard=global | 32 | DEFINE GCC_IA32_X64_CC_FLAGS = -mstack-protector-guard=global |
35 | DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie -mstack-protector-guard=global | 33 | DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie -mstack-protector-guard=global |
36 | DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections | 34 | DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections |
37 | @@ -918,8 +918,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere | 35 | @@ -941,8 +941,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF |
38 | DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) | 36 | DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) |
39 | DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) | 37 | DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) |
40 | DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map | 38 | DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map |
@@ -45,7 +43,7 @@ index 14f3b643c4..4987488e88 100755 | |||
45 | DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h | 43 | DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h |
46 | DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h | 44 | DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h |
47 | DEFINE GCC_ASLCC_FLAGS = -x c | 45 | DEFINE GCC_ASLCC_FLAGS = -x c |
48 | @@ -1072,7 +1072,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF( | 46 | @@ -1095,7 +1095,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS |
49 | *_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS) | 47 | *_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS) |
50 | *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) | 48 | *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) |
51 | *_GCC48_IA32_OBJCOPY_FLAGS = | 49 | *_GCC48_IA32_OBJCOPY_FLAGS = |
@@ -54,7 +52,7 @@ index 14f3b643c4..4987488e88 100755 | |||
54 | 52 | ||
55 | DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) | 53 | DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) |
56 | RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable | 54 | RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable |
57 | @@ -1100,7 +1100,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set | 55 | @@ -1123,7 +1123,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF( |
58 | *_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS) | 56 | *_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS) |
59 | *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) | 57 | *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) |
60 | *_GCC48_X64_OBJCOPY_FLAGS = | 58 | *_GCC48_X64_OBJCOPY_FLAGS = |
@@ -63,7 +61,7 @@ index 14f3b643c4..4987488e88 100755 | |||
63 | 61 | ||
64 | DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) | 62 | DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) |
65 | RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable | 63 | RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable |
66 | @@ -1209,7 +1209,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s | 64 | @@ -1232,7 +1232,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(G |
67 | *_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS) | 65 | *_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS) |
68 | *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) | 66 | *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) |
69 | *_GCC49_IA32_OBJCOPY_FLAGS = | 67 | *_GCC49_IA32_OBJCOPY_FLAGS = |
@@ -72,7 +70,7 @@ index 14f3b643c4..4987488e88 100755 | |||
72 | 70 | ||
73 | DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) | 71 | DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) |
74 | RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable | 72 | RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable |
75 | @@ -1237,7 +1237,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set | 73 | @@ -1260,7 +1260,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF( |
76 | *_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS) | 74 | *_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS) |
77 | *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) | 75 | *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) |
78 | *_GCC49_X64_OBJCOPY_FLAGS = | 76 | *_GCC49_X64_OBJCOPY_FLAGS = |
@@ -81,7 +79,7 @@ index 14f3b643c4..4987488e88 100755 | |||
81 | 79 | ||
82 | DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) | 80 | DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) |
83 | RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable | 81 | RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable |
84 | @@ -1496,7 +1496,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 | 82 | @@ -1519,7 +1519,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS |
85 | *_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie | 83 | *_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie |
86 | *_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) | 84 | *_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) |
87 | *_GCC5_IA32_OBJCOPY_FLAGS = | 85 | *_GCC5_IA32_OBJCOPY_FLAGS = |
@@ -90,7 +88,7 @@ index 14f3b643c4..4987488e88 100755 | |||
90 | 88 | ||
91 | DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto | 89 | DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto |
92 | DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386 | 90 | DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386 |
93 | @@ -1528,7 +1528,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, | 91 | @@ -1551,7 +1551,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(G |
94 | *_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS) | 92 | *_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS) |
95 | *_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) | 93 | *_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) |
96 | *_GCC5_X64_OBJCOPY_FLAGS = | 94 | *_GCC5_X64_OBJCOPY_FLAGS = |
@@ -99,6 +97,3 @@ index 14f3b643c4..4987488e88 100755 | |||
99 | 97 | ||
100 | DEBUG_GCC5_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO | 98 | DEBUG_GCC5_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO |
101 | DEBUG_GCC5_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os | 99 | DEBUG_GCC5_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os |
102 | -- | ||
103 | 2.39.5 | ||
104 | |||
diff --git a/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch b/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch index ae0ca0c15c..0ddb86f530 100644 --- a/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch +++ b/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch | |||
@@ -34,20 +34,18 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
34 | .../Source/Python/AutoGen/ModuleAutoGen.py | 5 +++- | 34 | .../Source/Python/AutoGen/ModuleAutoGen.py | 5 +++- |
35 | 4 files changed, 24 insertions(+), 16 deletions(-) | 35 | 4 files changed, 24 insertions(+), 16 deletions(-) |
36 | 36 | ||
37 | diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c | ||
38 | index 897045b2be..a66003f44a 100644 | ||
39 | --- a/BaseTools/Source/C/GenFw/Elf64Convert.c | 37 | --- a/BaseTools/Source/C/GenFw/Elf64Convert.c |
40 | +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c | 38 | +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c |
41 | @@ -13,6 +13,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent | 39 | @@ -15,6 +15,8 @@ SPDX-License-Identifier: BSD-2-Clause-Pa |
42 | #ifndef __GNUC__ | ||
43 | #include <windows.h> | 40 | #include <windows.h> |
41 | #undef RUNTIME_FUNCTION | ||
44 | #include <io.h> | 42 | #include <io.h> |
45 | +#else | 43 | +#else |
46 | +#define _GNU_SOURCE | 44 | +#define _GNU_SOURCE |
47 | #endif | 45 | #endif |
48 | #include <assert.h> | 46 | #include <assert.h> |
49 | #include <stdio.h> | 47 | #include <stdio.h> |
50 | @@ -988,7 +990,7 @@ ScanSections64 ( | 48 | @@ -990,7 +992,7 @@ ScanSections64 ( |
51 | } | 49 | } |
52 | mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) + | 50 | mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) + |
53 | sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) + | 51 | sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) + |
@@ -56,7 +54,7 @@ index 897045b2be..a66003f44a 100644 | |||
56 | 54 | ||
57 | // | 55 | // |
58 | // Add more space in the .debug data region for the DllCharacteristicsEx | 56 | // Add more space in the .debug data region for the DllCharacteristicsEx |
59 | @@ -2308,7 +2310,7 @@ WriteDebug64 ( | 57 | @@ -2310,7 +2312,7 @@ WriteDebug64 ( |
60 | EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10; | 58 | EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10; |
61 | EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry; | 59 | EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry; |
62 | 60 | ||
@@ -65,7 +63,7 @@ index 897045b2be..a66003f44a 100644 | |||
65 | 63 | ||
66 | NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset); | 64 | NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset); |
67 | DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]; | 65 | DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]; |
68 | @@ -2341,7 +2343,7 @@ WriteDebug64 ( | 66 | @@ -2343,7 +2345,7 @@ WriteDebug64 ( |
69 | 67 | ||
70 | Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1); | 68 | Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1); |
71 | Nb10->Signature = CODEVIEW_SIGNATURE_NB10; | 69 | Nb10->Signature = CODEVIEW_SIGNATURE_NB10; |
@@ -74,8 +72,6 @@ index 897045b2be..a66003f44a 100644 | |||
74 | } | 72 | } |
75 | 73 | ||
76 | STATIC | 74 | STATIC |
77 | diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Source/Python/AutoGen/BuildEngine.py | ||
78 | index 45b39d7878..3fed7d1736 100644 | ||
79 | --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py | 75 | --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py |
80 | +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py | 76 | +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py |
81 | @@ -70,6 +70,9 @@ class TargetDescBlock(object): | 77 | @@ -70,6 +70,9 @@ class TargetDescBlock(object): |
@@ -88,8 +84,6 @@ index 45b39d7878..3fed7d1736 100644 | |||
88 | def AddInput(self, Input): | 84 | def AddInput(self, Input): |
89 | if Input not in self.Inputs: | 85 | if Input not in self.Inputs: |
90 | self.Inputs.append(Input) | 86 | self.Inputs.append(Input) |
91 | diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py | ||
92 | index 6d9c60b702..83ac267647 100755 | ||
93 | --- a/BaseTools/Source/Python/AutoGen/GenMake.py | 87 | --- a/BaseTools/Source/Python/AutoGen/GenMake.py |
94 | +++ b/BaseTools/Source/Python/AutoGen/GenMake.py | 88 | +++ b/BaseTools/Source/Python/AutoGen/GenMake.py |
95 | @@ -576,7 +576,7 @@ cleanlib: | 89 | @@ -576,7 +576,7 @@ cleanlib: |
@@ -140,7 +134,7 @@ index 6d9c60b702..83ac267647 100755 | |||
140 | } | 134 | } |
141 | 135 | ||
142 | RespDict = {} | 136 | RespDict = {} |
143 | @@ -1008,9 +1008,9 @@ cleanlib: | 137 | @@ -1019,9 +1019,9 @@ cleanlib: |
144 | if not self.ObjTargetDict.get(T.Target.SubDir): | 138 | if not self.ObjTargetDict.get(T.Target.SubDir): |
145 | self.ObjTargetDict[T.Target.SubDir] = set() | 139 | self.ObjTargetDict[T.Target.SubDir] = set() |
146 | self.ObjTargetDict[T.Target.SubDir].add(NewFile) | 140 | self.ObjTargetDict[T.Target.SubDir].add(NewFile) |
@@ -152,8 +146,6 @@ index 6d9c60b702..83ac267647 100755 | |||
152 | # Generate related macros if needed | 146 | # Generate related macros if needed |
153 | if T.GenFileListMacro and T.FileListMacro not in self.FileListMacros: | 147 | if T.GenFileListMacro and T.FileListMacro not in self.FileListMacros: |
154 | self.FileListMacros[T.FileListMacro] = [] | 148 | self.FileListMacros[T.FileListMacro] = [] |
155 | diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | ||
156 | index 65a2176ca9..318b9611ce 100755 | ||
157 | --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 149 | --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py |
158 | +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 150 | +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py |
159 | @@ -1474,6 +1474,9 @@ class ModuleAutoGen(AutoGen): | 151 | @@ -1474,6 +1474,9 @@ class ModuleAutoGen(AutoGen): |
@@ -175,6 +167,3 @@ index 65a2176ca9..318b9611ce 100755 | |||
175 | 167 | ||
176 | # Ignore generating makefile when it is a binary module | 168 | # Ignore generating makefile when it is a binary module |
177 | if self.IsBinaryModule: | 169 | if self.IsBinaryModule: |
178 | -- | ||
179 | 2.39.5 | ||
180 | |||
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 41ab85b703..aa7de3af2b 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb | |||
@@ -29,8 +29,8 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ | |||
29 | file://CVE-2025-2295.patch \ | 29 | file://CVE-2025-2295.patch \ |
30 | " | 30 | " |
31 | 31 | ||
32 | PV = "edk2-stable202411" | 32 | PV = "edk2-stable202502" |
33 | SRCREV = "0f3867fa6ef0553e26c42f7d71ff6bdb98429742" | 33 | SRCREV = "fbe0805b2091393406952e84724188f8c1941837" |
34 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" | 34 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" |
35 | 35 | ||
36 | CVE_PRODUCT = "edk2" | 36 | CVE_PRODUCT = "edk2" |
diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init index e0f80bcdc0..e0f80bcdc0 100755..100644 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init | |||
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 712fff7bd0..f3647d389d 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-or-later" | |||
6 | LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" | 6 | LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" |
7 | DEPENDS = "gdk-pixbuf-native" | 7 | DEPENDS = "gdk-pixbuf-native" |
8 | 8 | ||
9 | SRCREV = "1f64c654129fdb6a1b75d8c16e3bcdd986468083" | 9 | SRCREV = "53ae74a36bf17675228552abb927d2f981940a6a" |
10 | PV = "0.1+git" | 10 | PV = "0.1+git" |
11 | 11 | ||
12 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https \ | 12 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https \ |
diff --git a/meta/recipes-core/readline/files/inputrc b/meta/recipes-core/readline/files/inputrc index b5c4c8af24..4a2874bccc 100644 --- a/meta/recipes-core/readline/files/inputrc +++ b/meta/recipes-core/readline/files/inputrc | |||
@@ -24,12 +24,12 @@ set output-meta on | |||
24 | $if mode=emacs | 24 | $if mode=emacs |
25 | 25 | ||
26 | # allow the use of the Home/End keys | 26 | # allow the use of the Home/End keys |
27 | # "\e[1~": beginning-of-line | 27 | "\e[1~": beginning-of-line |
28 | # "\e[4~": end-of-line | 28 | "\e[4~": end-of-line |
29 | 29 | ||
30 | # allow the use of the Delete/Insert keys | 30 | # allow the use of the Delete/Insert keys |
31 | # "\e[3~": delete-char | 31 | "\e[3~": delete-char |
32 | # "\e[2~": quoted-insert | 32 | "\e[2~": quoted-insert |
33 | 33 | ||
34 | # mappings for "page up" and "page down" to step to the beginning/end | 34 | # mappings for "page up" and "page down" to step to the beginning/end |
35 | # of the history | 35 | # of the history |
diff --git a/meta/recipes-core/seatd/seatd_0.9.1.bb b/meta/recipes-core/seatd/seatd_0.9.1.bb index 8ee43a3dc8..87e1c3b67d 100644 --- a/meta/recipes-core/seatd/seatd_0.9.1.bb +++ b/meta/recipes-core/seatd/seatd_0.9.1.bb | |||
@@ -15,6 +15,14 @@ inherit meson pkgconfig systemd update-rc.d useradd | |||
15 | 15 | ||
16 | # https://www.openwall.com/lists/musl/2020/01/20/3 | 16 | # https://www.openwall.com/lists/musl/2020/01/20/3 |
17 | CFLAGS:append:libc-musl:powerpc64le = " -Wno-error=overflow" | 17 | CFLAGS:append:libc-musl:powerpc64le = " -Wno-error=overflow" |
18 | #../git/common/connection.c:154:55: error: comparison of integers of different signs: 'unsigned long' and 'long' [-Werror,-Wsign-compare] | ||
19 | # 154 | for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) { | ||
20 | # | ^~~~~~~~~~~~~~~~~~~~~~ | ||
21 | #/mnt/b/yoe/master/sources/poky/build/tmp/work/riscv64-poky-linux-musl/seatd/0.9.1/recipe-sysroot/usr/include/sys/socket.h:358:44: note: expanded from macro 'CMSG_NXTHDR' | ||
22 | # 358 | __CMSG_LEN(cmsg) + sizeof(struct cmsghdr) >= __MHDR_END(mhdr) - (unsigned char *)(cmsg) \ | ||
23 | # | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
24 | #1 error generated. | ||
25 | CFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare" | ||
18 | 26 | ||
19 | PACKAGECONFIG ?= " \ | 27 | PACKAGECONFIG ?= " \ |
20 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ | 28 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ |
diff --git a/meta/recipes-core/systemd/systemd-boot_257.5.bb b/meta/recipes-core/systemd/systemd-boot_257.5.bb index 6a50ac05aa..c6c443f929 100644 --- a/meta/recipes-core/systemd/systemd-boot_257.5.bb +++ b/meta/recipes-core/systemd/systemd-boot_257.5.bb | |||
@@ -47,8 +47,16 @@ FILES:${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}" | |||
47 | 47 | ||
48 | RDEPENDS:${PN} += "virtual-systemd-bootconf" | 48 | RDEPENDS:${PN} += "virtual-systemd-bootconf" |
49 | 49 | ||
50 | # efi portions use -mgeneral-regs-only option which conflicts with SSE | ||
51 | # especially clang throws errors about it | ||
52 | # error: the 'sse' unit is not supported with this instruction set | ||
53 | TUNE_CCARGS:remove = "-mfpmath=sse" | ||
54 | |||
50 | CFLAGS:append:libc-musl = " -D__DEFINED_wchar_t" | 55 | CFLAGS:append:libc-musl = " -D__DEFINED_wchar_t" |
51 | 56 | ||
57 | # arm-poky-linux-musleabi-clang: error: unsupported option '-mgeneral-regs-only' for target 'arm-poky-linux-musleabi' | ||
58 | TOOLCHAIN:arm = "gcc" | ||
59 | |||
52 | COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*|riscv.*)-linux" | 60 | COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*|riscv.*)-linux" |
53 | COMPATIBLE_HOST:x86-x32 = "null" | 61 | COMPATIBLE_HOST:x86-x32 = "null" |
54 | 62 | ||
diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.40.4.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb index ec04c1d384..ec04c1d384 100644 --- a/meta/recipes-core/util-linux/util-linux-libuuid_2.40.4.bb +++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.41.bb | |||
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4e8701ffdf..b0f2a9d497 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -6,20 +6,22 @@ disk partitioning, kernel message management, filesystem creation, and system lo | |||
6 | 6 | ||
7 | SECTION = "base" | 7 | SECTION = "base" |
8 | 8 | ||
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" |
10 | LICENSE:${PN}-fcntl-lock = "MIT" | 10 | LICENSE:${PN}-fcntl-lock = "MIT" |
11 | LICENSE:${PN}-fdisk = "GPL-1.0-or-later" | 11 | LICENSE:${PN}-fdisk = "GPL-1.0-or-later" |
12 | LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" | 12 | LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" |
13 | LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" | 13 | LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" |
14 | LICENSE:${PN}-libmount = "LGPL-2.1-or-later" | 14 | LICENSE:${PN}-libmount = "LGPL-2.1-or-later" |
15 | LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" | 15 | LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" |
16 | LICENSE:${PN}-coresched = "EUPL-1.2" | ||
16 | 17 | ||
17 | LIC_FILES_CHKSUM = "file://README.licensing;md5=ddd58b6c94da86ff4f03e91208eb9cfc \ | 18 | LIC_FILES_CHKSUM = "file://README.licensing;md5=55e895a80bdd4ffc65e167a76d2e7569 \ |
18 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 19 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
19 | file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 20 | file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
20 | file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ | 21 | file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ |
21 | file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \ | 22 | file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \ |
22 | file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \ | 23 | file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \ |
24 | file://Documentation/licenses/COPYING.EUPL-1.2;md5=c075d2767167a2355b23392018a1cbbd \ | ||
23 | file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \ | 25 | file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \ |
24 | file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \ | 26 | file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \ |
25 | file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ | 27 | file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ |
@@ -38,10 +40,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin | |||
38 | file://display_testname_for_subtest.patch \ | 40 | file://display_testname_for_subtest.patch \ |
39 | file://avoid_parallel_tests.patch \ | 41 | file://avoid_parallel_tests.patch \ |
40 | file://fcntl-lock.c \ | 42 | file://fcntl-lock.c \ |
41 | file://0001-cfdisk-add-sector-size-commanand-line-option.patch \ | 43 | file://0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch \ |
42 | file://0002-sfdisk-add-sector-size-commanand-line-option.patch \ | 44 | file://0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch \ |
43 | " | 45 | " |
44 | 46 | ||
45 | SRC_URI[sha256sum] = "5c1daf733b04e9859afdc3bd87cc481180ee0f88b5c0946b16fdec931975fb79" | 47 | SRC_URI[sha256sum] = "81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6" |
46 | 48 | ||
47 | CVE_PRODUCT = "util-linux" | 49 | CVE_PRODUCT = "util-linux" |
diff --git a/meta/recipes-core/util-linux/util-linux/0001-cfdisk-add-sector-size-commanand-line-option.patch b/meta/recipes-core/util-linux/util-linux/0001-cfdisk-add-sector-size-commanand-line-option.patch deleted file mode 100644 index 73031318d2..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-cfdisk-add-sector-size-commanand-line-option.patch +++ /dev/null | |||
@@ -1,90 +0,0 @@ | |||
1 | From 724b95ee6847613e23ca18f4918d4e65ff5b270e Mon Sep 17 00:00:00 2001 | ||
2 | From: Karel Zak <kzak@redhat.com> | ||
3 | Date: Mon, 14 Oct 2024 15:48:46 +0200 | ||
4 | Subject: [PATCH 1/2] cfdisk: add --sector-size commanand line option | ||
5 | |||
6 | * improves compatibility with fdisk | ||
7 | * add ability to work with disk images where libfdisk defaults to 512 | ||
8 | |||
9 | Signed-off-by: Karel Zak <kzak@redhat.com> | ||
10 | |||
11 | Upstream-Status: Backport [fd38ee2274f7a30393d3839dfce556260355c3fa] | ||
12 | |||
13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
14 | --- | ||
15 | disk-utils/cfdisk.8.adoc | 3 +++ | ||
16 | disk-utils/cfdisk.c | 15 ++++++++++++++- | ||
17 | 2 files changed, 17 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/disk-utils/cfdisk.8.adoc b/disk-utils/cfdisk.8.adoc | ||
20 | index 97fad621d..759f39f0e 100644 | ||
21 | --- a/disk-utils/cfdisk.8.adoc | ||
22 | +++ b/disk-utils/cfdisk.8.adoc | ||
23 | @@ -55,6 +55,9 @@ Use exclusive BSD lock for device or file it operates. The optional argument _mo | ||
24 | *-r*, *--read-only*:: | ||
25 | Forced open in read-only mode. | ||
26 | |||
27 | +*-b*, *--sector-size* _sectorsize_:: | ||
28 | +Specify the sector size of the disk. Valid values are 512, 1024, 2048, and 4096. The kernel is aware of the sector size for regular block devices. Use this option only on very old kernels, when working with disk images, or to override the kernel's default sector size. Since util-linux-2.17, *fdisk* distinguishes between logical and physical sector size. This option changes both sector sizes to the specified _sectorsize_. | ||
29 | + | ||
30 | *-z*, *--zero*:: | ||
31 | Start with an in-memory zeroed partition table. This option does not zero the partition table on the disk; rather, it simply starts the program without reading the existing partition table. This option allows you to create a new partition table from scratch or from an *sfdisk*(8)-compatible script. | ||
32 | |||
33 | diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c | ||
34 | index 183b7671e..f37e2d72a 100644 | ||
35 | --- a/disk-utils/cfdisk.c | ||
36 | +++ b/disk-utils/cfdisk.c | ||
37 | @@ -2739,6 +2739,8 @@ static void __attribute__((__noreturn__)) usage(void) | ||
38 | _(" --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"), "yes", "no", "nonblock"); | ||
39 | fputs(_(" -r, --read-only forced open cfdisk in read-only mode\n"), out); | ||
40 | |||
41 | + fputs(_(" -b, --sector-size <size> physical and logical sector size\n"), out); | ||
42 | + | ||
43 | fputs(USAGE_SEPARATOR, out); | ||
44 | fprintf(out, USAGE_HELP_OPTIONS(26)); | ||
45 | |||
46 | @@ -2751,6 +2753,7 @@ int main(int argc, char *argv[]) | ||
47 | const char *diskpath = NULL, *lockmode = NULL; | ||
48 | int rc, c, colormode = UL_COLORMODE_UNDEF; | ||
49 | int read_only = 0; | ||
50 | + size_t user_ss = 0; | ||
51 | struct cfdisk _cf = { .lines_idx = 0 }, | ||
52 | *cf = &_cf; | ||
53 | enum { | ||
54 | @@ -2760,6 +2763,7 @@ int main(int argc, char *argv[]) | ||
55 | { "color", optional_argument, NULL, 'L' }, | ||
56 | { "lock", optional_argument, NULL, OPT_LOCK }, | ||
57 | { "help", no_argument, NULL, 'h' }, | ||
58 | + { "sector-size", required_argument, NULL, 'b' }, | ||
59 | { "version", no_argument, NULL, 'V' }, | ||
60 | { "zero", no_argument, NULL, 'z' }, | ||
61 | { "read-only", no_argument, NULL, 'r' }, | ||
62 | @@ -2771,8 +2775,15 @@ int main(int argc, char *argv[]) | ||
63 | textdomain(PACKAGE); | ||
64 | close_stdout_atexit(); | ||
65 | |||
66 | - while((c = getopt_long(argc, argv, "L::hVzr", longopts, NULL)) != -1) { | ||
67 | + while((c = getopt_long(argc, argv, "b:L::hVzr", longopts, NULL)) != -1) { | ||
68 | switch(c) { | ||
69 | + case 'b': | ||
70 | + user_ss = strtou32_or_err(optarg, | ||
71 | + _("invalid sector size argument")); | ||
72 | + if (user_ss != 512 && user_ss != 1024 && | ||
73 | + user_ss != 2048 && user_ss != 4096) | ||
74 | + errx(EXIT_FAILURE, _("invalid sector size argument")); | ||
75 | + break; | ||
76 | case 'h': | ||
77 | usage(); | ||
78 | break; | ||
79 | @@ -2811,6 +2822,8 @@ int main(int argc, char *argv[]) | ||
80 | cf->cxt = fdisk_new_context(); | ||
81 | if (!cf->cxt) | ||
82 | err(EXIT_FAILURE, _("failed to allocate libfdisk context")); | ||
83 | + if (user_ss) | ||
84 | + fdisk_save_user_sector_size(cf->cxt, user_ss, user_ss); | ||
85 | |||
86 | fdisk_set_ask(cf->cxt, ask_callback, (void *) cf); | ||
87 | |||
88 | -- | ||
89 | 2.25.1 | ||
90 | |||
diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch b/meta/recipes-core/util-linux/util-linux/0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch new file mode 100644 index 0000000000..e3f9112192 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From b3a1d92a9078fada31b2cf64b802edd616026766 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Mon, 26 May 2025 15:24:16 +0800 | ||
4 | Subject: [PATCH] lsfd/mkfds-foreign-sockets: skip when lacking sock_diag | ||
5 | ability | ||
6 | |||
7 | The ENDPOINTS will need sock_diag ability. The kernel might not | ||
8 | enable related configs. Check and skip in case of lacking such ability. | ||
9 | |||
10 | Fixes: https://github.com/util-linux/util-linux/issues/3590 | ||
11 | |||
12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/3591] | ||
15 | |||
16 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
17 | --- | ||
18 | tests/ts/lsfd/mkfds-foreign-sockets | 2 ++ | ||
19 | 1 file changed, 2 insertions(+) | ||
20 | |||
21 | diff --git a/tests/ts/lsfd/mkfds-foreign-sockets b/tests/ts/lsfd/mkfds-foreign-sockets | ||
22 | index cd94da799..76138a7a6 100755 | ||
23 | --- a/tests/ts/lsfd/mkfds-foreign-sockets | ||
24 | +++ b/tests/ts/lsfd/mkfds-foreign-sockets | ||
25 | @@ -30,6 +30,8 @@ ts_skip_nonroot | ||
26 | ts_skip_qemu_user | ||
27 | ts_cd "$TS_OUTDIR" | ||
28 | |||
29 | +lsfd_check_sockdiag "unix" | ||
30 | + | ||
31 | declare -A tcase | ||
32 | tcase[NAME]="state=connected" | ||
33 | tcase[SOCK.NETNS]= | ||
34 | -- | ||
35 | 2.34.1 | ||
36 | |||
diff --git a/meta/recipes-core/util-linux/util-linux/0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch b/meta/recipes-core/util-linux/util-linux/0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch new file mode 100644 index 0000000000..dece0e94b7 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From d2eeccf36542d506b660641a07a44f3976772897 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Thu, 15 May 2025 16:44:33 +0800 | ||
4 | Subject: [PATCH] tests/ts/kill/decode: avoid using shell built-in kill command | ||
5 | |||
6 | This test case should do the same as other kill test cases, avoiding | ||
7 | using shell built-in kill command. | ||
8 | |||
9 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/d2eeccf36542d506b660641a07a44f3976772897] | ||
12 | |||
13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
14 | --- | ||
15 | tests/ts/kill/decode | 5 +++++ | ||
16 | 1 file changed, 5 insertions(+) | ||
17 | |||
18 | diff --git a/tests/ts/kill/decode b/tests/ts/kill/decode | ||
19 | index 03bc25ff6..57149899e 100755 | ||
20 | --- a/tests/ts/kill/decode | ||
21 | +++ b/tests/ts/kill/decode | ||
22 | @@ -18,6 +18,11 @@ TS_DESC="decode functions" | ||
23 | . "$TS_TOPDIR/functions.sh" | ||
24 | ts_init "$*" | ||
25 | |||
26 | +# make sure we do not use shell built-in command | ||
27 | +if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then | ||
28 | + TS_CMD_KILL="$(which kill)" | ||
29 | +fi | ||
30 | + | ||
31 | ts_skip_qemu_user | ||
32 | |||
33 | ts_check_test_command "$TS_CMD_KILL" | ||
34 | -- | ||
35 | 2.34.1 | ||
36 | |||
diff --git a/meta/recipes-core/util-linux/util-linux/0002-sfdisk-add-sector-size-commanand-line-option.patch b/meta/recipes-core/util-linux/util-linux/0002-sfdisk-add-sector-size-commanand-line-option.patch deleted file mode 100644 index 8d47d8de71..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0002-sfdisk-add-sector-size-commanand-line-option.patch +++ /dev/null | |||
@@ -1,105 +0,0 @@ | |||
1 | From 96570c03f46e0a5c17e721737a38c717c67e358b Mon Sep 17 00:00:00 2001 | ||
2 | From: Karel Zak <kzak@redhat.com> | ||
3 | Date: Mon, 14 Oct 2024 15:50:40 +0200 | ||
4 | Subject: [PATCH 2/2] sfdisk: add --sector-size commanand line option | ||
5 | |||
6 | * improves compatibility with fdisk | ||
7 | * add ability to work with disk images where libfdisk defaults to 512 | ||
8 | |||
9 | Addresses: https://github.com/util-linux/util-linux/pull/3235 | ||
10 | Signed-off-by: Karel Zak <kzak@redhat.com> | ||
11 | |||
12 | Upstream-Status: Backport [ef7b76baa17ddb5414691fa8f49d61415c30871c] | ||
13 | |||
14 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
15 | --- | ||
16 | disk-utils/sfdisk.8.adoc | 5 ++++- | ||
17 | disk-utils/sfdisk.c | 14 ++++++++++++++ | ||
18 | 2 files changed, 18 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/disk-utils/sfdisk.8.adoc b/disk-utils/sfdisk.8.adoc | ||
21 | index bc3ff9bb8..d1eaa3712 100644 | ||
22 | --- a/disk-utils/sfdisk.8.adoc | ||
23 | +++ b/disk-utils/sfdisk.8.adoc | ||
24 | @@ -201,6 +201,9 @@ The default list of columns may be extended if _list_ is specified in the format | ||
25 | *-q*, *--quiet*:: | ||
26 | Suppress extra info messages. | ||
27 | |||
28 | +*--sector-size* _sectorsize_:: | ||
29 | +Specify the sector size of the disk. Valid values are 512, 1024, 2048, and 4096. The kernel is aware of the sector size for regular block devices. Use this option only on very old kernels, when working with disk images, or to override the kernel's default sector size. Since util-linux-2.17, *fdisk* distinguishes between logical and physical sector size. This option changes both sector sizes to the specified _sectorsize_. | ||
30 | + | ||
31 | *-u*, *--unit S*:: | ||
32 | Deprecated option. Only the sector unit is supported. This option is not supported when using the *--show-size* command. | ||
33 | |||
34 | @@ -249,7 +252,7 @@ Specify the maximal number of GPT partitions. | ||
35 | *grain*:: | ||
36 | Specify minimal size in bytes used to calculate partitions alignment. The default is 1MiB and it's strongly recommended to use the default. Do not modify this variable if you're not sure. | ||
37 | *sector-size*:: | ||
38 | -Specify sector size. *sfdisk* always uses device sector size. Since version 2.39 *sfdisk* recalculates sizes from dump if the script and device sector size differ. | ||
39 | +Specifies the sector size used in the input. *sfdisk* always internally uses the device sector size provided by the kernel for the block device, or as specified by the user on the command line (see *--sector-size*). Starting with version 2.39, *sfdisk* recalculates sizes from the input if the *sector-size* header and device sector size are different. | ||
40 | |||
41 | Note that it is only possible to use header lines before the first partition is specified in the input. | ||
42 | |||
43 | diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c | ||
44 | index d8dd8d296..97d426559 100644 | ||
45 | --- a/disk-utils/sfdisk.c | ||
46 | +++ b/disk-utils/sfdisk.c | ||
47 | @@ -2084,6 +2084,8 @@ static void __attribute__((__noreturn__)) usage(void) | ||
48 | _(" --color[=<when>] colorize output (%s, %s or %s)\n"), "auto", "always", "never"); | ||
49 | fprintf(out, | ||
50 | " %s\n", USAGE_COLORS_DEFAULT); | ||
51 | + fputs(_(" --sector-size <size> physical and logical sector size\n"), out); | ||
52 | + | ||
53 | fprintf(out, | ||
54 | _(" --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"), "yes", "no", "nonblock"); | ||
55 | fputs(_(" -N, --partno <num> specify partition number\n"), out); | ||
56 | @@ -2120,6 +2122,7 @@ int main(int argc, char *argv[]) | ||
57 | const char *outarg = NULL; | ||
58 | int rc = -EINVAL, c, longidx = -1, bytes = 0; | ||
59 | int colormode = UL_COLORMODE_UNDEF; | ||
60 | + size_t user_ss = 0; | ||
61 | struct sfdisk _sf = { | ||
62 | .partno = -1, | ||
63 | .wipemode = WIPEMODE_AUTO, | ||
64 | @@ -2145,6 +2148,7 @@ int main(int argc, char *argv[]) | ||
65 | OPT_NOTELL, | ||
66 | OPT_RELOCATE, | ||
67 | OPT_LOCK, | ||
68 | + OPT_SECTORSIZE | ||
69 | }; | ||
70 | |||
71 | static const struct option longopts[] = { | ||
72 | @@ -2174,6 +2178,7 @@ int main(int argc, char *argv[]) | ||
73 | { "output", required_argument, NULL, 'o' }, | ||
74 | { "partno", required_argument, NULL, 'N' }, | ||
75 | { "reorder", no_argument, NULL, 'r' }, | ||
76 | + { "sector-size", required_argument, NULL, OPT_SECTORSIZE }, | ||
77 | { "show-geometry", no_argument, NULL, 'g' }, | ||
78 | { "quiet", no_argument, NULL, 'q' }, | ||
79 | { "verify", no_argument, NULL, 'V' }, | ||
80 | @@ -2373,6 +2378,13 @@ int main(int argc, char *argv[]) | ||
81 | sf->lockmode = optarg; | ||
82 | } | ||
83 | break; | ||
84 | + case OPT_SECTORSIZE: | ||
85 | + user_ss = strtou32_or_err(optarg, | ||
86 | + _("invalid sector size argument")); | ||
87 | + if (user_ss != 512 && user_ss != 1024 && | ||
88 | + user_ss != 2048 && user_ss != 4096) | ||
89 | + errx(EXIT_FAILURE, _("invalid sector size argument")); | ||
90 | + break; | ||
91 | default: | ||
92 | errtryhelp(EXIT_FAILURE); | ||
93 | } | ||
94 | @@ -2383,6 +2395,8 @@ int main(int argc, char *argv[]) | ||
95 | sfdisk_init(sf); | ||
96 | if (bytes) | ||
97 | fdisk_set_size_unit(sf->cxt, FDISK_SIZEUNIT_BYTES); | ||
98 | + if (user_ss) | ||
99 | + fdisk_save_user_sector_size(sf->cxt, user_ss, user_ss); | ||
100 | |||
101 | if (outarg) | ||
102 | init_fields(NULL, outarg, NULL); | ||
103 | -- | ||
104 | 2.25.1 | ||
105 | |||
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 8ea00dbb95..fe92afbc53 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 da58b4150f6932de36c962ea657713bcf4ea44be Mon Sep 17 00:00:00 2001 | 1 | From 43030388e831642d36cb7b9d4b63755e9696714a 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 |
@@ -14,7 +14,7 @@ Upstream-Status: Inappropriate | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index 651ef2b..2a8012e 100644 | 17 | index 43a23a5..4a84531 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4]) | 20 | @@ -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 74abdc2038..ebb32a6845 100644 --- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0387d71516c978899cfd556ca512f530a212b4a9 Mon Sep 17 00:00:00 2001 | 1 | From 378998bf82e3b6ff46569077b29f95e72b734681 Mon Sep 17 00:00:00 2001 |
2 | From: Phil Blundell <pb@pbcl.net> | 2 | From: Phil Blundell <pb@pbcl.net> |
3 | Date: Mon, 24 Sep 2012 07:24:51 +0100 | 3 | Date: Mon, 24 Sep 2012 07:24:51 +0100 |
4 | Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected | 4 | Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected |
@@ -14,7 +14,7 @@ Upstream-Status: Inappropriate [configuration] | |||
14 | 1 file changed, 4 insertions(+), 1 deletion(-) | 14 | 1 file changed, 4 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index 23594ff..651ef2b 100644 | 17 | index a5d9102..43a23a5 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -110,7 +110,10 @@ AC_SUBST([runstatedir]) | 20 | @@ -110,7 +110,10 @@ AC_SUBST([runstatedir]) |
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 871b0b2d30..fa4ae02bc3 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,4 @@ | |||
1 | From 45450d0339cd7ee27f53c0f2fac1cc74ed9bbfb8 Mon Sep 17 00:00:00 2001 | 1 | From 728c2abd889d225535008c3e7a1eef4b8a0aeea2 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] Display testname for subtest | 4 | Subject: [PATCH] Display testname for subtest |
@@ -10,10 +10,10 @@ Upstream-Status: Pending | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/tests/functions.sh b/tests/functions.sh | 12 | diff --git a/tests/functions.sh b/tests/functions.sh |
13 | index 5fe5ba0..a6c703e 100644 | 13 | index 1d7a425..b1f0986 100644 |
14 | --- a/tests/functions.sh | 14 | --- a/tests/functions.sh |
15 | +++ b/tests/functions.sh | 15 | +++ b/tests/functions.sh |
16 | @@ -450,7 +450,7 @@ function ts_init_subtest { | 16 | @@ -455,7 +455,7 @@ function ts_init_subtest { |
17 | 17 | ||
18 | if [ "$TS_PARSABLE" != "yes" ]; then | 18 | if [ "$TS_PARSABLE" != "yes" ]; then |
19 | [ $TS_NSUBTESTS -eq 1 ] && echo | 19 | [ $TS_NSUBTESTS -eq 1 ] && echo |
diff --git a/meta/recipes-core/util-linux/util-linux/ptest.patch b/meta/recipes-core/util-linux/util-linux/ptest.patch index 7345926b88..ad23001cfa 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 f9be73c3e2b0a4f0923950dcb058be85d3ee8ed7 Mon Sep 17 00:00:00 2001 | 1 | From 18bf6aded9b2a75185ae4b23a41cd2e4322c5e31 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 |
@@ -10,10 +10,10 @@ Upstream-Status: Pending | |||
10 | 1 file changed, 1 insertion(+) | 10 | 1 file changed, 1 insertion(+) |
11 | 11 | ||
12 | diff --git a/Makefile.am b/Makefile.am | 12 | diff --git a/Makefile.am b/Makefile.am |
13 | index 50ab8d0..7e2340d 100644 | 13 | index 01e9970..c3313ff 100644 |
14 | --- a/Makefile.am | 14 | --- a/Makefile.am |
15 | +++ b/Makefile.am | 15 | +++ b/Makefile.am |
16 | @@ -64,6 +64,7 @@ tmpfiles_DATA = | 16 | @@ -66,6 +66,7 @@ sysusers_DATA = |
17 | dist_bashcompletion_DATA = | 17 | dist_bashcompletion_DATA = |
18 | check_PROGRAMS = | 18 | check_PROGRAMS = |
19 | dist_check_SCRIPTS = | 19 | dist_check_SCRIPTS = |
diff --git a/meta/recipes-core/util-linux/util-linux/run-ptest b/meta/recipes-core/util-linux/util-linux/run-ptest index 6886b66c49..1410229172 100644 --- a/meta/recipes-core/util-linux/util-linux/run-ptest +++ b/meta/recipes-core/util-linux/util-linux/run-ptest | |||
@@ -22,10 +22,8 @@ modprobe loop | |||
22 | # for a long description of mount namespaces in Linux | 22 | # for a long description of mount namespaces in Linux |
23 | mount --make-shared / | 23 | mount --make-shared / |
24 | 24 | ||
25 | # lsfd/option-inet has races in the test script: | ||
26 | # https://github.com/util-linux/util-linux/issues/2399 | ||
27 | # lsfd/mkfds-bpf* have issues with the gcc 15 upgrade | 25 | # 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 '{ | 26 | ./tests/run.sh --use-system-commands --parsable --show-diff --exclude='lsfd/mkfds-bpf-map lsfd/mkfds-bpf-prog' | sed -u '{ |
29 | s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/ | 27 | s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/ |
30 | s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/ | 28 | s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/ |
31 | s/^\(.*\):\(.*\) \.\.\. SKIPPED \(.*\)$/SKIP: \1:\2 \3/ | 29 | s/^\(.*\):\(.*\) \.\.\. SKIPPED \(.*\)$/SKIP: \1:\2 \3/ |
diff --git a/meta/recipes-core/util-linux/util-linux_2.40.4.bb b/meta/recipes-core/util-linux/util-linux_2.41.bb index 81bd298dd9..00036e8a68 100644 --- a/meta/recipes-core/util-linux/util-linux_2.40.4.bb +++ b/meta/recipes-core/util-linux/util-linux_2.41.bb | |||
@@ -356,9 +356,11 @@ do_install_ptest() { | |||
356 | 356 | ||
357 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest | 357 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest |
358 | 358 | ||
359 | # chfn needs PAM | ||
360 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then | 359 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then |
360 | # chfn needs PAM | ||
361 | rm -rf ${D}${PTEST_PATH}/tests/ts/chfn | 361 | rm -rf ${D}${PTEST_PATH}/tests/ts/chfn |
362 | # su is not enabled when pam is not in PACKAGECONFIG | ||
363 | rm -rf ${D}${PTEST_PATH}/tests/ts/su | ||
362 | fi | 364 | fi |
363 | # remove raid tests, known failures and avoid dependency on mdadm therefore | 365 | # remove raid tests, known failures and avoid dependency on mdadm therefore |
364 | # See https://github.com/util-linux/util-linux/commit/7519c3edab120b14623931d5ddb16fdc6e7cad5d | 366 | # See https://github.com/util-linux/util-linux/commit/7519c3edab120b14623931d5ddb16fdc6e7cad5d |