summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch39
-rw-r--r--meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch35
-rw-r--r--meta/recipes-extended/ltp/ltp/0037-ltp-fix-format-security-error.patch36
-rw-r--r--meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch20
-rw-r--r--meta/recipes-extended/ltp/ltp_20180118.bb (renamed from meta/recipes-extended/ltp/ltp_20170929.bb)5
5 files changed, 21 insertions, 114 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch b/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch
index 98650205d8..31460b9089 100644
--- a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch
+++ b/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch
@@ -9,34 +9,35 @@ during build depending upong numa being staged or not
9 9
10Signed-off-by: Roy.Li <rongqing.li@windriver.com> 10Signed-off-by: Roy.Li <rongqing.li@windriver.com>
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
12Upstream-Status: Pending 13Upstream-Status: Pending
13--- 14---
14 m4/ltp-numa.m4 | 10 +++++++++- 15 m4/ltp-numa.m4 | 10 +++++++++-
15 1 file changed, 9 insertions(+), 1 deletion(-) 16 1 file changed, 9 insertions(+), 1 deletion(-)
16 17
17diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4 18diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4
18index 60ae07b..ed7078d 100644 19index fc3383e..44cb559 100644
19--- a/m4/ltp-numa.m4 20--- a/m4/ltp-numa.m4
20+++ b/m4/ltp-numa.m4 21+++ b/m4/ltp-numa.m4
21@@ -24,7 +24,13 @@ dnl ---------------------------- 22@@ -24,7 +24,13 @@ dnl LTP_CHECK_SYSCALL_NUMA
23 dnl ----------------------------
22 dnl 24 dnl
23 AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], 25 AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], [
24 [dnl 26- AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes])
25-AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ 27+ AC_MSG_CHECKING([for numa])
26+AC_MSG_CHECKING([for numa]) 28+ AC_ARG_WITH(
27+AC_ARG_WITH( 29+ [numa],
28+ [numa], 30+ AC_HELP_STRING([--without-numa],
29+ AC_HELP_STRING([--without-numa], 31+ [without numa support]),
30+ [without numa support]), 32+ [],
31+ [], 33+ [AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes])
32+ [AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ 34 AC_CHECK_HEADERS([numa.h numaif.h], [], [have_numa_headers=no])
33 LTP_SYSCALL_NUMA_HEADERS=yes 35
34 AC_CHECK_LIB(numa,numa_alloc_onnode,[have_numa_alloc_onnode="yes"]) 36 if test "x$have_numa_headers" != "xno"; then
35 if test "x$have_numa_alloc_onnode" = "xyes"; then 37@@ -42,3 +48,5 @@ exit(1);
36@@ -48,3 +54,5 @@ if test "x$have_mpol_constants" = "xyes"; then 38 AC_DEFINE(HAVE_NUMA_V2, 1, [Define to 1 if you have libnuma and it's headers version >= 2 installed.])
37 AC_DEFINE(HAVE_MPOL_CONSTANTS,1,[define to 1 if you have all constants required to use mbind tests]) 39 fi
38 fi 40 ])
39 )])
40+AC_MSG_RESULT([$with_numa]) 41+AC_MSG_RESULT([$with_numa])
41+]) 42+])
42-- 43--
diff --git a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch b/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
deleted file mode 100644
index efa6d060a0..0000000000
--- a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 00ba7cdd0608b1507027428f9f87b1cb9747372b Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Thu, 9 Feb 2017 15:54:53 +0800
4Subject: [PATCH] lib: Use PTHREAD_MUTEX_RECURSIVE in place of
5 PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP for non-glibc
6
7e.g. musl does not implement the _NP mutex types
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Dengke Du <dengke.du@windriver.com>
11
12Upstream-Status: Pending
13---
14 lib/tst_res.c | 4 ++++
15 1 file changed, 4 insertions(+)
16
17diff --git a/lib/tst_res.c b/lib/tst_res.c
18index 61daaeb..435224f 100644
19--- a/lib/tst_res.c
20+++ b/lib/tst_res.c
21@@ -79,7 +79,11 @@ int TEST_ERRNO;
22 assert(strlen(buf) > 0); \
23 } while (0)
24
25+#ifdef __GLIBC__
26 static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
27+#else
28+static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE };
29+#endif
30
31 static void check_env(void);
32 static void tst_condense(int tnum, int ttype, const char *tmesg);
33--
342.7.4
35
diff --git a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-format-security-error.patch b/meta/recipes-extended/ltp/ltp/0037-ltp-fix-format-security-error.patch
deleted file mode 100644
index 44d699051b..0000000000
--- a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-format-security-error.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 8eb3e111ae1b89e5afb249cf984d657f94da2385 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Tue, 17 Oct 2017 05:42:47 -0400
4Subject: [PATCH] ltp: fix format security error
5
6When enable option: -Werror=format-security, the error like:
7
8 | fcntl36.c: In function 'test_fn':
9 | fcntl36.c:303:2: error: format not a string literal and no format arguments [-Werror=format-security]
10 | tst_res(TINFO, msg);
11 | ^~~~~~~
12 | cc1: some warnings being treated as errors
13
14Upstream-Status: Pending
15
16Signed-off-by: Dengke Du <dengke.du@windriver.com>
17---
18 testcases/kernel/syscalls/fcntl/fcntl36.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/testcases/kernel/syscalls/fcntl/fcntl36.c b/testcases/kernel/syscalls/fcntl/fcntl36.c
22index 6f2eb6b..3246d13 100644
23--- a/testcases/kernel/syscalls/fcntl/fcntl36.c
24+++ b/testcases/kernel/syscalls/fcntl/fcntl36.c
25@@ -300,7 +300,7 @@ static void test_fn(void *f0(void *), void *f1(void *),
26 struct param p2[thread_cnt];
27 unsigned char buf[write_size];
28
29- tst_res(TINFO, msg);
30+ tst_res(TINFO, "%s", msg);
31
32 if (tst_fill_file(fname, 1, write_size, thread_cnt + 1))
33 tst_brk(TBROK, "Failed to create tst file");
34--
352.8.1
36
diff --git a/meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch b/meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch
deleted file mode 100644
index 0153ace8ea..0000000000
--- a/meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Do not generate timestamps in gzipped file headers.
2The timestamps prevent reproducible build.
3
4Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/233]
5
6Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
7
8diff --git a/testcases/network/generate.sh b/testcases/network/generate.sh
9index 00216a6..939f792 100755
10--- a/testcases/network/generate.sh
11+++ b/testcases/network/generate.sh
12@@ -55,7 +55,7 @@ fi
13 if [ ! -e "bin.sm" ] ; then
14 cnt=0
15 while [ $cnt -lt 5 ] ; do
16- gzip -1 -c ascii.sm >> "bin.sm"
17+ gzip -1 -c -n ascii.sm >> "bin.sm"
18 cnt=$(($cnt + 1))
19 done
20 fi
diff --git a/meta/recipes-extended/ltp/ltp_20170929.bb b/meta/recipes-extended/ltp/ltp_20180118.bb
index bc0ecdfa26..a4a2724b00 100644
--- a/meta/recipes-extended/ltp/ltp_20170929.bb
+++ b/meta/recipes-extended/ltp/ltp_20180118.bb
@@ -21,7 +21,7 @@ DEPENDS_append_libc-musl = " fts "
21EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " 21EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "
22CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" 22CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
23CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" 23CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
24SRCREV = "bac930f71b1e6786ebb8a894463503d07681ef6a" 24SRCREV = "731cd34e682d297b207668be8b1d15320a9ac1b1"
25 25
26SRC_URI = "git://github.com/linux-test-project/ltp.git \ 26SRC_URI = "git://github.com/linux-test-project/ltp.git \
27 file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \ 27 file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \
@@ -43,13 +43,10 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
43 file://0026-crash01-Define-_GNU_SOURCE.patch \ 43 file://0026-crash01-Define-_GNU_SOURCE.patch \
44 file://0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch \ 44 file://0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch \
45 file://0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch \ 45 file://0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch \
46 file://0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch \
47 file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \ 46 file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \
48 file://0034-periodic_output.patch \ 47 file://0034-periodic_output.patch \
49 file://0035-fix-test_proc_kill-hang.patch \ 48 file://0035-fix-test_proc_kill-hang.patch \
50 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ 49 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
51 file://0037-ltp-fix-format-security-error.patch \
52 file://0038-generate-reproducible-gzip.patch \
53 file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ 50 file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \
54 " 51 "
55 52