From patchwork Sat Jul 1 14:23:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 106829 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp3563259qge; Sat, 1 Jul 2017 07:26:17 -0700 (PDT) X-Received: by 10.98.8.81 with SMTP id c78mr947961pfd.213.1498919177893; Sat, 01 Jul 2017 07:26:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498919177; cv=none; d=google.com; s=arc-20160816; b=TsRAWzZoalbt1Z/TWYbzaNy9llr93hDxfTNIG6EOvvjbdtambn96BI5XSDkyV8gH2l sTYORqHKP2XYALQ+u8Mxq83LP04HobtFYZ+5pNttvSGoNttRx9N/xBhj2wwIiR0BATET P7QgH0GxesQHdmA+DzGf7Pmwrccjc8a57brtFvNZQogjw9qbcHh5rku6kCPAJ5/x7Lbi p0xGcwTb11ePWXPzEpBNcDzbL3OIhgIlahbgbUZsjCb2nlwvXOuT6RaepV1VxdFGuIsq hOARbm9T0F4rvdZ8KG/Bjz0mq1s1OG3cfsOr44PDxAhyaDbYFb6yF1PRx+UkRIYAk0sf SBeA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Dt7KsfH/YccZqDMYrLpjqU5gf1At0DuI7lQ4QfYRRYg=; b=aQH4pOqaxbEFwBvRQqs//L01jXSS0nf5i+Yzrr7n4oI/sWO6+6Vdz5CHJMx1jmC7hy iH+4WlmowxxPCN4FXzg+4BTP13xdP85G9+qWhCMO0LYoeuFk0voA0J+n5xuJME6rNdKI l24uEe2gzYkk0WykY6ZbUvFTFEG4HpHsdsuvx0scgjj1MPEhXm4fGzFaOvnklqInwbxD PDDF9Ac9DkjO8W9/tTsssTkRjqGlnz0qylTM7s875UkZ1XfWvXoKVOPHIoW/+z+O5DPK NZQG5GcAOtEGom71qKjbQFKs0gKk/ere6mXu/Yy0gJJW/PAA/lr3IIDWY07+DsySU+dj ZqJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=KKoeo7lq; 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=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g64si8046137pfj.270.2017.07.01.07.26.17; Sat, 01 Jul 2017 07:26:17 -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=@gmail.com header.b=KKoeo7lq; 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=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 03BA67832A; Sat, 1 Jul 2017 14:25:02 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id 1C306775DE for ; Sat, 1 Jul 2017 14:24:03 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id z6so20459059pfk.3 for ; Sat, 01 Jul 2017 07:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1V/oWnblBysSXU+25lOLCYVDcY4a942PnK4oSyYGLG4=; b=KKoeo7lqXHMHjpBkP2NkJ+/bpN8XZEMY98W/YQFwdBFU+cuiI4lLpuCDGOHhDtFZ8x 9Tyn/fDjv/dIvXFc2zyDxTfGOtZo51C+29Q0wF3WxVNCRZcba6IAwDd1aMmWqDFocfkx X3rpbc8kOsVDs5CUW4G91/UaKDFTHKiio0NA/km0BtYOVZunJOtkFxMbpuLDlsENbnLM rcFLQV8GUVGIawIz3/yIrqwz3NhJpc0TtjclkusdYuIuvYt7lRnFzh5uOSRCCWhBH3k0 Hj8CpmmZyh8INYHxHmHMSO6ujn8Zjunmx/WWPKr+8aKAaCA61GIjh5Vif2YXXy9boFk+ 2kPA== 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:in-reply-to :references; bh=1V/oWnblBysSXU+25lOLCYVDcY4a942PnK4oSyYGLG4=; b=DwcUyh7OEzorYuGshxIMqsv4/YG/Hi+fjS2UKpJ2MfXb/yNyiAEBX1y0+qRv5Plftt jgbp+MdK/bqCHy2Wt1RhYRFte70HcDS2eXt9uxIO43i5NohZpqwlnQ3U7k7fyMcOossy y7DBAe2dbgFQeoxGEeTaoyQKNmYS120C7SPy4bqGLcV3/XfZZoS6uC2WH8TqOcEgqxLf pJuyxcR1APIq1k3KEkkuXvKa6x9DnJUzzAlppzOUP6s36SkuxkoP3EQWLnl6tzWnxjUB nSvA4sKgZk+IKGCB8XRhW5pt1e8155wrZvGsoKip1wbPLlBplrrrOBN2NOuEgC8BWq8H zddw== X-Gm-Message-State: AIVw111ijJ3UbCooFSF/5fuvR+JhMTfhKgoxOYOKVfx5ElAZqnJI3N+/ tkXDX0NEOMJYyEMY X-Received: by 10.99.116.2 with SMTP id p2mr1022968pgc.162.1498919044387; Sat, 01 Jul 2017 07:24:04 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::3df3]) by smtp.gmail.com with ESMTPSA id 17sm25026909pfn.84.2017.07.01.07.24.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Jul 2017 07:24:03 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 1 Jul 2017 07:23:20 -0700 Message-Id: X-Mailer: git-send-email 2.13.2 In-Reply-To: References: Subject: [OE-core] [PATCH 17/19] strace: upgrade to 4.17 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 Fix build with upcoming glibc 2.26 Signed-off-by: Khem Raj --- ...8-replace-struct-ucontext-with-ucontext_t.patch | 31 ++++++++++++++++++++++ .../strace/strace/Makefile-ptest.patch | 19 ++++++++----- .../strace/{strace_4.16.bb => strace_4.17.bb} | 5 ++-- 3 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch rename meta/recipes-devtools/strace/{strace_4.16.bb => strace_4.17.bb} (87%) -- 2.13.2 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch b/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch new file mode 100644 index 0000000000..1985d8104d --- /dev/null +++ b/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch @@ -0,0 +1,31 @@ +From 07f71a12cb88919c6113284fc43bf4967e5e2bc1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 28 Jun 2017 11:36:57 -0700 +Subject: [PATCH 8/8] replace struct ucontext with ucontext_t + +glibc >= 2.26 has dropped the tag struct ucontext +from ucontext_t type + +Upstream-Status: Submitted + +Signed-off-by: Khem Raj +--- + linux/arm/arch_sigreturn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux/arm/arch_sigreturn.c b/linux/arm/arch_sigreturn.c +index b60dad8..a2b7100 100644 +--- a/linux/arm/arch_sigreturn.c ++++ b/linux/arm/arch_sigreturn.c +@@ -9,7 +9,7 @@ arch_sigreturn(struct tcb *tcp) + #ifdef AARCH64 + tcp->currpers == 0 ? + (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO + +- offsetof(struct ucontext, uc_sigmask)) : ++ offsetof(ucontext_t, uc_sigmask)) : + #endif + (*arm_sp_ptr + + OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK); +-- +2.13.2 + diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 876c2d8629..07ea0b37f2 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,19 +1,23 @@ -strace: Add ptest +From 0574ae9926308dcbca78bd8cd0f0f143f19cbcb5 Mon Sep 17 00:00:00 2001 +From: Gabriel Barbu +Date: Thu, 25 Jul 2013 15:28:33 +0200 +Subject: [PATCH 4/8] strace: Add ptest Upstream-Status: Inappropriate Signed-off-by: Gabriel Barbu Signed-off-by: Chong Lu + --- configure.ac | 2 +- tests/Makefile.am | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index b2b03c6..464a9dc 100644 +index 61d6425..6387c24 100644 --- a/configure.ac +++ b/configure.ac -@@ -39,7 +39,7 @@ AC_COPYRIGHT([Copyright (C) 1999-2017 The strace developers.]) +@@ -41,7 +41,7 @@ AC_COPYRIGHT([Copyright (C) 1999-]copyright_year[ The strace developers.]) AC_CONFIG_SRCDIR([strace.c]) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_HEADERS([config.h]) @@ -23,11 +27,11 @@ index b2b03c6..464a9dc 100644 AM_MAINTAINER_MODE AC_CANONICAL_HOST diff --git a/tests/Makefile.am b/tests/Makefile.am -index 311d3bb..72f9022 100644 +index 5aa7f89..a55a355 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -960,3 +960,21 @@ $(objects): scno.h - CLEANFILES = ksysent.h $(TESTS:=.tmp) +@@ -379,3 +379,21 @@ clean-local-check: + CLEANFILES = ksysent.h include ../scno.am + @@ -48,3 +52,6 @@ index 311d3bb..72f9022 100644 + sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ + done + for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done +-- +2.13.2 + diff --git a/meta/recipes-devtools/strace/strace_4.16.bb b/meta/recipes-devtools/strace/strace_4.17.bb similarity index 87% rename from meta/recipes-devtools/strace/strace_4.16.bb rename to meta/recipes-devtools/strace/strace_4.17.bb index b6cd2ac9b9..72fa994489 100644 --- a/meta/recipes-devtools/strace/strace_4.16.bb +++ b/meta/recipes-devtools/strace/strace_4.17.bb @@ -13,10 +13,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ file://mips-SIGEMT.patch \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ + file://0008-replace-struct-ucontext-with-ucontext_t.patch \ " -SRC_URI[md5sum] = "2873366cac98770efcbed6e748d5ef23" -SRC_URI[sha256sum] = "98487cb5178ec1259986cc9f6e2a844f50e5d1208c112cc22431a1e4d9adf0ef" +SRC_URI[md5sum] = "8d7eb10eba68bad83a269197e634b626" +SRC_URI[sha256sum] = "81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419" inherit autotools ptest bluetooth