summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2021-01-28 14:14:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-30 10:41:04 +0000
commit9c68281f8d07622c43194e3625140226cabd24c6 (patch)
tree7a73f7143f3ac2fea56641800c79dd70a4b08942 /meta
parentb5bc306da0a9afdea161dfd2d758bb17b8ca7905 (diff)
downloadpoky-9c68281f8d07622c43194e3625140226cabd24c6.tar.gz
ltp: upgrade 20200930 -> 20210121
0001-ltp-pan-Use-long-long-int-to-print-time_t.patch removed since it is included in 20210121 (From OE-Core rev: b6f49fc60a12ec6c4c1334ca3c266e99c03e81d4) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch33
-rw-r--r--meta/recipes-extended/ltp/ltp_20210121.bb (renamed from meta/recipes-extended/ltp/ltp_20200930.bb)3
2 files changed, 1 insertions, 35 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch b/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch
deleted file mode 100644
index 381ac417ca..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-ltp-pan-Use-long-long-int-to-print-time_t.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 6c2085badea7b461245837c452a0d3d8a8c2afff Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 20 Dec 2020 22:09:28 -0800
4Subject: [PATCH] ltp-pan: Use long long int to print time_t
5
6Some newer 32bit architectures ( e.g. riscv32 ) uses 64bit time_t so
7using %ld is not sufficient to print time_t, this also fixes a crash in
8ltp-pan on riscv32
9
10Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/ltp/patch/20201221061415.2540216-1-raj.khem@gmail.com/]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 pan/ltp-pan.c | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/pan/ltp-pan.c b/pan/ltp-pan.c
17index 8b9fbe5594..54b7cb8f26 100644
18--- a/pan/ltp-pan.c
19+++ b/pan/ltp-pan.c
20@@ -1389,8 +1389,8 @@ static void write_test_start(struct tag_pgrp *running, int no_kmsg)
21 if (!strcmp(reporttype, "rts")) {
22
23 printf
24- ("%s\ntag=%s stime=%ld\ncmdline=\"%s\"\ncontacts=\"%s\"\nanalysis=%s\n%s\n",
25- "<<<test_start>>>", running->cmd->name, running->mystime,
26+ ("%s\ntag=%s stime=%lld\ncmdline=\"%s\"\ncontacts=\"%s\"\nanalysis=%s\n%s\n",
27+ "<<<test_start>>>", running->cmd->name, (long long)running->mystime,
28 running->cmd->cmdline, "", "exit", "<<<test_output>>>");
29 }
30 fflush(stdout);
31--
322.29.2
33
diff --git a/meta/recipes-extended/ltp/ltp_20200930.bb b/meta/recipes-extended/ltp/ltp_20210121.bb
index e3c49fbf53..c541f9859f 100644
--- a/meta/recipes-extended/ltp/ltp_20200930.bb
+++ b/meta/recipes-extended/ltp/ltp_20210121.bb
@@ -27,14 +27,13 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
27 27
28CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" 28CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
29CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" 29CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
30SRCREV = "da2f34028f046a208aa2fed5e287df2538e69f91" 30SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb"
31 31
32SRC_URI = "git://github.com/linux-test-project/ltp.git \ 32SRC_URI = "git://github.com/linux-test-project/ltp.git \
33 file://0001-build-Add-option-to-select-libc-implementation.patch \ 33 file://0001-build-Add-option-to-select-libc-implementation.patch \
34 file://0007-Fix-test_proc_kill-hanging.patch \ 34 file://0007-Fix-test_proc_kill-hanging.patch \
35 file://0001-Add-more-musl-exclusions.patch \ 35 file://0001-Add-more-musl-exclusions.patch \
36 file://0001-Remove-OOM-tests-from-runtest-mm.patch \ 36 file://0001-Remove-OOM-tests-from-runtest-mm.patch \
37 file://0001-ltp-pan-Use-long-long-int-to-print-time_t.patch \
38 " 37 "
39 38
40S = "${WORKDIR}/git" 39S = "${WORKDIR}/git"