From 2cc49e454895811894b9b52420d2efe8a1ebcbc6 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Thu, 25 Jan 2018 15:26:30 +0100 Subject: [PATCH] ltp: bump to release 20180118 Signed-off-by: Anders Roxell --- ...001-m4-ltp-numa.m4-remove-build-run-check.patch | 38 +++++++++++++++++++ ...-control-whether-numa-support-should-be-c.patch | 44 ---------------------- .../ltp/0037-ltp-fix-format-security-error.patch | 36 ------------------ .../ltp/ltp/0038-generate-reproducible-gzip.patch | 20 ---------- .../ltp/{ltp_20170929.bb => ltp_20180118.bb} | 7 +--- 5 files changed, 40 insertions(+), 105 deletions(-) create mode 100644 meta/recipes-extended/ltp/ltp/0001-m4-ltp-numa.m4-remove-build-run-check.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-format-security-error.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch rename meta/recipes-extended/ltp/{ltp_20170929.bb => ltp_20180118.bb} (95%) diff --git a/meta/recipes-extended/ltp/ltp/0001-m4-ltp-numa.m4-remove-build-run-check.patch b/meta/recipes-extended/ltp/ltp/0001-m4-ltp-numa.m4-remove-build-run-check.patch new file mode 100644 index 0000000..56e9f15 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-m4-ltp-numa.m4-remove-build-run-check.patch @@ -0,0 +1,38 @@ +From 0941db12e4681c56d841ed50834a14dbcbdee123 Mon Sep 17 00:00:00 2001 +From: Anders Roxell +Date: Fri, 26 Jan 2018 10:54:38 +0100 +Subject: [PATCH] m4/ltp-numa.m4: remove build run check + +Upstream-Status: Inappropriate +Reason: Removing the runtime check in the configure step, since OE doesn't do +cross build, it simulates native build. + +Signed-off-by: Anders Roxell +--- + m4/ltp-numa.m4 | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4 +index fc3383e..ca302d9 100644 +--- a/m4/ltp-numa.m4 ++++ b/m4/ltp-numa.m4 +@@ -27,16 +27,6 @@ AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], [ + AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes]) + AC_CHECK_HEADERS([numa.h numaif.h], [], [have_numa_headers=no]) + +- if test "x$have_numa_headers" != "xno"; then +- AC_RUN_IFELSE([AC_LANG_PROGRAM([ +-#include +- ], [ +-#if LIBNUMA_API_VERSION < 2 +-exit(1); +-#endif +- ])], [have_numa_headers_v2=yes]) +- fi +- + if test "x$have_libnuma" = "xyes" -a "x$have_numa_headers" != "xno" -a "x$have_numa_headers_v2" = "xyes"; then + AC_SUBST(NUMA_LIBS, "-lnuma") + AC_DEFINE(HAVE_NUMA_V2, 1, [Define to 1 if you have libnuma and it's headers version >= 2 installed.]) +-- +2.7.4 + 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 deleted file mode 100644 index 9865020..0000000 --- a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 867ad5d5d64b9b27ee32148027532db0a00f6433 Mon Sep 17 00:00:00 2001 -From: "Roy.Li" -Date: Thu, 7 Jan 2016 17:33:26 +0000 -Subject: [PATCH 02/32] Add knob to control whether numa support should be - checked - -otherwise undeterministic dependency will be generated -during build depending upong numa being staged or not - -Signed-off-by: Roy.Li -Signed-off-by: Khem Raj -Upstream-Status: Pending ---- - m4/ltp-numa.m4 | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4 -index 60ae07b..ed7078d 100644 ---- a/m4/ltp-numa.m4 -+++ b/m4/ltp-numa.m4 -@@ -24,7 +24,13 @@ dnl ---------------------------- - dnl - AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], - [dnl --AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ -+AC_MSG_CHECKING([for numa]) -+AC_ARG_WITH( -+ [numa], -+ AC_HELP_STRING([--without-numa], -+ [without numa support]), -+ [], -+ [AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ - LTP_SYSCALL_NUMA_HEADERS=yes - AC_CHECK_LIB(numa,numa_alloc_onnode,[have_numa_alloc_onnode="yes"]) - if test "x$have_numa_alloc_onnode" = "xyes"; then -@@ -48,3 +54,5 @@ if test "x$have_mpol_constants" = "xyes"; then - AC_DEFINE(HAVE_MPOL_CONSTANTS,1,[define to 1 if you have all constants required to use mbind tests]) - fi - )]) -+AC_MSG_RESULT([$with_numa]) -+]) --- -2.7.0 - 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 44d6990..0000000 --- a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-format-security-error.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8eb3e111ae1b89e5afb249cf984d657f94da2385 Mon Sep 17 00:00:00 2001 -From: Dengke Du -Date: Tue, 17 Oct 2017 05:42:47 -0400 -Subject: [PATCH] ltp: fix format security error - -When enable option: -Werror=format-security, the error like: - - | fcntl36.c: In function 'test_fn': - | fcntl36.c:303:2: error: format not a string literal and no format arguments [-Werror=format-security] - | tst_res(TINFO, msg); - | ^~~~~~~ - | cc1: some warnings being treated as errors - -Upstream-Status: Pending - -Signed-off-by: Dengke Du ---- - testcases/kernel/syscalls/fcntl/fcntl36.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/fcntl/fcntl36.c b/testcases/kernel/syscalls/fcntl/fcntl36.c -index 6f2eb6b..3246d13 100644 ---- a/testcases/kernel/syscalls/fcntl/fcntl36.c -+++ b/testcases/kernel/syscalls/fcntl/fcntl36.c -@@ -300,7 +300,7 @@ static void test_fn(void *f0(void *), void *f1(void *), - struct param p2[thread_cnt]; - unsigned char buf[write_size]; - -- tst_res(TINFO, msg); -+ tst_res(TINFO, "%s", msg); - - if (tst_fill_file(fname, 1, write_size, thread_cnt + 1)) - tst_brk(TBROK, "Failed to create tst file"); --- -2.8.1 - 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 0153ace..0000000 --- a/meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch +++ /dev/null @@ -1,20 +0,0 @@ -Do not generate timestamps in gzipped file headers. -The timestamps prevent reproducible build. - -Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/233] - -Signed-off-by: Juro Bystricky - -diff --git a/testcases/network/generate.sh b/testcases/network/generate.sh -index 00216a6..939f792 100755 ---- a/testcases/network/generate.sh -+++ b/testcases/network/generate.sh -@@ -55,7 +55,7 @@ fi - if [ ! -e "bin.sm" ] ; then - cnt=0 - while [ $cnt -lt 5 ] ; do -- gzip -1 -c ascii.sm >> "bin.sm" -+ gzip -1 -c -n ascii.sm >> "bin.sm" - cnt=$(($cnt + 1)) - done - fi diff --git a/meta/recipes-extended/ltp/ltp_20170929.bb b/meta/recipes-extended/ltp/ltp_20180118.bb similarity index 95% rename from meta/recipes-extended/ltp/ltp_20170929.bb rename to meta/recipes-extended/ltp/ltp_20180118.bb index bc0ecdf..3c7ba95 100644 --- a/meta/recipes-extended/ltp/ltp_20170929.bb +++ b/meta/recipes-extended/ltp/ltp_20180118.bb @@ -21,11 +21,10 @@ DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "bac930f71b1e6786ebb8a894463503d07681ef6a" +SRCREV = "731cd34e682d297b207668be8b1d15320a9ac1b1" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \ - file://0002-Add-knob-to-control-whether-numa-support-should-be-c.patch \ file://0003-Add-knob-to-control-tirpc-support.patch \ file://0004-build-Add-option-to-select-libc-implementation.patch \ file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ @@ -48,9 +47,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0034-periodic_output.patch \ file://0035-fix-test_proc_kill-hang.patch \ file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0037-ltp-fix-format-security-error.patch \ - file://0038-generate-reproducible-gzip.patch \ file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ + file://0001-m4-ltp-numa.m4-remove-build-run-check.patch \ " S = "${WORKDIR}/git" @@ -62,7 +60,6 @@ TARGET_CC_ARCH += "${LDFLAGS}" export prefix = "/opt/ltp" export exec_prefix = "/opt/ltp" -PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite " # ltp network/rpc test cases ftbfs when libtirpc is found -- 2.7.4