summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-framework/nfsrootfs2
-rw-r--r--meta/recipes-core/meta/buildtools-docs-tarball.bb5
-rw-r--r--meta/recipes-core/meta/buildtools-tarball.bb21
-rw-r--r--meta/recipes-core/musl/libucontext_1.3.2.bb6
-rw-r--r--meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch11
-rw-r--r--meta/recipes-core/ttyrun/ttyrun_2.38.0.bb (renamed from meta/recipes-core/ttyrun/ttyrun_2.37.0.bb)4
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc3
-rw-r--r--meta/recipes-core/util-linux/util-linux/0001-test_sysinfo.c-print-out-SIGRTMIN.patch50
-rw-r--r--meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch (renamed from meta/recipes-core/util-linux/util-linux/0002-ts-kill-decode-use-SIGRTMIN-from-test_sysinfo-instea.patch)16
9 files changed, 28 insertions, 90 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/nfsrootfs b/meta/recipes-core/initrdscripts/initramfs-framework/nfsrootfs
index e67ee4c25d..30555aef55 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework/nfsrootfs
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/nfsrootfs
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3nfsrootfs_enabled() { 3nfsrootfs_enabled() {
4 if [ ${bootparam_root} != "/dev/nfs" ] || [ -z ${bootparam_nfsroot} ]; then 4 if [ "${bootparam_root}" != "/dev/nfs" ] || [ -z ${bootparam_nfsroot} ]; then
5 return 1 5 return 1
6 fi 6 fi
7 return 0 7 return 0
diff --git a/meta/recipes-core/meta/buildtools-docs-tarball.bb b/meta/recipes-core/meta/buildtools-docs-tarball.bb
index b9ef68eb6d..98d47f7b71 100644
--- a/meta/recipes-core/meta/buildtools-docs-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-docs-tarball.bb
@@ -7,6 +7,8 @@ LICENSE = "MIT"
7# Add nativesdk equivalent of build-essentials 7# Add nativesdk equivalent of build-essentials
8TOOLCHAIN_HOST_TASK += "\ 8TOOLCHAIN_HOST_TASK += "\
9 nativesdk-python3-sphinx \ 9 nativesdk-python3-sphinx \
10 nativesdk-python3-sphinx-argparse \
11 nativesdk-python3-sphinx-copybutton \
10 nativesdk-python3-sphinx-rtd-theme \ 12 nativesdk-python3-sphinx-rtd-theme \
11 nativesdk-python3-pyyaml \ 13 nativesdk-python3-pyyaml \
12 nativesdk-rsvg \ 14 nativesdk-rsvg \
@@ -16,4 +18,5 @@ TOOLCHAIN_OUTPUTNAME = "${SDK_ARCH}-buildtools-docs-nativesdk-standalone-${DISTR
16 18
17SDK_TITLE = "Docs Build tools tarball" 19SDK_TITLE = "Docs Build tools tarball"
18 20
19TESTSDK_CASES = "buildtools-docs-cases" 21# Directory that contains testcases
22TESTSDK_CASE_DIRS = "buildtools-docs" \ No newline at end of file
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index 6fa6d93a3d..02117ab84d 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -124,22 +124,7 @@ TOOLCHAIN_NEED_CONFIGSITE_CACHE = ""
124# The recipe doesn't need any default deps 124# The recipe doesn't need any default deps
125INHIBIT_DEFAULT_DEPS = "1" 125INHIBIT_DEFAULT_DEPS = "1"
126 126
127# Directory in testsdk that contains testcases 127inherit testsdk
128TESTSDK_CASES = "buildtools-cases"
129 128
130# We have our own code, avoid deferred inherit 129# Directory that contains testcases
131SDK_CLASSES:remove = "testsdk" 130TESTSDK_CASE_DIRS = "buildtools" \ No newline at end of file
132
133python do_testsdk() {
134 import oeqa.sdk.testsdk
135 testsdk = oeqa.sdk.testsdk.TestSDK()
136
137 cases_path = os.path.join(os.path.abspath(os.path.dirname(oeqa.sdk.testsdk.__file__)), d.getVar("TESTSDK_CASES"))
138 testsdk.context_executor_class.default_cases = [cases_path,]
139
140 testsdk.run(d)
141}
142addtask testsdk
143do_testsdk[nostamp] = "1"
144do_testsdk[network] = "1"
145do_testsdk[depends] += "xz-native:do_populate_sysroot"
diff --git a/meta/recipes-core/musl/libucontext_1.3.2.bb b/meta/recipes-core/musl/libucontext_1.3.2.bb
index 2362cba5c8..c5b802207b 100644
--- a/meta/recipes-core/musl/libucontext_1.3.2.bb
+++ b/meta/recipes-core/musl/libucontext_1.3.2.bb
@@ -48,3 +48,9 @@ def map_kernel_arch(a, d):
48 48
49EXTRA_OEMESON = "-Dcpu=${@map_kernel_arch(d.getVar('TARGET_ARCH'), d)}" 49EXTRA_OEMESON = "-Dcpu=${@map_kernel_arch(d.getVar('TARGET_ARCH'), d)}"
50inherit meson 50inherit meson
51
52ARM_TARGET_CPPFLAGS = ""
53ARM_TARGET_CPPFLAGS:append:arm = "${@bb.utils.contains('TARGET_FPU', 'hard', ' -DFORCE_HARD_FLOAT', '', d)}"
54ARM_TARGET_CPPFLAGS:append:arm = "${@bb.utils.contains('TARGET_FPU', 'soft', ' -DFORCE_SOFT_FLOAT', '', d)}"
55
56TARGET_CPPFLAGS .= "${ARM_TARGET_CPPFLAGS}"
diff --git a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
index f0aa3a0bd8..1443c5082b 100644
--- a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
@@ -15,8 +15,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 src/shared/base-filesystem.c | 1 + 15 src/shared/base-filesystem.c | 1 +
16 2 files changed, 7 insertions(+) 16 2 files changed, 7 insertions(+)
17 17
18diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
19index e2cd8b4e35..f2fe489de7 100644
20--- a/src/basic/missing_syscall.h 18--- a/src/basic/missing_syscall.h
21+++ b/src/basic/missing_syscall.h 19+++ b/src/basic/missing_syscall.h
22@@ -20,6 +20,12 @@ 20@@ -20,6 +20,12 @@
@@ -32,8 +30,6 @@ index e2cd8b4e35..f2fe489de7 100644
32 #include "macro.h" 30 #include "macro.h"
33 #include "missing_keyctl.h" 31 #include "missing_keyctl.h"
34 #include "missing_sched.h" 32 #include "missing_sched.h"
35diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
36index 389c77eee0..e3627c4603 100644
37--- a/src/shared/base-filesystem.c 33--- a/src/shared/base-filesystem.c
38+++ b/src/shared/base-filesystem.c 34+++ b/src/shared/base-filesystem.c
39@@ -20,6 +20,7 @@ 35@@ -20,6 +20,7 @@
@@ -42,8 +38,5 @@ index 389c77eee0..e3627c4603 100644
42 #include "user-util.h" 38 #include "user-util.h"
43+#include "missing_syscall.h" 39+#include "missing_syscall.h"
44 40
45 typedef struct BaseFilesystem { 41 typedef enum BaseFilesystemFlags {
46 const char *dir; /* directory or symlink to create */ 42 BASE_FILESYSTEM_IGNORE_ON_FAILURE = 1 << 0,
47--
482.34.1
49
diff --git a/meta/recipes-core/ttyrun/ttyrun_2.37.0.bb b/meta/recipes-core/ttyrun/ttyrun_2.38.0.bb
index 507ad1b09e..90380e51ea 100644
--- a/meta/recipes-core/ttyrun/ttyrun_2.37.0.bb
+++ b/meta/recipes-core/ttyrun/ttyrun_2.38.0.bb
@@ -6,8 +6,8 @@ HOMEPAGE = "https://github.com/ibm-s390-linux/s390-tools"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=f5118f167b055bfd7c3450803f1847af" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=f5118f167b055bfd7c3450803f1847af"
8 8
9SRC_URI = "git://github.com/ibm-s390-linux/s390-tools;protocol=https;branch=master" 9SRC_URI = "git://github.com/ibm-s390-linux/s390-tools;protocol=https;branch=master;tag=v${PV}"
10SRCREV = "793c037ded98cd001075cdb55a9c58e122380256" 10SRCREV = "660bab6e68fded26b2117e1dcec0844549a22fed"
11 11
12CVE_PRODUCT = "s390-tools" 12CVE_PRODUCT = "s390-tools"
13 13
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 6611ec0fe7..111f29cb92 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -19,8 +19,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
19 file://fcntl-lock.c \ 19 file://fcntl-lock.c \
20 file://0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch \ 20 file://0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch \
21 file://0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch \ 21 file://0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch \
22 file://0001-test_sysinfo.c-print-out-SIGRTMIN.patch \ 22 file://0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch \
23 file://0002-ts-kill-decode-use-SIGRTMIN-from-test_sysinfo-instea.patch \
24 " 23 "
25 24
26SRC_URI[sha256sum] = "81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6" 25SRC_URI[sha256sum] = "81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6"
diff --git a/meta/recipes-core/util-linux/util-linux/0001-test_sysinfo.c-print-out-SIGRTMIN.patch b/meta/recipes-core/util-linux/util-linux/0001-test_sysinfo.c-print-out-SIGRTMIN.patch
deleted file mode 100644
index ee9f220842..0000000000
--- a/meta/recipes-core/util-linux/util-linux/0001-test_sysinfo.c-print-out-SIGRTMIN.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 50774e34fee0cd528b195a863bcd4e3a04fbfc4b Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 4 Jun 2025 10:52:18 +0800
4Subject: [PATCH 1/2] test_sysinfo.c: print out SIGRTMIN
5
6This will be used by ts/kill/decode.
7
8Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/3605]
9
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
11---
12 tests/helpers/test_sysinfo.c | 8 ++++++++
13 1 file changed, 8 insertions(+)
14
15diff --git a/tests/helpers/test_sysinfo.c b/tests/helpers/test_sysinfo.c
16index 1559d471f..3a791e7f1 100644
17--- a/tests/helpers/test_sysinfo.c
18+++ b/tests/helpers/test_sysinfo.c
19@@ -27,6 +27,7 @@
20 #include <errno.h>
21 #include <time.h>
22 #include <sys/ioctl.h>
23+#include <signal.h>
24
25 #include "c.h"
26
27@@ -116,6 +117,12 @@ static int hlp_ulong_max32(void)
28 return 0;
29 }
30
31+static int hlp_sigrtmin(void)
32+{
33+ printf("%d\n", SIGRTMIN);
34+ return 0;
35+}
36+
37 static int hlp_wcsspn_ok(void)
38 {
39 printf("%d\n", wcsspn(L"FOO", L"F") == 1);
40@@ -229,6 +236,7 @@ static const mntHlpfnc hlps[] =
41 { "ULONG_MAX", hlp_ulong_max },
42 { "ULONG_MAX32",hlp_ulong_max32 },
43 { "UINT64_MAX", hlp_u64_max },
44+ { "SIGRTMIN", hlp_sigrtmin },
45 { "byte-order", hlp_endianness },
46 { "wcsspn-ok", hlp_wcsspn_ok },
47 { "enotty-ok", hlp_enotty_ok },
48--
492.34.1
50
diff --git a/meta/recipes-core/util-linux/util-linux/0002-ts-kill-decode-use-SIGRTMIN-from-test_sysinfo-instea.patch b/meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch
index 5a00c9037a..f4e2f9e745 100644
--- a/meta/recipes-core/util-linux/util-linux/0002-ts-kill-decode-use-SIGRTMIN-from-test_sysinfo-instea.patch
+++ b/meta/recipes-core/util-linux/util-linux/0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch
@@ -1,7 +1,7 @@
1From 9848b0d8c90d9a24275bf402f6d76e97f62b3ba4 Mon Sep 17 00:00:00 2001 1From c5d5e8873029d170fcab38a6fbd5d5a355574b9f Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 4 Jun 2025 16:27:19 +0800 3Date: Wed, 4 Jun 2025 16:27:19 +0800
4Subject: [PATCH 2/2] ts/kill/decode: use SIGRTMIN from test_sysinfo instead of 4Subject: [PATCH] ts/kill/decode: use RTMIN from 'kill -L' instead of
5 hardcoding 34 5 hardcoding 34
6 6
7glibc uses 34 as the value of SIGRTMIN: 7glibc uses 34 as the value of SIGRTMIN:
@@ -16,9 +16,11 @@ With the hardcoded 34, test case fails with the following difference:
16-Ignored: HUP QUIT TRAP PIPE ALRM 16-Ignored: HUP QUIT TRAP PIPE ALRM
17+Ignored: HUP QUIT TRAP PIPE ALRM 34 17+Ignored: HUP QUIT TRAP PIPE ALRM 34
18 18
19Use SIGRTMIN got from test_sysinfo to fix this issue. 19Extract the value of RTMIN from 'kill -L' to avoid such hardcoding.
20 20
21Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/3605] 21Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
22
23Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/c5d5e8873029d170fcab38a6fbd5d5a355574b9f]
22 24
23Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 25Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
24--- 26---
@@ -26,15 +28,15 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
26 1 file changed, 7 insertions(+), 2 deletions(-) 28 1 file changed, 7 insertions(+), 2 deletions(-)
27 29
28diff --git a/tests/ts/kill/decode b/tests/ts/kill/decode 30diff --git a/tests/ts/kill/decode b/tests/ts/kill/decode
29index 03bc25ff6..dd34aacef 100755 31index 57149899e..524b4e5e2 100755
30--- a/tests/ts/kill/decode 32--- a/tests/ts/kill/decode
31+++ b/tests/ts/kill/decode 33+++ b/tests/ts/kill/decode
32@@ -48,14 +48,19 @@ ACK= 34@@ -53,14 +53,19 @@ ACK=
33 # Sending one more USR1 is for making the signal pending state. 35 # Sending one more USR1 is for making the signal pending state.
34 "$TS_CMD_KILL" -USR1 "$PID" 36 "$TS_CMD_KILL" -USR1 "$PID"
35 "$TS_CMD_KILL" -d "$PID" | { 37 "$TS_CMD_KILL" -d "$PID" | {
36- if [[ $("$TS_CMD_KILL" --list=34) == RT0 ]]; then 38- if [[ $("$TS_CMD_KILL" --list=34) == RT0 ]]; then
37+ SIGRTMIN=$($TS_HELPER_SYSINFO SIGRTMIN) 39+ SIGRTMIN=$("$TS_CMD_KILL" -L | grep -o '[0-9]\+ RTMIN' | cut -d " " -f 1)
38+ if [[ $("$TS_CMD_KILL" --list=$SIGRTMIN) == RT0 ]]; then 40+ if [[ $("$TS_CMD_KILL" --list=$SIGRTMIN) == RT0 ]]; then
39 # See man signal(7). 41 # See man signal(7).
40 # The Linux kernel supports a range of 33 different real-time signals, 42 # The Linux kernel supports a range of 33 different real-time signals,
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-05 07:27:39 +0000