From patchwork Mon Jan 29 14:19:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 126165 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp2478532ljd; Mon, 29 Jan 2018 06:19:54 -0800 (PST) X-Google-Smtp-Source: AH8x225BhoAb6I4DQMIVK5j+wKQt6eIyU+nlsh4xrS0sjABrZt6j8zkDZXptY8w52H1Ednee7w59 X-Received: by 10.98.29.2 with SMTP id d2mr27420609pfd.204.1517235594501; Mon, 29 Jan 2018 06:19:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517235594; cv=none; d=google.com; s=arc-20160816; b=BOI3LTbrlHxjz+CZDC5T7XJOfm1N7YYCxwSLjRCx83FKHZdoTik5S+f6Ys1GPoEsFN lTn4mBcLUii1Xv3h/CKxb8OtpHaPkFQWp0wWQS1YLaEdFWh5piJd5JVhvNAVWv0UCHH4 kAZOZA0GNqfdXD/W+FIFzlH60K2Y1udn0PnfYX41ne973AlvViPUxFpiwlc9iYyF5+n7 IrnUy2adBAGuyBjjgtj4iW1WgZZr2KN+qVvshsdx3GK0oPPA3MuZ64tYKsaDpwyrF2yc IijPGEHjp/ulqxJx/SZhpZId++qntNoLr78Bf8B2Al6p8aaO6v8xIbRstmYAkKWynZmW Mt+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=qAQIcLKhvdUzt6RcabDjFnwDYfdXXHfKCfqzmCxqGac=; b=bkpsjnya0YhQK8o5C2A8ii9po7nrX1nBQ5cxc412mk/BV71SmlVUjZr9pUNGgISLrW uX7hJ6synXK7jJ+IjH0E5/Hb7QwjFxf8ONd7KIGjF8O/b+rpKH9iDVzPKBu7bHUysl56 8hKBx2DGWtEQCp+iQlvBSL7qDl/6W0O6KbOWO/8z7Vnaig1ibIBVQUQ3q34L+xbZZ3g7 7d7TuERSn8+oe9F3TxUQEo71Ye9ue/wsr2wzz1PwKrW2c/Mmk1FZWAFbTQ4wHR5j6v6H JZ7XSbdA5/OOnpnmLsVdf6/aqPStVtW/9qHUbEx+kVW7kaoTeJjVarF1y96stAcBlIDg TnWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XIZo1xNF; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m185si897865pfc.278.2018.01.29.06.19.53; Mon, 29 Jan 2018 06:19:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XIZo1xNF; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 40BE9787EA; Mon, 29 Jan 2018 14:19:48 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by mail.openembedded.org (Postfix) with ESMTP id CBB197875F for ; Mon, 29 Jan 2018 14:19:46 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id v188so10185440lfa.11 for ; Mon, 29 Jan 2018 06:19:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=VKb59PTJIvHiEmdK5HMJzEjBd3HCuA0jcW+mAgQu0g4=; b=XIZo1xNFmuTw+JxmG+8zqUJukRXl6wK1sdhbcr6G/B5ZTvNUStUpV0EEZeTIc0Vvj0 OhJs3fZ+oGCRC5uwDBjl2pksQociv2JEqa5URVwVt6JFVB3CGmcdh7QSIvTmh4t4OrjK WfcRu2Ur56CFrxla5j0Dnr31wi8Cv6kaXvKiQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=VKb59PTJIvHiEmdK5HMJzEjBd3HCuA0jcW+mAgQu0g4=; b=ajuFgA1lDiw26SsU8d8YjDHO+P8eSM3LQYTtHqic/K54iXsrO9ojyaFTocllL64z38 RECYbQcN+1FvEomXWV6v7VPM7aIBt4K0c+Ek/1A0P+LyyN4f0HMXN10hnBkDOhtg+kBu tIyMpPcB+jG1eI4os+sMnfUNBW8qCLYv1f9XBaf0Uz96e8fN55xC/UsTtjmGnnrOrRp6 Rk8XKaz3/xVJwAdBnlBhK16vlj1G3EyEI7RFyq+8hN6YTbzNM067GWG5DUTreXttmL+G IS6Nmb38zU4lkOC0lnDLxgc+I8uprN0jUNwW0P3v16xmf0uhhv2X5u4q9C8VGEVBl4Jp l9Fw== X-Gm-Message-State: AKwxytdaHDFCLgj1EPgoPQiZbSo67XNyBj83TjquHtZgwLSoKpSRNf+4 djKIkspeTd3VQ1iJ37kSCh/XdlA+S6w= X-Received: by 10.46.86.73 with SMTP id k70mr9208345ljb.1.1517235586750; Mon, 29 Jan 2018 06:19:46 -0800 (PST) Received: from localhost (c-153870d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.56.21]) by smtp.gmail.com with ESMTPSA id q11sm1012091lje.42.2018.01.29.06.19.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 06:19:46 -0800 (PST) From: Anders Roxell To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jan 2018 15:19:17 +0100 Message-Id: <1517235557-11980-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.7.4 Subject: [OE-core] [PATCH] ltp: bump to release 20180118 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Removed 3 patches that have been upstreamed: - 0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch - 0037-ltp-fix-format-security-error.patch - 0038-generate-reproducible-gzip.patch Reworked path 0002-Add-knob-to-control-whether-numa-support-should-be-c.patch. Signed-off-by: Anders Roxell --- ...-control-whether-numa-support-should-be-c.patch | 39 +++++++++++----------- ...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 35 ------------------- .../ltp/0037-ltp-fix-format-security-error.patch | 36 -------------------- .../ltp/ltp/0038-generate-reproducible-gzip.patch | 20 ----------- .../ltp/{ltp_20170929.bb => ltp_20180118.bb} | 5 +-- 5 files changed, 21 insertions(+), 114 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.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%) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
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 9865020..31460b9 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 Signed-off-by: Roy.Li Signed-off-by: Khem Raj +Signed-off-by: Anders Roxell 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 +index fc3383e..44cb559 100644 --- a/m4/ltp-numa.m4 +++ b/m4/ltp-numa.m4 -@@ -24,7 +24,13 @@ dnl ---------------------------- +@@ -24,7 +24,13 @@ dnl LTP_CHECK_SYSCALL_NUMA + 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_DEFUN([LTP_CHECK_SYSCALL_NUMA], [ +- AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes]) ++ AC_MSG_CHECKING([for numa]) ++ AC_ARG_WITH( ++ [numa], ++ AC_HELP_STRING([--without-numa], ++ [without numa support]), ++ [], ++ [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 +@@ -42,3 +48,5 @@ exit(1); + AC_DEFINE(HAVE_NUMA_V2, 1, [Define to 1 if you have libnuma and it's headers version >= 2 installed.]) + fi + ]) +AC_MSG_RESULT([$with_numa]) +]) -- 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 efa6d06..0000000 --- a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 00ba7cdd0608b1507027428f9f87b1cb9747372b Mon Sep 17 00:00:00 2001 -From: Dengke Du -Date: Thu, 9 Feb 2017 15:54:53 +0800 -Subject: [PATCH] lib: Use PTHREAD_MUTEX_RECURSIVE in place of - PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP for non-glibc - -e.g. musl does not implement the _NP mutex types - -Signed-off-by: Khem Raj -Signed-off-by: Dengke Du - -Upstream-Status: Pending ---- - lib/tst_res.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/tst_res.c b/lib/tst_res.c -index 61daaeb..435224f 100644 ---- a/lib/tst_res.c -+++ b/lib/tst_res.c -@@ -79,7 +79,11 @@ int TEST_ERRNO; - assert(strlen(buf) > 0); \ - } while (0) - -+#ifdef __GLIBC__ - static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+#else -+static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE }; -+#endif - - static void check_env(void); - static void tst_condense(int tnum, int ttype, const char *tmesg); --- -2.7.4 - 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..a4a2724 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 " 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 \ @@ -43,13 +43,10 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0026-crash01-Define-_GNU_SOURCE.patch \ file://0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch \ file://0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch \ - file://0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch \ file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \ 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 \ "