From patchwork Thu Jun 29 04:59:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 106599 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp684628qge; Wed, 28 Jun 2017 21:59:35 -0700 (PDT) X-Received: by 10.84.218.136 with SMTP id r8mr15766867pli.205.1498712375529; Wed, 28 Jun 2017 21:59:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498712375; cv=none; d=google.com; s=arc-20160816; b=qf9Rik5sqN6idCSCRbRAwdniqDAEAlMOtmaYV348hSli/10p/S78ipotTB5npevdCc Se3/TaytwT4xldyXyINSfSfnFQNvsZloLpfB+1xispeB1Enux6NnhJ2P8HwQqCtkP3RC 8/B1O98j4MIItP8ycjjqgmnF6zTYvAwQgdEaUQb90C90Am64FIMHo3wWlmzmOy+qZFJW rOKu1y5ngR60duuDp6yRAfcsc0cf/k7RJjOZGQg0G24BRpb4ZAbdnf1RB7KtB2iHRd/Q FbFVdsPAObXa93+ULQfN7UR0ixbkaCvDdjoeBX7LND1gAkldcXxTuM2cjEYx776RTPrJ Z/WQ== 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=IHFumJQUbBKNlBDlcdQOqtUpu1Un69qHtL85Px+qNUw=; b=Ye3rb+Kc2TxU1lNwLIBkc+UMF6gCVyvq8BtWc41bJLxbtkYxXNAy1jQ5sXp5uf4o8X vJXXMsbhmMp5Y0QFbYzgaOjOwTEcaNriNgrKO22vJ50AVfmfE3aDvRnvstH5rDNPZ0F4 ieRj3+F6uh60nHaQSrSUgpfrupW/LTcENjzKykPzbFsqQEIkU3881W0/M0lDBdVqk2DR ZCYMqAdLSokVu9zg//mfZlzVIqcADCL5UhyVU1nI2U9qwydf6IgoSmjMm44O7wdIpHaB uehx/zkAxLnzgCocLl00Li4ymhsdrfq36YBYK6Ktn/R2IM2AB+Si954yd4FElMxnXGwe b9iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=Ysxa1fSH; 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 d1si3235641pln.612.2017.06.28.21.59.35; Wed, 28 Jun 2017 21:59:35 -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=Ysxa1fSH; 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 0E6F678072; Thu, 29 Jun 2017 04:59:33 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f182.google.com (mail-pf0-f182.google.com [209.85.192.182]) by mail.openembedded.org (Postfix) with ESMTP id 10D3177F79 for ; Thu, 29 Jun 2017 04:59:13 +0000 (UTC) Received: by mail-pf0-f182.google.com with SMTP id c73so44226059pfk.2 for ; Wed, 28 Jun 2017 21:59:15 -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=YpuMXa6ZGKqGBQZOjgSg9r8DWize58/farv+hdisPZQ=; b=Ysxa1fSHtfJnJBlqJ6wYi/tLw5Z7Y2iKL3R6hUx1bSZmM81GQfOJhbQPRiuuK6ML5b IG/ysGswRRrwVogMcQSl7Jn/CE2b/V5S2OK4aaxPzw3Re9EA7bSpydloGpBva/S9JNfX GSeZRLuvfEHPZrQeV1cPsGOzd2lIL2d8tBZQgwhIyOkZK/Lo7q8bSI8llI16gmYbHC5f NujdGZm4JsW5nE//un+4modXHG//AbfmzWHB4ss/V3D7OVNi+wPTzaCvj2K6TREkiZmq y6heuV4R1uCs1G4bRLYNxlPha3WfrHdWUQBr4jE52ds91nDAlLKh7KCmuEi6LwIoAeLg Fl7g== 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=YpuMXa6ZGKqGBQZOjgSg9r8DWize58/farv+hdisPZQ=; b=D0j0V/PUBiIFeF9cTmfNYYfjuStHfdDCs5USzLTj+o7U97MQ5alQtNfAp17sw18a8k e84aWIrZxHwhzlr8880VFMFoV7080NqDvM532uGar56D7YucZoR/G5ccqnbY7BllRc8K aXRLAYasHDgTXiYDppK3oLlDjbjNBKhSnK4htej12777SsOJGrv7PjI6CFAkulE02Wjw PFXfpDC0b/Mt0/lCcyd3iBBg58YBretEEkHMiqtzMeLhdhp3qXGP0Hbt18jRUoQROP03 c/V4BfAwdXYCuBtda1HPtPkUWy0c3ITo3gsrBTtKLhGq/lO4RoPn8vNT60hAgqAk7HE/ Ox4g== X-Gm-Message-State: AKS2vOwVlWsqn5zkCucSx9gdJ2tPHVRJ+r8M9/7XvHUqK2ZwnHTjbqHN CqDGs2oKa1BXUuMa X-Received: by 10.98.16.150 with SMTP id 22mr831250pfq.4.1498712354614; Wed, 28 Jun 2017 21:59:14 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::3df3]) by smtp.gmail.com with ESMTPSA id t26sm1831468pfl.41.2017.06.28.21.59.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 21:59:13 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 28 Jun 2017 21:59:02 -0700 Message-Id: <346c4fc83163f915454219c57b59c4753dfd23be.1498712182.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: References: Subject: [OE-core] [PATCH 1/4] valgrind: Fix build with glibc 2.26 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 Signed-off-by: Khem Raj --- ...sts-Use-ucontext_t-instead-of-struct-ucon.patch | 30 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch -- 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/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch new file mode 100644 index 0000000000..bf16a1adfe --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch @@ -0,0 +1,30 @@ +From 629ac492b1d9bc709d17337eb9b1c28603eca250 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 28 Jun 2017 11:01:25 -0700 +Subject: [PATCH] memcheck/tests: Use ucontext_t instead of struct ucontext + +glibc 2.26 does not expose struct ucontext anymore + +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=381769] + +Signed-off-by: Khem Raj +--- + memcheck/tests/linux/stack_changes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c +index ffb49c6..acc4109 100644 +--- a/memcheck/tests/linux/stack_changes.c ++++ b/memcheck/tests/linux/stack_changes.c +@@ -11,7 +11,7 @@ + // checks that Valgrind notices their stack changes properly. + + #ifdef __GLIBC__ +-typedef struct ucontext mycontext; ++typedef ucontext_t mycontext; + + mycontext ctx1, ctx2, oldc; + int count; +-- +2.13.2 + diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index a81adc31d6..3fce5de0a7 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -31,6 +31,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ + file://0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch \ " SRC_URI_append_libc-musl = "\ file://0001-fix-build-for-musl-targets.patch \ From patchwork Thu Jun 29 04:59:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 106600 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp684702qge; Wed, 28 Jun 2017 21:59:41 -0700 (PDT) X-Received: by 10.99.189.18 with SMTP id a18mr14006461pgf.195.1498712381052; Wed, 28 Jun 2017 21:59:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498712381; cv=none; d=google.com; s=arc-20160816; b=Bv+jKzddVy1pOG1YJKQgbLtDTqgtsbRvHZfl8yS/IeViyB2wZyf30lU05IAXoEgVn0 aJAgyukHXEPG05bD7Su0Ih5VGfp7LA3FFj3WRPGMNPCYDoz09uAQ90zOfazYvN+NfEmX iqX771wRGOFFU/R3uI+dQgZm49t/GkpXVXt4fZFcuYcNYAuiw3ebP1cF+J7P4W+owvgW yTtU8DCRonblzLJexSHt5nboinvltOz4wC1u9TRmIlvAJod9vadpPedX7yCfmMLYqSUH l/wOeNHOHmMtZO2MB5jvNWLlSDhXdd2Cb2qfWfTc5IoTxlxu3zHDNL/BExJ8OthrmoWg 5C5w== 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=kuHeRun2xvhZqwsUPr0qbmmb2BpPDcbk/1j4p4TyEyosiRWLThGqcoGKs+v1JpyS14 6OrNHaIW3V3PyT0140Bglf92k7QwiYYGOtLhnQB3jP87/MfUDyNvoEtD6B0gyCy+et/j +WQRoEWozKOk1M6cHk4s6NETYPPvv8B6PJmujMOJdUZMu1SN0SPgVezrqvzyo3pSOHti 2ak9nFBALw0AoBLy4kGtWS5i9hCXiYhvXGmauHamhJyvYai2iYHFy6RTNRe6abkPKc67 vmGGY0ufd82Oy7T+9/b1E1ifevOEqWR7d+rbe7jAfxp7gxZ3WvFmf9uWhHwx/nzVb4AP FtUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=M4B5/ggS; 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 13si3320430ple.403.2017.06.28.21.59.40; Wed, 28 Jun 2017 21:59:41 -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=M4B5/ggS; 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 7296478066; Thu, 29 Jun 2017 04:59:38 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 45AA377F79 for ; Thu, 29 Jun 2017 04:59:14 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id u36so10503848pgn.3 for ; Wed, 28 Jun 2017 21:59:16 -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=M4B5/ggSjARQ1DzkLT8QG0QfV4BeMWuWKEOZQRktqWEHj0oIKezMKKTYnFzLyeBpup zslTUhCrsHmtqyI0K6Xc4iyNy1WkpKRiH7miSZAaDuSUoUBazJzAK8v3GxV0Mi7pQBCb bGtEHjAZ1WiSaBF0Y+nAd5VL7l0w69U5Ibs3O4zZTuBAC1kDGS/XqIOfNCapU1VOfxtN bIxwntfWMVOsURGj5XJ8GVVsD34MZNOZLSBu5LCWDtEGoH4QEMD2vyx1QWOKHSsXgX/j GvqpLP8Wbb+D3vojYLMMcyYqIiMwN2t+8VwD9tJHZTe+aOX7JArABFmm+GHiBbm2eAT6 7gog== 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=ODh1ludP+eD9QMIeEKT1jhRUt4FwlN3J92XdNSttU0RRMgPVcf4V+D7CGsr5q3eC2u FmjQbwn9Ps2yISt6NKiUlON5Z9NG4XzY4ukvwiYH4mHwbolhodSMFRAj62tKHSVCGepd CxxfaY+/SFNnipwFGsdcC6wYKzqIlqj7ShuTgfxkSeYBJJjaJAW0VHewXbRxT9m9W9vq ZZZj9i6dVI/8Jis7pEIwZZEXhuAiuwGsQRAgInHcqPeg/Zo+i7/B+yU/6H+zm2DOhjlq Tk1jYA25TQwfQHd3RlZL5EPx4znPZVHwyOWub6/+jx2tssE9joFuG0Y4So3avUkr4mu+ 5MSA== X-Gm-Message-State: AKS2vOwNT6pgsRQtxVmKl7I5ITHEMMHR0p8O21uGW+1G403UIUEcBJIJ u0SZMxmESKt3uc52 X-Received: by 10.84.236.76 with SMTP id h12mr16187092pln.10.1498712356031; Wed, 28 Jun 2017 21:59:16 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::3df3]) by smtp.gmail.com with ESMTPSA id t26sm1831468pfl.41.2017.06.28.21.59.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 21:59:15 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 28 Jun 2017 21:59:03 -0700 Message-Id: <9daff9b7a42e6804e9e31f0175b5167144852b83.1498712182.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: References: Subject: [OE-core] [PATCH 2/4] 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 From patchwork Thu Jun 29 04:59:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 106601 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp684761qge; Wed, 28 Jun 2017 21:59:46 -0700 (PDT) X-Received: by 10.98.111.194 with SMTP id k185mr14701062pfc.235.1498712386129; Wed, 28 Jun 2017 21:59:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498712386; cv=none; d=google.com; s=arc-20160816; b=UtLO+Pyj9/wMo/rKFW4QP6la+E94vm1w1oB3TXQJef4L/Y9Pi0Hn5DrSGhsLZrKEmB aUkLv1WmYhv3V6fiArVSyqSikDC3bHidDg109A95WTcsKByrqH9T3NUFVaur5ePlw9Gw AZ5f93HH6p73wTm0dJBMrwM/kRjvN/pm4MRpthgD300eoxGUQDTQEkUG8ZvfqiqJ0rRK PR876hf6hVwWB9WiXrPvbVH4jKskwADwQqgKAU4tlZqRi19QHbXS5wV5ia9nXaaT13hd ucSioFFrNTRaz5L2LqB263R/tSP7n5Y6TYEizMDrWNO/IoTLxdAWc9ORKPBHRcyyKyoU BHMQ== 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=7xYL/rkkv7WkRo8ucbjiSGjDiEGEk36r0DwP/V39ouQ=; b=yF0MyHRZXHZVoI86DbZ06c4xItlh8raExq+wBh4MXzgXWaPgRAGwUei11XxIR0uWGw clmMYjEpDJ+e0t+igNArkES3167MDfroIUm08/Q2/9dJXXE3qjNbKNJLdaTj541bQKra F1SXJAntVzsE0WKzgDHg1u5KFw+CuK0o5jktY0gkhQLkN5wdedeUy6CnL3mWR7TIzply xMA86V8i2dd/PkSIropX0/7jLE77gmN+7IODAuRvLQay/w+u2WCz9VQ9ZPuksOIXqQKL V8J9EWtgJkVaKApmYTxJn1DqYvqN0hiVhC/nrpj1DROj8Y5kfLAqJXIbIXwVlg4rJapN OVnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=V2ukI622; 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 b5si3190055plk.410.2017.06.28.21.59.45; Wed, 28 Jun 2017 21:59:46 -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=V2ukI622; 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 AA43A78087; Thu, 29 Jun 2017 04:59:39 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id C161277F79 for ; Thu, 29 Jun 2017 04:59:16 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id u36so10503918pgn.3 for ; Wed, 28 Jun 2017 21:59:18 -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=fPE7CmQrvQ7RJD0gaQUOueRlwe6mkfkjwS09/1+/AwU=; b=V2ukI622ymu8oC6+OLvDK/6dA1USv+sLZNMYpNdro8QsvmQuqOMCXQ9dfx3NMW0vGC wfpH9shDTiVuI6UjP7G5WlFv7MMnZzDw4mzL0qVFBKZAIJQwgsU0rO7xSagApbjL4YZJ f8tdAeJ3xs589JWkf0zdlB9dIiiHPC/B2n6H1O5ue1mRvktwlSC4ZSPwzuE3eht19wu3 Iy6e/Rbx39RKRrA+fcmjB2j4zsuZUszlFryrstvgSaktJI2TnModFW0Bro9f5MAACk8V mAm+zaKaSTwG4FvD5DX7fOutV8yWL2UBrfZ18lFPHW9qGcnhKhNmzGM+rIoiQoIYEB3o Fgqw== 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=fPE7CmQrvQ7RJD0gaQUOueRlwe6mkfkjwS09/1+/AwU=; b=d9RW1FaEIvjaVcdQTOeYZ91Hf5RvE1eFU4dPtPoVWnrdqm8bdoPVln8EmQjZ/ZWa+r zvvmb62SOEV24n9JevEHJZlkehhlbNNjFldK1f2NOiDaOlxUfY8SYwadKgdw2vTrMv9N h736v/X/3nCWtczH6Qh+P6JTWeuTYwmt1mV+r2fkQiQHdSAE9bKhyENBjSRobiGb8cw9 5iGYJ2Zs0jivd7V0qleTjjDixIOKxiVGHgqC1W7OBUrEjHULiBsfdsM9Ayvw8HFSjNAp JmcL4PEFVtUgJpBAuoEIBstNOXTk7RH85P9h+a6b10CT2ng3pqp/QhWzPK9ailMBigFw idrA== X-Gm-Message-State: AKS2vOx1Cn2ZqAY4ApV3wqUyToiXy1iqled3d0gnYzWItHa/WLmyzoPN DidPnY/EVsKyP2uz X-Received: by 10.84.131.78 with SMTP id 72mr15518951pld.43.1498712357607; Wed, 28 Jun 2017 21:59:17 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::3df3]) by smtp.gmail.com with ESMTPSA id t26sm1831468pfl.41.2017.06.28.21.59.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 21:59:16 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 28 Jun 2017 21:59:04 -0700 Message-Id: <8779858b91eb1ac830e5fb3a4fa14395fe5a4318.1498712182.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: References: Subject: [OE-core] [PATCH 3/4] qemu: Replace use of struct ucontext with ucontext_t 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 Signed-off-by: Khem Raj --- ...lace-struct-ucontext-with-ucontext_t-type.patch | 265 +++++++++++++++++++++ meta/recipes-devtools/qemu/qemu_2.8.1.1.bb | 46 ++-- 2 files changed, 286 insertions(+), 25 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-replace-struct-ucontext-with-ucontext_t-type.patch -- 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/qemu/qemu/0001-replace-struct-ucontext-with-ucontext_t-type.patch b/meta/recipes-devtools/qemu/qemu/0001-replace-struct-ucontext-with-ucontext_t-type.patch new file mode 100644 index 0000000000..c3eb543ec0 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0001-replace-struct-ucontext-with-ucontext_t-type.patch @@ -0,0 +1,265 @@ +From 80954c03163fdbf8b905595a69008093096ee2f6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 28 Jun 2017 13:28:37 -0700 +Subject: [PATCH] replace struct ucontext with ucontext_t type + +The ucontext_t type had a tag struct ucontext until now +but newer glibc will drop it so we need to adjust and use +the exposed type instead + +Signed-off-by: Khem Raj +Cc: Kamil Rytarowski +Cc: Riku Voipio +Cc: Laurent Vivier +Cc: Paolo Bonzini + +Upstream-Status: Submitted +--- + linux-user/host/aarch64/hostdep.h | 2 +- + linux-user/host/arm/hostdep.h | 2 +- + linux-user/host/i386/hostdep.h | 2 +- + linux-user/host/ppc64/hostdep.h | 2 +- + linux-user/host/s390x/hostdep.h | 2 +- + linux-user/host/x86_64/hostdep.h | 2 +- + linux-user/signal.c | 10 +++++----- + tests/tcg/test-i386.c | 4 ++-- + user-exec.c | 18 +++++++++--------- + 9 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/linux-user/host/aarch64/hostdep.h b/linux-user/host/aarch64/hostdep.h +index 64f75cef49..a8d41a21ad 100644 +--- a/linux-user/host/aarch64/hostdep.h ++++ b/linux-user/host/aarch64/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + __u64 *pcreg = &uc->uc_mcontext.pc; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/arm/hostdep.h b/linux-user/host/arm/hostdep.h +index 5c1ae60120..9276fe6ceb 100644 +--- a/linux-user/host/arm/hostdep.h ++++ b/linux-user/host/arm/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long *pcreg = &uc->uc_mcontext.arm_pc; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/i386/hostdep.h b/linux-user/host/i386/hostdep.h +index d834bd80ea..073be74d87 100644 +--- a/linux-user/host/i386/hostdep.h ++++ b/linux-user/host/i386/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + greg_t *pcreg = &uc->uc_mcontext.gregs[REG_EIP]; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/ppc64/hostdep.h b/linux-user/host/ppc64/hostdep.h +index 0b0f5f7821..98979ad917 100644 +--- a/linux-user/host/ppc64/hostdep.h ++++ b/linux-user/host/ppc64/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long *pcreg = &uc->uc_mcontext.gp_regs[PT_NIP]; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/s390x/hostdep.h b/linux-user/host/s390x/hostdep.h +index 6f9da9c608..4f0171f36f 100644 +--- a/linux-user/host/s390x/hostdep.h ++++ b/linux-user/host/s390x/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long *pcreg = &uc->uc_mcontext.psw.addr; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/x86_64/hostdep.h b/linux-user/host/x86_64/hostdep.h +index 3b4259633e..a4fefb5114 100644 +--- a/linux-user/host/x86_64/hostdep.h ++++ b/linux-user/host/x86_64/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + greg_t *pcreg = &uc->uc_mcontext.gregs[REG_RIP]; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/signal.c b/linux-user/signal.c +index c750053edd..4638123dd8 100644 +--- a/linux-user/signal.c ++++ b/linux-user/signal.c +@@ -3170,7 +3170,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, + * + * a0 = signal number + * a1 = pointer to siginfo_t +- * a2 = pointer to struct ucontext ++ * a2 = pointer to ucontext_t + * + * $25 and PC point to the signal handler, $29 points to the + * struct sigframe. +@@ -3557,7 +3557,7 @@ struct target_signal_frame { + + struct rt_signal_frame { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + uint32_t tramp[2]; + }; + +@@ -3773,7 +3773,7 @@ struct rt_signal_frame { + siginfo_t *pinfo; + void *puc; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + uint16_t retcode[4]; /* Trampoline code. */ + }; + +@@ -4074,7 +4074,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, + tswap_siginfo(&frame->info, info); + } + +- /*err |= __clear_user(&frame->uc, offsetof(struct ucontext, uc_mcontext));*/ ++ /*err |= __clear_user(&frame->uc, offsetof(ucontext_t, uc_mcontext));*/ + __put_user(0, &frame->uc.tuc_flags); + __put_user(0, &frame->uc.tuc_link); + __put_user(target_sigaltstack_used.ss_sp, +@@ -4565,7 +4565,7 @@ enum { + + struct target_ucontext { + target_ulong tuc_flags; +- target_ulong tuc_link; /* struct ucontext __user * */ ++ target_ulong tuc_link; /* ucontext_t __user * */ + struct target_sigaltstack tuc_stack; + #if !defined(TARGET_PPC64) + int32_t tuc_pad[7]; +diff --git a/tests/tcg/test-i386.c b/tests/tcg/test-i386.c +index 0f7b943b0c..9599204895 100644 +--- a/tests/tcg/test-i386.c ++++ b/tests/tcg/test-i386.c +@@ -1720,7 +1720,7 @@ int tab[2]; + + void sig_handler(int sig, siginfo_t *info, void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + + printf("si_signo=%d si_errno=%d si_code=%d", + info->si_signo, info->si_errno, info->si_code); +@@ -1912,7 +1912,7 @@ void test_exceptions(void) + /* specific precise single step test */ + void sig_trap_handler(int sig, siginfo_t *info, void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + printf("EIP=" FMTLX "\n", (long)uc->uc_mcontext.gregs[REG_EIP]); + } + +diff --git a/user-exec.c b/user-exec.c +index 6db075884d..3f1b899e3d 100644 +--- a/user-exec.c ++++ b/user-exec.c +@@ -155,7 +155,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #elif defined(__OpenBSD__) + struct sigcontext *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + unsigned long pc; + int trapno; +@@ -210,7 +210,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #elif defined(__OpenBSD__) + struct sigcontext *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + + pc = PC_sig(uc); +@@ -277,7 +277,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + ucontext_t *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + unsigned long pc; + int is_write; +@@ -304,7 +304,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + uint32_t *pc = uc->uc_mcontext.sc_pc; + uint32_t insn = *pc; + int is_write = 0; +@@ -402,7 +402,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #if defined(__NetBSD__) + ucontext_t *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + unsigned long pc; + int is_write; +@@ -429,7 +429,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + int cpu_signal_handler(int host_signum, void *pinfo, void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + uintptr_t pc = uc->uc_mcontext.pc; + uint32_t insn = *(uint32_t *)pc; + bool is_write; +@@ -462,7 +462,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, void *puc) + int cpu_signal_handler(int host_signum, void *pinfo, void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long ip; + int is_write = 0; + +@@ -493,7 +493,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long pc; + uint16_t *pinsn; + int is_write = 0; +@@ -546,7 +546,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + greg_t pc = uc->uc_mcontext.pc; + int is_write; + +-- +2.13.2 + diff --git a/meta/recipes-devtools/qemu/qemu_2.8.1.1.bb b/meta/recipes-devtools/qemu/qemu_2.8.1.1.bb index d37dd49064..a5dc70469d 100644 --- a/meta/recipes-devtools/qemu/qemu_2.8.1.1.bb +++ b/meta/recipes-devtools/qemu/qemu_2.8.1.1.bb @@ -7,37 +7,33 @@ RDEPENDS_${PN}-ptest = "bash make" LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -SRC_URI += " \ - file://powerpc_rom.bin \ - file://disable-grabs.patch \ - file://exclude-some-arm-EABI-obsolete-syscalls.patch \ - file://wacom.patch \ - file://add-ptest-in-makefile.patch \ - file://run-ptest \ - file://configure-fix-Darwin-target-detection.patch \ - file://qemu-enlarge-env-entry-size.patch \ - file://no-valgrind.patch \ - file://pathlimit.patch \ - file://qemu-2.5.0-cflags.patch \ - file://glibc-2.25.patch \ -" - -SRC_URI += " \ - file://0001-Provide-support-for-the-CUSE-TPM.patch \ - file://0002-Introduce-condition-to-notify-waiters-of-completed-c.patch \ - file://0003-Introduce-condition-in-TPM-backend-for-notification.patch \ - file://0004-Add-support-for-VM-suspend-resume-for-TPM-TIS.patch \ - file://CVE-2016-9908.patch \ - file://CVE-2016-9912.patch \ -" +SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \ + file://powerpc_rom.bin \ + file://disable-grabs.patch \ + file://exclude-some-arm-EABI-obsolete-syscalls.patch \ + file://wacom.patch \ + file://add-ptest-in-makefile.patch \ + file://run-ptest \ + file://configure-fix-Darwin-target-detection.patch \ + file://qemu-enlarge-env-entry-size.patch \ + file://no-valgrind.patch \ + file://pathlimit.patch \ + file://qemu-2.5.0-cflags.patch \ + file://glibc-2.25.patch \ + file://0001-Provide-support-for-the-CUSE-TPM.patch \ + file://0002-Introduce-condition-to-notify-waiters-of-completed-c.patch \ + file://0003-Introduce-condition-in-TPM-backend-for-notification.patch \ + file://0004-Add-support-for-VM-suspend-resume-for-TPM-TIS.patch \ + file://CVE-2016-9908.patch \ + file://CVE-2016-9912.patch \ + file://0001-replace-struct-ucontext-with-ucontext_t-type.patch \ + " SRC_URI_append_class-native = " \ file://fix-libcap-header-issue-on-some-distro.patch \ file://cpus.c-qemu_cpu_kick_thread_debugging.patch \ " -SRC_URI =+ "http://wiki.qemu-project.org/download/${BP}.tar.bz2" - SRC_URI[md5sum] = "a6a23a0c59fd0f8ec564b0fb89a79954" SRC_URI[sha256sum] = "f62ab18a1fb9ff5b4c81ed44becc945b11581eff777618141bdb787da55d3638" From patchwork Thu Jun 29 04:59:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 106602 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp684804qge; Wed, 28 Jun 2017 21:59:51 -0700 (PDT) X-Received: by 10.99.115.2 with SMTP id o2mr14096621pgc.48.1498712391343; Wed, 28 Jun 2017 21:59:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498712391; cv=none; d=google.com; s=arc-20160816; b=wAdMHGFb6HSjQJadcjJvSatwQnt5pMsnIzxBGpCQK/Ri4qb9LjmP5y569lGFcdbAlt k2uygjMFQ9Lq+F83GWXJrBVyr7BbhnsHXJA61phkaozTVH7PiIQTOTNc+FUZ3b1BD6FE rFhoFzI8U0LArJiC8nx8Zz1vtSKZkieaGtfmkWU+XZozFncq0J5xwwFaIxNK5tobLBod BxS0DFojze6IZ82QF5W1nK+/rccBIzeWkIQS5mh1dBXcOaX7ATjlknS2gDTXNZHqLDhI WrOT6Jj5y5ZduGkyDoN9Pc/iXnILeApGIVil6Gbu8u7NX7CdBWtVisQTZjFX/JIHeX8m IN0A== 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=p/gArZjGdOJD3xMsMqRnEPlNwXNwgHr7MploWZRFJ60=; b=0zj/fXHFx8rzpxFMLcIjWUP7iEyEDTf9d3LvkndQ8br0EQsy6ZhJi+YrWIYrcAPcVg AygiNzuonbMHnYND9FQWPmOpUeErrCSNj/XxvxjpPoVOTSUGe8EKA2WlaZfD1wy2dUgL mi2t9alM8HjKIhoD5JYXKc9c1BtXCnA5RLfLRbyilvDnyMWJG130uF6BcxwwYO948zOP uaeUz+pE7PBgFTLxk0WhPi7dpNHuFm7WG0rPEr1DWP9vfH6dKl2a0RaYHj47ydg5HA7Z 3JLpq/oO4BPL37bSBSl6w+sh9u9X+Ulbqk0ENRjIv+b0bHnO9PmYWNU/YcOeGY6cXdyE ++Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=isPHxPAC; 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 o61si3238944plb.154.2017.06.28.21.59.51; Wed, 28 Jun 2017 21:59:51 -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=isPHxPAC; 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 AD9B9780B4; Thu, 29 Jun 2017 04:59:40 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id CDB537804E for ; Thu, 29 Jun 2017 04:59:18 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id s66so11557453pfs.2 for ; Wed, 28 Jun 2017 21:59:20 -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=TkH97Rs0kJdDKrSAQTSYP0F5SrGCXMcHNIFp+Jq3ve8=; b=isPHxPACJGrCmq9NxXxiGKLtQGR8Zc+EraNZ1oYikOmMyIERVYA+3WZIC5L1c0kxuc yqxYgfLmY4WvEPYj1kgF5wjbPSxJwwsbZ7bNdXhsDyi8s4mRhxiIeLlMUqiFgtBpiC0l 89p3UOyg40oSUxgkrsOb7KQekXiD2Ab9c/2ARpHUD/29+3ojk7ip0bn4DSe5kRg82iOl gvh9ODkDtD09UwQfulBGnJl0kqKXSaQvpbsxadwwt9sfdY9nDVzwdc3VJZXzCV0vIwy8 KbOXSN9vu8o5a9AxCsDChB1mu3JRcjEiQ9oAxcSy7h0lDlgfmv24cbVvvygPLi8Ehi5z PZKA== 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=TkH97Rs0kJdDKrSAQTSYP0F5SrGCXMcHNIFp+Jq3ve8=; b=hO5kAi7bAdlB0PURVyh3SSK9H/XA9Nb42ju7AoEDWPaU1mrXAP/0UmFk269ES/01PX URim/diBm4+5Mg5cI/Rr0ukCCrAoRv6sMo4Y81BkwhoYFZuS9c/XiVcN3aHLmpthlF2n LZLHS6E7hqOLRLTtrz1yIdaHnmxg8Sk6ao0iejZRSw6Lhp9glNZw3WovVgc7J2P2ImUS Maevkq3OT+goxp/j7brfscXxgYrB3lo0vD40ar54j/9HiQn56CQhZEayMMsVweJDUtsJ 6zkBCfPZI7gxy94b99Et3fSQ/UXSxYc1xLHazpJalfufsOglQ0pwcEEvjBxq5BzfYKdj jcNg== X-Gm-Message-State: AKS2vOzd/rHfObvRyOFf8Cf1j2qQ2SXqReaYnuYP57HPJ7S3kZHdF+G4 R5QOsIzEJkVbHqhB X-Received: by 10.99.137.66 with SMTP id v63mr13707796pgd.182.1498712359501; Wed, 28 Jun 2017 21:59:19 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::3df3]) by smtp.gmail.com with ESMTPSA id t26sm1831468pfl.41.2017.06.28.21.59.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 21:59:18 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 28 Jun 2017 21:59:05 -0700 Message-Id: <5a367721dfebd18243bbfed620ee6c6c12f087ff.1498712182.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: References: Subject: [OE-core] [PATCH 4/4] epiphany: Fix build errors when compiling with security flags 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 We need to have some level of optimization level for FORTIFY_SOURCE to work therefore set --enable-debug=no Add a patch to fix build error due to unused result of fread Signed-off-by: Khem Raj --- meta/recipes-gnome/epiphany/epiphany_3.24.2.bb | 6 ++-- ...bookmarks-Check-for-return-value-of-fread.patch | 32 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch -- 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-gnome/epiphany/epiphany_3.24.2.bb b/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb index 77c19331cb..dafad8a793 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.24.2.bb @@ -9,11 +9,13 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch" +SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch \ + file://0001-bookmarks-Check-for-return-value-of-fread.patch \ + " SRC_URI[archive.md5sum] = "e035dc6f64f0c1909de823e03f16b2f3" SRC_URI[archive.sha256sum] = "5abc0d0c60591df5236ac9b8979dc9f7d9acbb8ad0902b4772d2b7beea81c58d" -EXTRA_OECONF += " --with-distributor-name=${DISTRO}" +EXTRA_OECONF += " --with-distributor-name=${DISTRO} --enable-debug=no" do_configure_prepend() { sed -i -e s:help::g ${S}/Makefile.am diff --git a/meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch b/meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch new file mode 100644 index 0000000000..ddcd39400c --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/0001-bookmarks-Check-for-return-value-of-fread.patch @@ -0,0 +1,32 @@ +From aa2176be32eed2578da82f34d31148f934c11c34 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 28 Jun 2017 17:03:45 -0700 +Subject: [PATCH] bookmarks: Check for return value of fread() + +Fixes below compiler error +ignoring return value of 'fread', declared with attribute warn_unused_result + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/bookmarks/ephy-bookmark.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/bookmarks/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c +index ff0239b..8633ce4 100644 +--- a/src/bookmarks/ephy-bookmark.c ++++ b/src/bookmarks/ephy-bookmark.c +@@ -217,7 +217,8 @@ ephy_bookmark_init (EphyBookmark *self) + bytes = g_malloc (num_bytes); + + fp = fopen ("/dev/urandom", "r"); +- fread (bytes, sizeof (guint8), num_bytes, fp); ++ if (fread (bytes, sizeof (guint8), num_bytes, fp) != num_bytes) ++ g_warning("Unable to read data from /dev/urandom\n"); + + self->id = g_malloc0 (ID_LEN + 1); + for (gsize i = 0; i < num_bytes; i++) { +-- +2.13.2 +