From patchwork Thu Oct 5 17:47:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 114963 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp851224qgn; Thu, 5 Oct 2017 10:48:02 -0700 (PDT) X-Received: by 10.99.161.17 with SMTP id b17mr21972319pgf.292.1507225682126; Thu, 05 Oct 2017 10:48:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507225682; cv=none; d=google.com; s=arc-20160816; b=vAQaGZRHw4cOcJ509GASSdcHDnHcBMLke0geCrrECe77UbbwaiTdGQKKOv/1xg4s6s tjAMRLCrIjIBi51CpGFoZ49NSRNiYQxMqfwZNLg8TFglhEs+bPGSXPMjpMrZe92cn8Zz rNTzUFYxPDgUSB6jbexbPWsH+9DylD84t6TdLFoRsH7a1DOe+t9vB33dKG9CoXGh4whX Hzavz5GUukjxFWkFTV2K9mEwgfian7K8oAodCp0J4PtauaqKraxo1vG27Uv6nSKw614V uqa/rKJwLWOY4CjMZuaqE2vVW22aDH99+/+5bvpV+QL64S0hsywkN5Eg9U7HL59yRKIE FIsw== 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=+s6gULF6TtTOLxTvXiyCO0g0YtZKaubAzl8Ob3Yo9v4=; b=pJJw455RC8BChJHcMpnQPPqsKKK5maZpEjeLB3c9b88OlRH8+Um/dLluQdMyz0H78R 5sKNT8jowu48oNZFA3mABJAiYqOdoDRGDEE3DsstR4a3lUJhQ2ZaB8qwYpO3kyVl4eYd +0ZuUedc8J1J4SgFXI5YEA4+NTpVHyRzCH1EUzVlYlEgL28r7Fm2eCm3fxFj+Rrp4JjJ 3bLDrF+EodMrS4RR3PYlXtyr8zimOipzXEzL8Ys1FC2E7lbu0N2WOjbaT4V51XyT9/gS Rlf62f4elYEHxQHV8btMHZkUzlED4UQGm4rYqt8DNTVfucyR+X/TpK8XLinpqMGOlwXB 9Qjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=FwyfFppC; 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 89si2999829ple.523.2017.10.05.10.48.01; Thu, 05 Oct 2017 10:48:02 -0700 (PDT) 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=FwyfFppC; 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 review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7871B7806D; Thu, 5 Oct 2017 17:47:59 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-lf0-f41.google.com (mail-lf0-f41.google.com [209.85.215.41]) by mail.openembedded.org (Postfix) with ESMTP id 6FACE71957 for ; Thu, 5 Oct 2017 17:47:57 +0000 (UTC) Received: by mail-lf0-f41.google.com with SMTP id n140so15542428lfn.4 for ; Thu, 05 Oct 2017 10:47:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=WF8ogzzzCcjMvcsipsN+5+ijJpY/YEZiWmT6M9PcRXg=; b=FwyfFppCEvBsMeLxrZ5HcLwEUPvPJatPWakTqU8qKMz3CmwwVC/dTy8+F6cYkWv6R4 xN1i5i8BKDPHKLcmfb0Kqu0F2VgVxMkmuC4mvXmVONBWIFNmJDnnShzHfxDF7lI5qMYv 7cIPxEQyqe5uqH2pKb/0f68IvC+m6ubw3/X+E= 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=WF8ogzzzCcjMvcsipsN+5+ijJpY/YEZiWmT6M9PcRXg=; b=fwHyMthd/8IAG2aceGKnQjFKWlBzwuAyXjVT2nwrmbv5ALULHhm5A9105XiPeNbpot DISbFdwRPcrYHDrO7zP2jpklnu4fw0KWY7gVsoi4e0622D/zkO8O7ocReXl+aF0wNItD 7a75sy74HOdAXGP6EtujHGtu58gYCn+iGqfqXm9gGthSEAYJgTO0DIqDGKsf32K3ZcoJ Xqhu3nq+UlhA4mkr9SxiE5z1v++Nkby/tJMVVEK+Zd4Cy8yxaRjZOnPQYOr6jNhKTit+ llngAm0+YMIp7gm64kIym+YGWTJJbY0Ov0Xyt19Nh/IUgKEuoDn/a8mIGByOGXwa8MuW SOOg== X-Gm-Message-State: AMCzsaWe8iJkatNvYgDjkmQh3dL6UgWvIERRWifg/xX7/gzRTdEpgY45 zVMKIvBTrmOeVuwtzm66WkwINBllVRc= X-Google-Smtp-Source: AOwi7QDHrxlM8W6Irlj1WQ1SoaEAkCQf+uqxPdQkL/Y06lMTXeiXEjB2fQ2k6wyXsmNFkYkdF1ZgUA== X-Received: by 10.25.215.99 with SMTP id o96mr6500436lfg.33.1507225677545; Thu, 05 Oct 2017 10:47:57 -0700 (PDT) Received: from localhost.localdomain (a91-156-68-101.elisa-laajakaista.fi. [91.156.68.101]) by smtp.gmail.com with ESMTPSA id d64sm4120860ljd.71.2017.10.05.10.47.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Oct 2017 10:47:56 -0700 (PDT) From: Fathi Boudra To: openembedded-core@lists.openembedded.org Date: Thu, 5 Oct 2017 20:47:51 +0300 Message-Id: <20171005174751.30098-1-fathi.boudra@linaro.org> X-Mailer: git-send-email 2.14.2 Subject: [OE-core] [PATCH] ltp: update to new upstream release 20170929 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 * Update SRCREV to match 20170929 release * Drop patches available in 20170929 release: - 0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch - 0038-commands-gdb01-replace-stdin-with-dev-null.patch Signed-off-by: Fathi Boudra --- ...E_SIZE-redefinition-and-O_CREAT-undeclear.patch | 113 --------------------- ...ommands-gdb01-replace-stdin-with-dev-null.patch | 34 ------- .../ltp/{ltp_20170516.bb => ltp_20170929.bb} | 4 +- 3 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch rename meta/recipes-extended/ltp/{ltp_20170516.bb => ltp_20170929.bb} (96%) -- 2.14.2 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
diff --git a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch b/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch deleted file mode 100644 index c8738ae0d4..0000000000 --- a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch +++ /dev/null @@ -1,113 +0,0 @@ -From a9d5595d2fa2ab252f1cabf63f4b65c3efbafeb9 Mon Sep 17 00:00:00 2001 -From: Dengke Du -Date: Thu, 10 Aug 2017 15:27:03 +0800 -Subject: [PATCH] ltp: fix PAGE_SIZE redefinition and O_CREAT undeclear when - build with musl - -error 1: - -|stack_clash.c:50:22: error: expected identifier or '(' before numeric constant -| static unsigned long PAGE_SIZE; - -This is because the musl libc already contain PAGE_SIZE definition in limits.c, -we can check it here: - - https://git.musl-libc.org/cgit/musl/tree/include/limits.h#n43 - -error 2: - -|ck01.c:157:22: error: 'O_CREAT' undeclared (first use in this function); did you mean 'S_IREAD'? -| fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, 0644); -| ^~~~~~~ -| S_IREAD - -This is because the musl libc put those in fcntl.h, so we should include that -file. - -Upstream-Status: Submitted [ https://github.com/linux-test-project/ltp/pull/194 ] - -Signed-off-by: Dengke Du ---- - testcases/cve/stack_clash.c | 12 ++++++------ - testcases/kernel/syscalls/flock/flock01.c | 1 + - testcases/kernel/syscalls/flock/flock02.c | 1 + - 3 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/testcases/cve/stack_clash.c b/testcases/cve/stack_clash.c -index 2ef1a82..7c45991 100644 ---- a/testcases/cve/stack_clash.c -+++ b/testcases/cve/stack_clash.c -@@ -47,7 +47,7 @@ - #include "tst_test.h" - #include "tst_safe_stdio.h" - --static unsigned long PAGE_SIZE; -+static unsigned long PAGE_SIZE_tst; - static unsigned long PAGE_MASK; - static unsigned long GAP_PAGES = 256; - static unsigned long THRESHOLD; -@@ -66,7 +66,7 @@ void exhaust_stack_into_sigsegv(void) - exhaust_stack_into_sigsegv(); - } - --#define MAPPED_LEN PAGE_SIZE -+#define MAPPED_LEN PAGE_SIZE_tst - static unsigned long mapped_addr; - - void segv_handler(int sig, siginfo_t *info, void *data LTP_ATTRIBUTE_UNUSED) -@@ -150,7 +150,7 @@ void do_child(void) - stack_t signal_stack; - struct sigaction segv_sig = {.sa_sigaction = segv_handler, .sa_flags = SA_ONSTACK|SA_SIGINFO}; - void *map; -- unsigned long gap = GAP_PAGES * PAGE_SIZE; -+ unsigned long gap = GAP_PAGES * PAGE_SIZE_tst; - struct rlimit rlimit; - - rlimit.rlim_cur = rlimit.rlim_max = RLIM_INFINITY; -@@ -200,8 +200,8 @@ void setup(void) - { - char buf[4096], *p; - -- PAGE_SIZE = sysconf(_SC_PAGESIZE); -- PAGE_MASK = ~(PAGE_SIZE - 1); -+ PAGE_SIZE_tst = sysconf(_SC_PAGESIZE); -+ PAGE_MASK = ~(PAGE_SIZE_tst - 1); - - buf[4095] = '\0'; - SAFE_FILE_SCANF("/proc/cmdline", "%4095[^\n]", buf); -@@ -214,7 +214,7 @@ void setup(void) - tst_res(TINFO, "stack_guard_gap = %ld", GAP_PAGES); - } - -- THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE; -+ THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE_tst; - - { - volatile int *a = alloca(128); -diff --git a/testcases/kernel/syscalls/flock/flock01.c b/testcases/kernel/syscalls/flock/flock01.c -index 3e17be4..06d89e3 100644 ---- a/testcases/kernel/syscalls/flock/flock01.c -+++ b/testcases/kernel/syscalls/flock/flock01.c -@@ -69,6 +69,7 @@ - #include - #include - #include -+#include - #include "test.h" - - void setup(void); -diff --git a/testcases/kernel/syscalls/flock/flock02.c b/testcases/kernel/syscalls/flock/flock02.c -index 414df68..9ddf729 100644 ---- a/testcases/kernel/syscalls/flock/flock02.c -+++ b/testcases/kernel/syscalls/flock/flock02.c -@@ -75,6 +75,7 @@ - #include - #include - #include -+#include - #include - #include - #include "test.h" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch b/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch deleted file mode 100644 index f7c0a4bf17..0000000000 --- a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0 Mon Sep 17 00:00:00 2001 -From: Jan Stancek -Date: Mon, 11 Sep 2017 12:57:58 +0200 -Subject: [PATCH] commands/gdb01: replace stdin with /dev/null - -If this testcase runs as background process, gdb can receive -SIGTTOU and then testcase gets stuck. - -Signed-off-by: Jan Stancek - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0] - -Signed-off-by: Yi Zhao ---- - testcases/commands/gdb/gdb01.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/commands/gdb/gdb01.sh b/testcases/commands/gdb/gdb01.sh -index 07ae36f..e3a5b51 100755 ---- a/testcases/commands/gdb/gdb01.sh -+++ b/testcases/commands/gdb/gdb01.sh -@@ -29,7 +29,7 @@ TST_NEEDS_CMDS="gdb /bin/cat" - - simple_test() - { -- gdb /bin/cat -ex "run /etc/passwd" -ex quit -+ gdb /bin/cat -ex "run /etc/passwd" -ex quit < /dev/null - RC=$? - if [ $RC -eq 0 ] ; then - tst_res TPASS "gdb attached to process and completed run" --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb b/meta/recipes-extended/ltp/ltp_20170929.bb similarity index 96% rename from meta/recipes-extended/ltp/ltp_20170516.bb rename to meta/recipes-extended/ltp/ltp_20170929.bb index 653cbfd4ed..925dd91256 100644 --- a/meta/recipes-extended/ltp/ltp_20170516.bb +++ b/meta/recipes-extended/ltp/ltp_20170929.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 = "18916a2e6d8c997b7b29dcfa9550d5a15b22ed22" +SRCREV = "e671f2a13c695bbd87f7dfec2954ca7e3c43f377" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \ @@ -48,8 +48,6 @@ 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-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch \ - file://0038-commands-gdb01-replace-stdin-with-dev-null.patch \ " S = "${WORKDIR}/git"