From patchwork Mon Apr 24 05:20:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98004 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327699qgf; Sun, 23 Apr 2017 22:23:11 -0700 (PDT) X-Received: by 10.98.194.69 with SMTP id l66mr22906497pfg.55.1493011391547; Sun, 23 Apr 2017 22:23:11 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b5si17620534pfc.403.2017.04.23.22.23.11; Sun, 23 Apr 2017 22:23:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 90B6771DDA; Mon, 24 Apr 2017 05:23:08 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by mail.openembedded.org (Postfix) with ESMTP id ECEF66E668 for ; Mon, 24 Apr 2017 05:21:12 +0000 (UTC) Received: by mail-it0-f65.google.com with SMTP id z67so13855283itb.0 for ; Sun, 23 Apr 2017 22:21:14 -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; bh=Gj7/I0xigbKwiz6HAWgWh+1Usv7DClcBv6cFbHnsTWw=; b=ktvAvr/a8Ja4R6IA03H7bFZF1xQ8uYceOJCWmkh68LNiQYAGLuDRD2Nfaw2cVvG/9e cts7sqk7ezJ7W28H7VBl2dsV/Zdcme2gz4Qfq31XhkNJwH69F2OMbG5WCHyBLzazLJRo MHNku3Lru9Sz6fquG9QdkdvTenZLU3m0ab5oyZLdL1Jva3QFEw7WPd1YYNSoQsnX0UXG /Un99oD/sq6+m2efe0cqnINI4mvPcczmILuoWeJRKNPD5KUNMbwm4biXxj3RzqjX6XJz cmQIblSoSRssQM8qE3s3Ol1Xvtknhm71Fgy1WXiaSX3QT5rB3+kl8EtVDLxCjVvlXqXB 1lhw== 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=Gj7/I0xigbKwiz6HAWgWh+1Usv7DClcBv6cFbHnsTWw=; b=WISQrGDTaAKR01Oe4peIMAF1l8RrHjoJi0LEQVSw8ceBPAs8yND9D4nlz+K6mM8LeK Txe23xNkTt22ttKz3UNO/DSGjYYm9CMGVaKfAuA0cEuAWapGHC8uJK6ieYi2t37usYm+ cSLsazrKdytlxZYLgwnGw4L8c7uDqwbuMZmWDaLtHiZQiT+bYhmblOZsS979fhdB+aqv YP/CvE11h4ntjLvZkwx3xd/wj1NNbY5s6Qn1zzAXgLZjhM+Vtz99WYRIVGGiNSPOhCQg /epNJc2IWfLGoMWzd1AUAGUjNEEYqYCeAp3JqgK+aEplKDYNrt3NZLQVHkUfCu2S2R11 aAhQ== X-Gm-Message-State: AN3rC/76pk54dPP2x0Lor30JrXCSUM+Dd3hrlP4ayM8IQYTjmZWl5y9P kX/IkQkVKocgmA== X-Received: by 10.84.135.34 with SMTP id 31mr30001072pli.99.1493011273750; Sun, 23 Apr 2017 22:21:13 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:12 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:42 -0700 Message-Id: <20170424052058.4952-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 Subject: [oe] [meta-multimedia][PATCH 01/17] musicbrainz: Upgrade to 5.1.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Drop uclibc specific flags Signed-off-by: Khem Raj --- .../recipes-multimedia/musicbrainz/libmusicbrainz_git.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb index a6a4f6a8a..250c5f14e 100644 --- a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb +++ b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb @@ -5,17 +5,14 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "expat neon neon-native" -PV = "5.0.1+git${SRCPV}" -PR = "r1" +PV = "5.1.0+git${SRCPV}" -SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e" +SRCREV = "44c05779dd996035758f5ec426766aeedce29cc3" SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \ file://allow-libdir-override.patch " S = "${WORKDIR}/git" -LDFLAGS_prepend_libc-uclibc = " -lpthread " - inherit cmake pkgconfig do_configure_prepend() { From patchwork Mon Apr 24 05:20:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98003 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327400qgf; Sun, 23 Apr 2017 22:21:44 -0700 (PDT) X-Received: by 10.84.210.73 with SMTP id z67mr21918718plh.6.1493011304737; Sun, 23 Apr 2017 22:21:44 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b62si4475918pli.65.2017.04.23.22.21.44; Sun, 23 Apr 2017 22:21:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 70FCB71DC9; Mon, 24 Apr 2017 05:21:19 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-io0-f181.google.com (mail-io0-f181.google.com [209.85.223.181]) by mail.openembedded.org (Postfix) with ESMTP id 1475971D8C for ; Mon, 24 Apr 2017 05:21:14 +0000 (UTC) Received: by mail-io0-f181.google.com with SMTP id a103so178090897ioj.1 for ; Sun, 23 Apr 2017 22:21: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=unCkJlscsKvxVGKLdp90nvmgEOhLlnV0v4Y45/JD2TE=; b=qsDuASNTGxmMcbRNG1ZWnawwYrP920E0Rj7TKjiHrda6KNuYTkxJOTacxLkPPccy8z C5Yhy+WUXWZXqJdtatAvzPS9ayaEJnvCp4FGbYfnug84HtSH9KNRuuKUjTaLXNuwSJ7g qoJcYrUFmUXXts5HYf0K6KyZAkS+/68a8q0ArSVTAJiqS+QAlNjwSDzAsh87FX5DExnZ P6F28dmrZUNgsddIy2aKDy1RXCtn0T1r5LYn+Qm8KyCBKp40cbx/dqqZjNTxAtsRnjyh KwDiuJh66FKQggJxkG1uPjNg6z1QHcvJYNd4uQJrOzmtKPXTEgCRKEOhPkx2fig1CElP Isqg== 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=unCkJlscsKvxVGKLdp90nvmgEOhLlnV0v4Y45/JD2TE=; b=rESa++920xoamGnXpwj1x75/sIz4ltuwHUhdosuh3UN9ayJLfcuXtg2QWf3/0yKqF3 Wtqvc4wVYfwTIxxJk/ptu7r3hzMHuuThCMBYSKR9RVetD1ky1FhMmSdFAB7LYQpc/4/A Iv9XKtYXWu7MeRKhKCIBwyncZ+OYQAmGgfdedoO+0n/umoj3piihwi6KY/gEK59G5bv9 64iL1O3Trhg5Yv9Omd2339p0FhrhGH4vldOAe1zKwfj/HwZEX0Cw+ZX0KRd4mXPI7cyt XeKH2g0REbjLvjdGW70jjxLha7BnUHh3iXrTc5/DkjJtdDZJPics4cLTkhUQ4Yja41Lh vGaw== X-Gm-Message-State: AN3rC/6hNmbLZQBDBWppqEpyw01Y6y9awd+syUK0dU/y1yVSofASnPbe N9kvfAqe7rA4Bg== X-Received: by 10.98.152.215 with SMTP id d84mr22764165pfk.7.1493011275270; Sun, 23 Apr 2017 22:21:15 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:14 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:43 -0700 Message-Id: <20170424052058.4952-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 02/17] ltrace: Fix FTBFS due to invalid code in ARM support X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Found with gcc7 Signed-off-by: Khem Raj --- ...s-unreachable-code-after-switch-statement.patch | 40 ++++++++++++++++++++++ meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 3 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch new file mode 100644 index 000000000..4d0e0392f --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch @@ -0,0 +1,40 @@ +From 95ff340a74af16cca89fd5c5ca99890821053209 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Apr 2017 00:47:16 -0700 +Subject: [PATCH] ARM code has unreachable code after switch statement move + initialization + +Fixed +sysdeps/linux-gnu/arm/trace.c:173:33: error: statement will never be executed [-Werror=switch-unreachable] + uint32_t operand1, operand2, result = 0; + ^~~~~~ + +Signed-off-by: Khem Raj +--- + sysdeps/linux-gnu/arm/trace.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c +index 5e51e91..f974d1f 100644 +--- a/sysdeps/linux-gnu/arm/trace.c ++++ b/sysdeps/linux-gnu/arm/trace.c +@@ -155,6 +155,8 @@ arm_get_next_pcs(struct process *proc, + const unsigned cond = BITS(this_instr, 28, 31); + const unsigned opcode = BITS(this_instr, 24, 27); + ++ uint32_t operand1, operand2, result = 0; ++ + if (cond == COND_NV) + switch (opcode) { + arch_addr_t addr; +@@ -170,7 +172,6 @@ arm_get_next_pcs(struct process *proc, + } + else + switch (opcode) { +- uint32_t operand1, operand2, result = 0; + case 0x0: + case 0x1: /* data processing */ + case 0x2: +-- +2.12.2 + diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index a5960f5b0..60af5425e 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -20,7 +20,8 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \ file://0001-replace-readdir_r-with-readdir.patch \ file://0001-Use-correct-enum-type.patch \ file://0002-Fix-const-qualifier-error.patch \ - " + file://0001-ARM-code-has-unreachable-code-after-switch-statement.patch \ + " S = "${WORKDIR}/git" inherit autotools From patchwork Mon Apr 24 05:20:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98005 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327716qgf; Sun, 23 Apr 2017 22:23:17 -0700 (PDT) X-Received: by 10.99.6.139 with SMTP id 133mr22781454pgg.154.1493011397343; Sun, 23 Apr 2017 22:23:17 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x3si17663146plb.1.2017.04.23.22.23.17; Sun, 23 Apr 2017 22:23:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 AEDEB72F36; Mon, 24 Apr 2017 05:23:11 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-io0-f195.google.com (mail-io0-f195.google.com [209.85.223.195]) by mail.openembedded.org (Postfix) with ESMTP id 9DCB56E668 for ; Mon, 24 Apr 2017 05:21:16 +0000 (UTC) Received: by mail-io0-f195.google.com with SMTP id d203so45662813iof.2 for ; Sun, 23 Apr 2017 22:21: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=9uEItmBZ3lXQO4q7KQDruXXPZXnp3N+BZcCNR3ASyuU=; b=Wl3DLcWzJJLM1T5q23lgKNvNT33kI9ngrStxnfAaA7I1ohgMWzUUvKKzf6XnW1cHp0 RiNWj93raSkG+HtnyN88/BEuhjn+OlgXcPNIvD5VSWhDpSyS8wF+QTfCvvqfirY33ORM IAFtp5uVImsYPfZOJjkASUoK+w//QKoB5jKuUBH3yoyWE65jQ0se8Z862OtodopojVA5 FPl2rPjyHEAM7BCsWH288vO5pTMT04q2faOvLj2PmyLFlReOLTPDFuJ4+Pf9ACzPlYnC c+wDe2TJsrxjoC+xElMVhn2asKVUPFInVq6NIgToIFXL5N7WQyk+gCRoUtqspdTZvRr0 Vcjw== 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=9uEItmBZ3lXQO4q7KQDruXXPZXnp3N+BZcCNR3ASyuU=; b=YXDw2TlupAhsA38k6EojT/rE7+zu4LbP/Lj8rVtdg81gUBxt85RlbxVRZ6B1eXMRz2 LsBUMd9g3KLDtyC8BxofGWhwGcx/+iqpzbLiSnpDKssXAwGWZh2U+qj9pvDZJclmN8bA bv1dn7kIJ2lMhosqtKGwUynG0MbeeMc3oM+P85PipMqSRf287/IFN+eZRIx7TaVLk4OH dX+ytEfM0VYEc7jx69nyVteUuGIpmduegKXj8xKw0zhXn2HtN+oUmJkxbj6vM5d4LZ2B b8X8KZPBvGrtV3Q3JA6EGHvhcMo7Klmh9IKlAFahSTjaJYx2EDlkn5d70bTI+1m37AQD hZgw== X-Gm-Message-State: AN3rC/4gPhJX8kuhN3W9Ty/jF28uuXl6HlhEHuLESpYkcMne88yF95OK bDwhqBzSLKVjkQ== X-Received: by 10.98.202.80 with SMTP id n77mr23307748pfg.158.1493011277057; Sun, 23 Apr 2017 22:21:17 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:44 -0700 Message-Id: <20170424052058.4952-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 03/17] msgpack-c: Upgrade to 2.1.1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix build with gcc7 Signed-off-by: Khem Raj --- ...ntentional-fallthrough-in-case-statements.patch | 39 +++++++++++++++++++++ .../304ff96d04599401172568d042723ff507e78cc3.patch | 40 ++++++++++++++++++++++ .../{msgpack-c_2.0.0.bb => msgpack-c_2.1.1.bb} | 15 +++++--- 3 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Comment-intentional-fallthrough-in-case-statements.patch create mode 100644 meta-oe/recipes-devtools/msgpack/msgpack-c/304ff96d04599401172568d042723ff507e78cc3.patch rename meta-oe/recipes-devtools/msgpack/{msgpack-c_2.0.0.bb => msgpack-c_2.1.1.bb} (62%) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Comment-intentional-fallthrough-in-case-statements.patch b/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Comment-intentional-fallthrough-in-case-statements.patch new file mode 100644 index 000000000..a388297a8 --- /dev/null +++ b/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Comment-intentional-fallthrough-in-case-statements.patch @@ -0,0 +1,39 @@ +From 15d8bb6792c9639d85a9ffe2ac81431f1b986c21 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Apr 2017 08:53:50 -0700 +Subject: [PATCH] Comment intentional fallthrough in case statements + +Fixes build with gcc7 + +Signed-off-by: Khem Raj +--- + include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp b/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp +index b35c21a7..4c463a90 100644 +--- a/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp ++++ b/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp +@@ -105,6 +105,7 @@ struct define_array { + switch(size) { + default: + case 2: ptr[1].convert(a1); ++ //fallthrough + case 1: ptr[0].convert(a0); + } + } +@@ -193,8 +194,11 @@ struct define_array { + switch(size) { + default: + case 4: ptr[3].convert(a3); ++ //fallthrough + case 3: ptr[2].convert(a2); ++ //fallthrough + case 2: ptr[1].convert(a1); ++ //fallthrough + case 1: ptr[0].convert(a0); + } + } +-- +2.12.2 + diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c/304ff96d04599401172568d042723ff507e78cc3.patch b/meta-oe/recipes-devtools/msgpack/msgpack-c/304ff96d04599401172568d042723ff507e78cc3.patch new file mode 100644 index 000000000..b8b3d3187 --- /dev/null +++ b/meta-oe/recipes-devtools/msgpack/msgpack-c/304ff96d04599401172568d042723ff507e78cc3.patch @@ -0,0 +1,40 @@ +From 304ff96d04599401172568d042723ff507e78cc3 Mon Sep 17 00:00:00 2001 +From: James McCoy +Date: Thu, 13 Apr 2017 11:38:45 -0400 +Subject: [PATCH] Comment the intentional fallthrough to default from + _fixed_trail_again + +GCC 7 added a new diagnostic, -Wimplicit-fallthrough, which is enabled +with -Wextra that warns about implicitly falling through a case +statement. + + [ 4%] Building C object CMakeFiles/msgpackc-static.dir/src/unpack.c.o + /usr/lib/gcc-snapshot/bin/gcc -I/home/jamessan/src/msgpack-c/. -I/home/jamessan/src/msgpack-c/include -I/home/jamessan/src/msgpack-c/build/include -g -O2 -fdebug-prefix-map=/home/jamessan/src/msgpack-c=. -specs=/usr/share/dpkg/no-pie-compile.specs -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wextra -Werror -g -O3 -o CMakeFiles/msgpackc-static.dir/src/unpack.c.o -c /home/jamessan/src/msgpack-c/src/unpack.c + In file included from /home/jamessan/src/msgpack-c/src/unpack.c:283:0: + /home/jamessan/src/msgpack-c/include/msgpack/unpack_template.h: In function 'template_execute': + /home/jamessan/src/msgpack-c/include/msgpack/unpack_template.h:238:17: error: this statement may fall through [-Werror=implicit-fallthrough=] + ++p; + ^~~ + /home/jamessan/src/msgpack-c/include/msgpack/unpack_template.h:240:13: note: here + default: + ^~~~~~~ + cc1: all warnings being treated as errors + +Adding the comment makes it explicit that the fallthrough is +intentional, so gcc doesn't complain. +--- + include/msgpack/unpack_template.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/msgpack/unpack_template.h b/include/msgpack/unpack_template.h +index 8450442..e557bb6 100644 +--- a/include/msgpack/unpack_template.h ++++ b/include/msgpack/unpack_template.h +@@ -236,6 +236,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c + + _fixed_trail_again: + ++p; ++ // fallthrough + + default: + if((size_t)(pe - p) < trail) { goto _out; } diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.0.0.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.1.bb similarity index 62% rename from meta-oe/recipes-devtools/msgpack/msgpack-c_2.0.0.bb rename to meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.1.bb index 14e860d6a..7655d9469 100644 --- a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.0.0.bb +++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.1.bb @@ -6,10 +6,17 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ file://COPYING;md5=0639c4209b6f2abf1437c813b208f2d3 \ file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ " -SRC_URI = "https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/msgpack-${PV}.tar.gz" -SRC_URI[md5sum] = "55148cd856c72f954a6eb9cc889a7d2a" -SRC_URI[sha256sum] = "41de0989a3385061ab7307a1005655e780def6fc9c89af0ec942616aa787e136" + +PV .= "+git${SRCPV}" + +SRCREV = "20ef1f925b007f170ab1c257e4aa61fdd0927773" + +SRC_URI = "git://github.com/msgpack/msgpack-c \ + file://0001-Comment-intentional-fallthrough-in-case-statements.patch \ + " inherit cmake pkgconfig -S = "${WORKDIR}/msgpack-${PV}" +S = "${WORKDIR}/git" + +FILES_${PN}-dev += "${libdir}/cmake/msgpack/*.cmake" From patchwork Mon Apr 24 05:20:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98006 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327750qgf; Sun, 23 Apr 2017 22:23:26 -0700 (PDT) X-Received: by 10.99.188.2 with SMTP id q2mr23131221pge.72.1493011406231; Sun, 23 Apr 2017 22:23:26 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p9si9544913pll.231.2017.04.23.22.23.25; Sun, 23 Apr 2017 22:23:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 C744471DAE; Mon, 24 Apr 2017 05:23:23 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-io0-f195.google.com (mail-io0-f195.google.com [209.85.223.195]) by mail.openembedded.org (Postfix) with ESMTP id 4ED5A6E668 for ; Mon, 24 Apr 2017 05:21:17 +0000 (UTC) Received: by mail-io0-f195.google.com with SMTP id k87so45322537ioi.0 for ; Sun, 23 Apr 2017 22:21:19 -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=TO4cZ+igOxAg9o3mzAVGiVufzSYRfLXgLJVqMAiyMn4=; b=FenDWRd5yF3f4zrHjOODvPAH0PG3w1h6ssAxKCIMMB7I14JU5UBE6JjBCBYU/0K+Pe NHJotBNTiCzFo53Oj2ynC4uoNgXx9UZ14riVjOP3bAjaBIb67MbuxTKfuBOXFeRUuOE7 R8Tww6+9sBI5is5zXdJLcHOSCHf0T8ij1rTXkXdUfIQ/UimeSUortc6EOl9DM5DHFvZP GSHk+nWEGyZZ6abHmfUH5NZudA+GyJcWoX9rJftDbzgtFe/03tEN4AECwJIkspupseGr YnVGIXQmXJWXcXeMvIm65f83sij3glaVGDAwepfA79nReFXQ8zkxcPGQaUnX10jUyH+s 73pg== 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=TO4cZ+igOxAg9o3mzAVGiVufzSYRfLXgLJVqMAiyMn4=; b=OfUVpJo2G19QpYLDrHjzcHdSUNn6q5C8DCw+ohBoG+NGviseDQ7sMguuw5jjmju/vf 3/sinGrxqVKikEMJUl0VQYvbz2OmH+ycu46ONW3bYUCbvsI/yIMj2VZ841xFbutK9S5U yfhjcaGOZg2QPlz0AOXsu3K6l0c9G7HtUUVZ5Ib3eLOOmey6woaYNhaypJItZpNmmD+I vZi3qORYIUunWDAnRg+mmdEArrQya9IUe1hNwYcfuVUfi0xBSm9sdfq2rzZEBom05cyR lDsSe0Xlqa0pQUUkN5uLiYtwvicXf0mFS20RicG2DfJCygRZtJhqvsDCdDPrMz42G+vQ 1nmg== X-Gm-Message-State: AN3rC/7cP4JrAkqc4Kt85POW4whR6N8RSEh/deXV+WiEWnBhW6cuAMb2 RpBo8xhLjMLMgg== X-Received: by 10.98.211.27 with SMTP id q27mr23330853pfg.126.1493011278548; Sun, 23 Apr 2017 22:21:18 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:17 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:45 -0700 Message-Id: <20170424052058.4952-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 04/17] fluentbit: Upgrade to 0.11.3 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix cross compiling for external modules Fix build with gcc7 Signed-off-by: Khem Raj --- ...txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch | 52 ++++++++++++++++++++++ ...pack-Add-comment-for-intended-fallthrough.patch | 28 ++++++++++++ .../recipes-extended/fluentbit/fluentbit_0.11.3.bb | 24 ++++++++++ .../recipes-extended/fluentbit/fluentbit_0.7.2.bb | 16 ------- 4 files changed, 104 insertions(+), 16 deletions(-) create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit_0.11.3.bb delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit_0.7.2.bb -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch new file mode 100644 index 000000000..539a42a7d --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch @@ -0,0 +1,52 @@ +From ceb47f37582a055bb7f253f813c435ad55c5b6eb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Apr 2017 10:02:50 -0700 +Subject: [PATCH 1/2] CMakeLists.txt: Add AUTOCONF_HOST_OPT to help cross + compiling + +This helps in doing cross compiles for modules which are using +GNU autoconf for build system + +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b093f9a..ebf0cd7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -290,6 +290,12 @@ else() + endif() + endif() + ++if("${GNU_HOST}" STREQUAL "") ++ set(AUTOCONF_HOST_OPT "") ++else() ++ set(AUTOCONF_HOST_OPT "--host=${GNU_HOST}") ++endif() ++ + # Memory Allocator + # ================ + if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") +@@ -299,7 +305,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") + # Link to Jemalloc as an external dependency + ExternalProject_Add(jemalloc + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc +- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure --with-lg-quantum=3 --enable-cc-silence --prefix= ++ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix= + CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops + BUILD_COMMAND ${MAKE} + INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ +@@ -317,7 +323,7 @@ endif() + if(FLB_REGEX) + ExternalProject_Add(onigmo + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/onigmo +- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/onigmo/configure --with-pic --disable-shared --enable-static --prefix= ++ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/onigmo/configure ${AUTOCONF_HOST_OPT} --with-pic --disable-shared --enable-static --prefix= + CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops + BUILD_COMMAND ${MAKE} + INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ +-- +2.12.2 + diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch new file mode 100644 index 000000000..35cdb18ad --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch @@ -0,0 +1,28 @@ +From d95c2977da074be0d3913e94fb8fb5ed1c64404a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Apr 2017 10:04:03 -0700 +Subject: [PATCH 2/2] msgpack: Add comment for intended fallthrough + +Helps fixing build with gcc7 + +Signed-off-by: Khem Raj +--- + lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h b/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h +index a6dae6f..651e6c2 100644 +--- a/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h ++++ b/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h +@@ -248,7 +248,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c + + _fixed_trail_again: + ++p; +- ++ // fallthrough + default: + if((size_t)(pe - p) < trail) { goto _out; } + n = p; p += trail - 1; +-- +2.12.2 + diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.3.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.3.bb new file mode 100644 index 000000000..8d756e6a4 --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.3.bb @@ -0,0 +1,24 @@ +SUMMARY = "Fast data collector for Embedded Linux" +HOMEPAGE = "http://fluentbit.io" +BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" + +SRC_URI = "http://fluentbit.io/releases/0.11/fluent-bit-${PV}.tar.gz \ + file://0001-CMakeLists.txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch \ + file://0002-msgpack-Add-comment-for-intended-fallthrough.patch \ + " +SRC_URI[md5sum] = "9383262339412782b80cc49e7ad15609" +SRC_URI[sha256sum] = "eb8a85c656fa60682b0bf8dd1ad58d848cd251dab4f35a6777acd552c65b0511" + +S = "${WORKDIR}/fluent-bit-${PV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +DEPENDS = "zlib" +INSANE_SKIP_${PN}-dev += "dev-elf" + +inherit cmake systemd + +EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS}" + +SYSTEMD_SERVICE_${PN} = "fluent-bit.service" diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.7.2.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.7.2.bb deleted file mode 100644 index c75f446e1..000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_0.7.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Fast data collector for Embedded Linux" -HOMEPAGE = "http://fluentbit.io" -BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" - -SRC_URI = "http://fluentbit.io/releases/0.7/fluent-bit-${PV}.tar.gz" -SRC_URI[md5sum] = "6df9d676e1d2d782a243e655e144e8ae" -SRC_URI[sha256sum] = "695b56ce378f56855c9554f88f5d8e4f7b11ba7691284903870f779912af4ebe" -S = "${WORKDIR}/fluent-bit-${PV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -DEPENDS = "zlib" -INSANE_SKIP_${PN}-dev += "dev-elf" - -inherit cmake From patchwork Mon Apr 24 05:20:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98007 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327781qgf; Sun, 23 Apr 2017 22:23:33 -0700 (PDT) X-Received: by 10.84.229.7 with SMTP id b7mr30797050plk.72.1493011413200; Sun, 23 Apr 2017 22:23:33 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z5si17677843pfk.135.2017.04.23.22.23.32; Sun, 23 Apr 2017 22:23:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 EA7A072F45; Mon, 24 Apr 2017 05:23:24 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f52.google.com (mail-it0-f52.google.com [209.85.214.52]) by mail.openembedded.org (Postfix) with ESMTP id A432A71D97 for ; Mon, 24 Apr 2017 05:21:19 +0000 (UTC) Received: by mail-it0-f52.google.com with SMTP id e132so40194352ite.1 for ; Sun, 23 Apr 2017 22:21:21 -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=KTo1dIvFc5axF0rT/Gl9/Fok+2Y/37IyvvEGACBRnGM=; b=M3cJHFpAZsqBJPLNRojXooYhS3cXtkFvhpedAUKl6+mUOPspb59pcYSxZesUJH4XAW QI2HeTG3bifjqPpoaESitUCJ1mdMtWyC7RwKIo2Hwod3AcyNTh7kfXSIeI7wWlQoxq3v QI5/PK1/ir3DnzNgphJyKGjW7051ZjrEHsAbPjrA3JqVyWSmtmVx4dULAiyDlcurY1vr q25uj9GcG9lpaTM25hYyWHb7PgfsbL8t2cJSYSbQCKDWvtrR1BMaUNEed4WZR5LqrbLS dmQs+kWn42oGx4QCDSSyRbYUTJzUpGP8TithgAq9sI4Ep+W/veRPizM4c2qc03NMy7t6 d0gg== 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=KTo1dIvFc5axF0rT/Gl9/Fok+2Y/37IyvvEGACBRnGM=; b=HjF3J+AlSq+8yxxkduAS5gMcmaXkrv3gwnpQDfQF0H5pAzUnxr4/l6/n5OHhfIwWJT fLaBF/8t+k3kGJxgqg2VBZ+Ph2y3/Uv7gcHqNN2U3AHlMMWMa183KkhKINQnx87X3hop 4J7kWrbVt4ZrfGwgK4ya0WW25TNqYs7ghIJ+PPhYFZedV77CcGzqKl6v9+cQA4phezlr okkipzUg+SPpMQMsFvRB1IsXUFNiGOY3he8I553r7d/gRVosb549zhN2eifi9DPsHDkI YDWj18F/Rlvt14aLcNQXNTiYMV5PT1n9rM+bLK7cpkZsjfjhx8V5/LEU3BknsPGWsXPj 8BFg== X-Gm-Message-State: AN3rC/5uE6XFRnTucbRXMb3QhbM4ch0HoQW75Kk/SxUPo8N7t8JWaczf qwqNd3aDJ1Tytc15 X-Received: by 10.98.223.200 with SMTP id d69mr23371883pfl.100.1493011280123; Sun, 23 Apr 2017 22:21:20 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:18 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:46 -0700 Message-Id: <20170424052058.4952-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 05/17] ipsec-tools: Fix build with gcc7 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...parse-clear-memory-equal-to-size-of-array.patch | 30 ++++++++++++++++++++++ .../ipsec-tools/ipsec-tools_0.8.2.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch new file mode 100644 index 000000000..e9dd84aaa --- /dev/null +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch @@ -0,0 +1,30 @@ +From a5c59f6a1479947d33dba5191724cc5fc88a614b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Apr 2017 10:39:57 -0700 +Subject: [PATCH 2/2] cfparse: clear memory equal to size of array + +Fixes compiler error +cfparse.y: In function 'set_isakmp_proposal': +cfparse.y:2567:3: error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size] + +Signed-off-by: Khem Raj +--- + src/racoon/cfparse.y | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/racoon/cfparse.y b/src/racoon/cfparse.y +index 0d9bd67..5d9c67b 100644 +--- a/src/racoon/cfparse.y ++++ b/src/racoon/cfparse.y +@@ -2564,7 +2564,7 @@ set_isakmp_proposal(rmconf) + plog(LLV_DEBUG2, LOCATION, NULL, + "encklen=%d\n", s->encklen); + +- memset(types, 0, ARRAYLEN(types)); ++ memset(types, 0, sizeof(types)); + types[algclass_isakmp_enc] = s->algclass[algclass_isakmp_enc]; + types[algclass_isakmp_hash] = s->algclass[algclass_isakmp_hash]; + types[algclass_isakmp_dh] = s->algclass[algclass_isakmp_dh]; +-- +2.12.2 + diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb index 8f98b6c5c..d7e8b2596 100644 --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb @@ -23,6 +23,7 @@ SRC_URI = "http://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${P file://fix-CVE-2015-4047.patch \ file://0001-Fix-build-with-clang.patch \ file://0001-Fix-header-issues-found-with-musl-libc.patch \ + file://0002-cfparse-clear-memory-equal-to-size-of-array.patch \ " SRC_URI[md5sum] = "d53ec14a0a3ece64e09e5e34b3350b41" SRC_URI[sha256sum] = "8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d" From patchwork Mon Apr 24 05:20:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98008 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327822qgf; Sun, 23 Apr 2017 22:23:41 -0700 (PDT) X-Received: by 10.84.143.129 with SMTP id 1mr2543834plz.105.1493011421307; Sun, 23 Apr 2017 22:23:41 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y12si17630269pgo.307.2017.04.23.22.23.41; Sun, 23 Apr 2017 22:23:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 08AC872F50; Mon, 24 Apr 2017 05:23:26 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f45.google.com (mail-it0-f45.google.com [209.85.214.45]) by mail.openembedded.org (Postfix) with ESMTP id 1563771DD9 for ; Mon, 24 Apr 2017 05:21:21 +0000 (UTC) Received: by mail-it0-f45.google.com with SMTP id 70so44278207ita.0 for ; Sun, 23 Apr 2017 22:21:22 -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=KyTWabTFOueDChr4rB07OwCwzCNxzW2/cErZ6/CXc70=; b=LZsy77xwnb5HDLNzrilSnHOYmSyWfc0ZPhL0WIjQ70c9KIAz4NpVLTjrOQqb/g3aMY /qzH4Q4VqPP8nGDBlC9ZieCyEsl03X0Y/G4GGu1WgQLD/tO431V9SBaXJpRLUkl9th9q QuULmLKZccvwKunR4IZ0VRIT7maYrVEYI1O694CGDHxD//sfeZUjkk8w23EVREeAFDur +vpPW0aaFDBbPCqxmYR+rOwAxf/mj/qNkfJHsapQKuXafdLz1zB2b17LTjt1mOyHc1/A PoS9VJe4xCnesmz23rWBxJCDgM/xD3p0FiWIXk9neppOj/o9uoLMlcCPz/Ies7cHCyGC 4Akw== 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=KyTWabTFOueDChr4rB07OwCwzCNxzW2/cErZ6/CXc70=; b=QBPQA8vE8sO4AbnSNbXj25X4QfUQc9/0hEWnAByXWnFR2cOEwszvfsRFjavwq+6hEu vCEdLYZxpX3B8zWUKElc80MczYIGbLEqQDg6bC6AC7pynBmymm/+egEyinzV6JVuaAYe a5dd+4gglpw0xKklmviBV39ZzBaawgk/ZEpV2zdLY223CKTopxqktCZOavPM19c4KbO9 7GCGW21MRrGsn4hwRzrovRCVfpgDsoHquVWL1ABejsK0L3oZxSd4EMlDd2LAyLk8Vwaf lhUtA4zdajcYL+xClv10YHVfG6vNdCk9iUCiw38j1KzKGk8lE4ckZalkQdnOOqZnoOFE o9ZQ== X-Gm-Message-State: AN3rC/4RPGNbtcP+V59Z8KKxs78nlS44Ema+CXLnVLSqCwS4xNg6MTek vijaXqbOJWZrew== X-Received: by 10.99.116.20 with SMTP id p20mr23059398pgc.74.1493011281986; Sun, 23 Apr 2017 22:21:21 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:20 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:47 -0700 Message-Id: <20170424052058.4952-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 06/17] collectd: Upgrade to 5.7.1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Drop upstreamed patches or backports Fix build with gcc7 Signed-off-by: Khem Raj --- ...replace-deprecated-readdir_r-with-readdir.patch | 66 ----------- .../0001-conditionally-check-libvirt.patch | 47 ++++---- ...heck-for-Wno-error-format-truncation-comp.patch | 121 +++++++++++++++++++++ .../collectd/0001-redefine-the-dependence.patch | 28 ----- .../collectd/collectd/CVE-2016-6254.patch | 55 ---------- .../collectd/collectd/collectd-version.patch | 29 ----- .../collectd/collectd/no-gcrypt-badpath.patch | 63 ++++++----- .../{collectd_5.5.0.bb => collectd_5.7.1.bb} | 11 +- 8 files changed, 185 insertions(+), 235 deletions(-) delete mode 100644 meta-oe/recipes-extended/collectd/collectd/0001-collectd-replace-deprecated-readdir_r-with-readdir.patch create mode 100644 meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch delete mode 100644 meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch delete mode 100644 meta-oe/recipes-extended/collectd/collectd/CVE-2016-6254.patch delete mode 100644 meta-oe/recipes-extended/collectd/collectd/collectd-version.patch rename meta-oe/recipes-extended/collectd/{collectd_5.5.0.bb => collectd_5.7.1.bb} (91%) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-collectd-replace-deprecated-readdir_r-with-readdir.patch b/meta-oe/recipes-extended/collectd/collectd/0001-collectd-replace-deprecated-readdir_r-with-readdir.patch deleted file mode 100644 index f3d53f26e..000000000 --- a/meta-oe/recipes-extended/collectd/collectd/0001-collectd-replace-deprecated-readdir_r-with-readdir.patch +++ /dev/null @@ -1,66 +0,0 @@ -Subject: [PATCH] collectd: replace deprecated readdir_r() with readdir() - -* Replace the usage of readdir_r() with readdir() - to address a compilation error under glibc 2.24 - due to the deprecation of readdir_r - -| ../../collectd-5.5.0/src/vserver.c: In function 'vserver_read': -| ../../collectd-5.5.0/src/vserver.c:167:3: error: 'readdir_r' is deprecated [-Werror=deprecated-declarations] -| status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent); -| ^~~~~~ -| In file included from /buildarea4/myu2/build/prj_test_20160722/bitbake_build/tmp/sysroots/qemux86/usr/include/features.h:368:0, -| from /buildarea4/myu2/build/prj_test_20160722/bitbake_build/tmp/sysroots/qemux86/usr/include/stdio.h:27, -| from ../../collectd-5.5.0/src/daemon/collectd.h:34, -| from ../../collectd-5.5.0/src/vserver.c:29: -| /buildarea4/myu2/build/prj_test_20160722/bitbake_build/tmp/sysroots/qemux86/usr/include/dirent.h:189:12: note: declared here -| extern int __REDIRECT (readdir_r, -| ^ - - [1]https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7584a3f96de88d5eefe5d6c634515278cbfbf052;hp=8d9c92017d85f23ba6a2b3614b2f2bcf1820d6f0 - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - src/vserver.c | 15 ++++----------- - 1 file changed, 4 insertions(+), 11 deletions(-) - -diff --git a/src/vserver.c b/src/vserver.c -index bd2e867..2e4e715 100644 ---- a/src/vserver.c -+++ b/src/vserver.c -@@ -131,15 +131,8 @@ static derive_t vserver_get_sock_bytes(const char *s) - - static int vserver_read (void) - { --#if NAME_MAX < 1024 --# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + 1024 + 1) --#else --# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + NAME_MAX + 1) --#endif -- - DIR *proc; -- struct dirent *dent; /* 42 */ -- char dirent_buffer[DIRENT_BUFFER_SIZE]; -+ struct dirent *dent = NULL; /* 42 */ - - errno = 0; - proc = opendir (PROCDIR); -@@ -164,11 +157,11 @@ static int vserver_read (void) - - int status; - -- status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent); -- if (status != 0) -+ dent = readdir (proc); -+ if (dent == NULL && errno != 0) - { - char errbuf[4096]; -- ERROR ("vserver plugin: readdir_r failed: %s", -+ ERROR ("vserver plugin: readdir failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - closedir (proc); - return (-1); --- -2.8.2 - diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch index d0a58041f..1ceacd8c4 100644 --- a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch +++ b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch @@ -9,31 +9,28 @@ Signed-off-by: Roy Li configure.ac | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -diff --git a/configure.ac b/configure.ac -index 923498e..7206095 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4778,12 +4778,14 @@ then - with_libxml2="no (pkg-config doesn't know libxml-2.0)" - fi +Index: collectd-5.7.1/configure.ac +=================================================================== +--- collectd-5.7.1.orig/configure.ac ++++ collectd-5.7.1/configure.ac +@@ -5556,12 +5556,14 @@ else + with_libxml2="no (pkg-config doesn't know libxml-2.0)" + fi -- $PKG_CONFIG --exists libvirt 2>/dev/null -- if test "$?" = "0" -- then -- with_libvirt="yes" -- else -- with_libvirt="no (pkg-config doesn't know libvirt)" -+ if test "x$enable_libvirt" = "xyes"; then -+ $PKG_CONFIG --exists libvirt 2>/dev/null -+ if test "$?" = "0" -+ then -+ with_libvirt="yes" -+ else -+ with_libvirt="no (pkg-config doesn't know libvirt)" -+ fi - fi +-$PKG_CONFIG --exists libvirt 2>/dev/null +-if test "$?" = "0" +-then +- with_libvirt="yes" +-else +- with_libvirt="no (pkg-config doesn't know libvirt)" ++if test "x$enable_libvirt" = "xyes"; then ++ $PKG_CONFIG --exists libvirt 2>/dev/null ++ if test "$?" = "0" ++ then ++ with_libvirt="yes" ++ else ++ with_libvirt="no (pkg-config doesn't know libvirt)" ++ fi fi if test "x$with_libxml2" = "xyes" --- -1.9.1 - + then diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch new file mode 100644 index 000000000..70b0983e4 --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch @@ -0,0 +1,121 @@ +From 14d469bc82c758116aef7d549abd49c131b4170f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Apr 2017 11:54:57 -0700 +Subject: [PATCH] configure: Check for -Wno-error=format-truncation compiler + option + +If this option is supported by compiler then disable it ( gcc7+) +Fixes +client.c:834:23: error: '%s' directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Werror=format-truncation=] + +Signed-off-by: Khem Raj +--- + configure.ac | 3 +- + m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 76 insertions(+), 1 deletion(-) + create mode 100644 m4/ax_check_compile_flag.m4 + +diff --git a/configure.ac b/configure.ac +index 8854542..f3a6b57 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,7 +4,6 @@ AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) + AC_CONFIG_SRCDIR(src/target_set.c) + AC_CONFIG_HEADERS(src/config.h) + AC_CONFIG_AUX_DIR([libltdl/config]) +- + dnl older automake's default of ARFLAGS=cru is noisy on newer binutils; + dnl we don't really need the 'u' even in older toolchains. Then there is + dnl older libtool, which spelled it AR_FLAGS +@@ -6688,6 +6687,8 @@ then + AM_CFLAGS="$AM_CFLAGS -Werror" + AM_CXXFLAGS="$AM_CXXFLAGS -Werror" + fi ++AX_CHECK_COMPILE_FLAG([-Werror=format-truncation],[AM_CFLAGS="$AM_CFLAGS -Wno-error=format-truncation" AM_CXXFLAGS="$AM_CXXFLAGS -Wno-error=format-truncation"]) ++ + AC_SUBST([AM_CFLAGS]) + AC_SUBST([AM_CXXFLAGS]) + +diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 +new file mode 100644 +index 0000000..dcabb92 +--- /dev/null ++++ b/m4/ax_check_compile_flag.m4 +@@ -0,0 +1,74 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) ++# ++# DESCRIPTION ++# ++# Check whether the given FLAG works with the current language's compiler ++# or gives an error. (Warnings, however, are ignored) ++# ++# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on ++# success/failure. ++# ++# If EXTRA-FLAGS is defined, it is added to the current language's default ++# flags (e.g. CFLAGS) when the check is done. The check is thus made with ++# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to ++# force the compiler to issue an error when a bad flag is given. ++# ++# INPUT gives an alternative input source to AC_COMPILE_IFELSE. ++# ++# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this ++# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Guido U. Draheim ++# Copyright (c) 2011 Maarten Bosmans ++# ++# This program is free software: you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation, either version 3 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ++# Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program. If not, see . ++# ++# As a special exception, the respective Autoconf Macro's copyright owner ++# gives unlimited permission to copy, distribute and modify the configure ++# scripts that are the output of Autoconf when processing the Macro. You ++# need not follow the terms of the GNU General Public License when using ++# or distributing such scripts, even though portions of the text of the ++# Macro appear in them. The GNU General Public License (GPL) does govern ++# all other use of the material that constitutes the Autoconf Macro. ++# ++# This special exception to the GPL applies to versions of the Autoconf ++# Macro released by the Autoconf Archive. When you make and distribute a ++# modified version of the Autoconf Macro, you may extend this special ++# exception to the GPL to apply to your modified version as well. ++ ++#serial 5 ++ ++AC_DEFUN([AX_CHECK_COMPILE_FLAG], ++[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF ++AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl ++AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ ++ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS ++ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" ++ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], ++ [AS_VAR_SET(CACHEVAR,[yes])], ++ [AS_VAR_SET(CACHEVAR,[no])]) ++ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) ++AS_VAR_IF(CACHEVAR,yes, ++ [m4_default([$2], :)], ++ [m4_default([$3], :)]) ++AS_VAR_POPDEF([CACHEVAR])dnl ++])dnl AX_CHECK_COMPILE_FLAGS +-- +2.12.2 + diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch b/meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch deleted file mode 100644 index ef6afad9b..000000000 --- a/meta-oe/recipes-extended/collectd/collectd/0001-redefine-the-dependence.patch +++ /dev/null @@ -1,28 +0,0 @@ -[PATCH] define the collectd dependence - -Upstream-Status: Pending - -libavltree.la libcommon.la libheap.la are created dynamically, and in LDADD, -but not in DEPENDENCIES - -Signed-off-by: Roy Li ---- - src/daemon/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am -index 10860ec..7f826e3 100644 ---- a/src/daemon/Makefile.am -+++ b/src/daemon/Makefile.am -@@ -49,7 +49,7 @@ collectd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) - collectd_CFLAGS = $(AM_CFLAGS) - collectd_LDFLAGS = -export-dynamic - collectd_LDADD = libavltree.la libcommon.la libheap.la -lm --collectd_DEPENDENCIES = -+collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la - - # Link to these libraries.. - if BUILD_WITH_LIBRT --- -1.9.1 - diff --git a/meta-oe/recipes-extended/collectd/collectd/CVE-2016-6254.patch b/meta-oe/recipes-extended/collectd/collectd/CVE-2016-6254.patch deleted file mode 100644 index bc85b4c0e..000000000 --- a/meta-oe/recipes-extended/collectd/collectd/CVE-2016-6254.patch +++ /dev/null @@ -1,55 +0,0 @@ -From dd8483a4beb6f61521d8b32c726523bbea21cd92 Mon Sep 17 00:00:00 2001 -From: Florian Forster -Date: Tue, 19 Jul 2016 10:00:37 +0200 -Subject: [PATCH] network plugin: Fix heap overflow in parse_packet(). - -Emilien Gaspar has identified a heap overflow in parse_packet(), the -function used by the network plugin to parse incoming network packets. - -This is a vulnerability in collectd, though the scope is not clear at -this point. At the very least specially crafted network packets can be -used to crash the daemon. We can't rule out a potential remote code -execution though. - -Fixes: CVE-2016-6254 - -cherry picked from upstream commit b589096f - -Upstream Status: Backport - -Signed-off-by: Alexandru Moise ---- - src/network.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/network.c b/src/network.c -index 551bd5c..cb979b2 100644 ---- a/src/network.c -+++ b/src/network.c -@@ -1444,6 +1444,7 @@ static int parse_packet (sockent_t *se, /* {{{ */ - printed_ignore_warning = 1; - } - buffer = ((char *) buffer) + pkg_length; -+ buffer_size -= (size_t) pkg_length; - continue; - } - #endif /* HAVE_LIBGCRYPT */ -@@ -1471,6 +1472,7 @@ static int parse_packet (sockent_t *se, /* {{{ */ - printed_ignore_warning = 1; - } - buffer = ((char *) buffer) + pkg_length; -+ buffer_size -= (size_t) pkg_length; - continue; - } - #endif /* HAVE_LIBGCRYPT */ -@@ -1612,6 +1614,7 @@ static int parse_packet (sockent_t *se, /* {{{ */ - DEBUG ("network plugin: parse_packet: Unknown part" - " type: 0x%04hx", pkg_type); - buffer = ((char *) buffer) + pkg_length; -+ buffer_size -= (size_t) pkg_length; - } - } /* while (buffer_size > sizeof (part_header_t)) */ - --- -2.7.4 - diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch deleted file mode 100644 index 86c3f65b7..000000000 --- a/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch +++ /dev/null @@ -1,29 +0,0 @@ -Don't pick up version string from parent git repository - -If the collectd source is extracted from a tarball underneath a -directory structure that includes another git repository, that -repository will be picked up by "git describe" which is not -desirable. Check whether collectd itself is a git repository and just -use the default version if not. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton - -diff --git a/version-gen.sh b/version-gen.sh -index b09be8e..2671066 100755 ---- a/version-gen.sh -+++ b/version-gen.sh -@@ -2,8 +2,10 @@ - - DEFAULT_VERSION="5.5.0.git" - --VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" -- -+VERSION="" -+if test -d .git ; then -+ VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" -+fi - if test -z "$VERSION"; then - VERSION="$DEFAULT_VERSION" - fi diff --git a/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch index 0e876ae85..1fde6a071 100644 --- a/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch +++ b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch @@ -1,30 +1,43 @@ -Disable defaulting of GCRYPT_LDFLAGS to -L/usr/lib - -Prevents "unsafe for cross compilation" warnings that cause -do_qa_configure to fail. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Paul Eggleton - -Index: collectd-5.4.1/configure.ac +Index: collectd-5.7.1/configure.ac =================================================================== ---- collectd-5.4.1.orig/configure.ac 2014-09-03 01:20:22.062084244 -0700 -+++ collectd-5.4.1/configure.ac 2014-09-03 01:20:22.058084244 -0700 -@@ -1867,11 +1867,11 @@ - GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags 2>/dev/null` - fi +--- collectd-5.7.1.orig/configure.ac ++++ collectd-5.7.1/configure.ac +@@ -2305,7 +2305,7 @@ AC_ARG_WITH(libgcrypt, [AS_HELP_STRING([ + with_libgcrypt="yes" + else if test -f "$withval/bin/gcrypt-config" && test -x "$withval/bin/gcrypt-config" + then +- with_libgcrypt_config="$withval/bin/gcrypt-config" ++ with_libgcrypt_config="$withval/bin/pkg-config" + with_libgcrypt="yes" + else if test -d "$withval" + then +@@ -2313,12 +2313,12 @@ AC_ARG_WITH(libgcrypt, [AS_HELP_STRING([ + GCRYPT_LDFLAGS="$GCRYPT_LDFLAGS -L$withval/lib" + with_libgcrypt="yes" + else +- with_libgcrypt_config="gcrypt-config" ++ with_libgcrypt_config="pkg-config" + with_libgcrypt="$withval" + fi; fi; fi + ], + [ +- with_libgcrypt_config="libgcrypt-config" ++ with_libgcrypt_config="pkg-config" + with_libgcrypt="yes" + ]) -- if test "x$GCRYPT_LDFLAGS" = "x" -- then -- gcrypt_exec_prefix=`"$with_libgcrypt_config" --exec-prefix 2>/dev/null` -- GCRYPT_LDFLAGS="-L$gcrypt_exec_prefix/lib" -- fi -+# if test "x$GCRYPT_LDFLAGS" = "x" -+# then -+# gcrypt_exec_prefix=`"$with_libgcrypt_config" --exec-prefix 2>/dev/null` -+# GCRYPT_LDFLAGS="-L$gcrypt_exec_prefix/lib" -+# fi +@@ -2326,12 +2326,12 @@ if test "x$with_libgcrypt" = "xyes" && t + then + if test "x$GCRYPT_CPPFLAGS" = "x" + then +- GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags 2>/dev/null` ++ GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags libgcrypt 2>/dev/null` + fi if test "x$GCRYPT_LIBS" = "x" then +- GCRYPT_LIBS=`"$with_libgcrypt_config" --libs 2>/dev/null` ++ GCRYPT_LIBS=`"$with_libgcrypt_config" --lib libgcrypt 2>/dev/null` + fi + fi + diff --git a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.7.1.bb similarity index 91% rename from meta-oe/recipes-extended/collectd/collectd_5.5.0.bb rename to meta-oe/recipes-extended/collectd/collectd_5.7.1.bb index 59732db81..b7789c7ca 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.7.1.bb @@ -6,18 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1bd21f19f7f0c61a7be8ecacb0e28854" DEPENDS = "rrdtool curl libpcap libxml2 yajl libgcrypt libtool lvm2" SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ - file://no-gcrypt-badpath.patch \ - file://collectd-version.patch \ - file://0001-redefine-the-dependence.patch \ file://collectd.init \ file://collectd.service \ + file://no-gcrypt-badpath.patch \ file://0001-conditionally-check-libvirt.patch \ - file://0001-collectd-replace-deprecated-readdir_r-with-readdir.patch \ - file://CVE-2016-6254.patch \ file://0001-fix-to-build-with-glibc-2.25.patch \ + file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ " -SRC_URI[md5sum] = "c39305ef5514b44238b0d31f77e29e6a" -SRC_URI[sha256sum] = "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88" +SRC_URI[md5sum] = "dc36141ed3058c4919bbd54b87c07873" +SRC_URI[sha256sum] = "7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501" inherit autotools pythonnative update-rc.d pkgconfig systemd From patchwork Mon Apr 24 05:20:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98009 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327839qgf; Sun, 23 Apr 2017 22:23:50 -0700 (PDT) X-Received: by 10.84.131.129 with SMTP id d1mr30745738pld.16.1493011430478; Sun, 23 Apr 2017 22:23:50 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id h14si4480137pln.249.2017.04.23.22.23.50; Sun, 23 Apr 2017 22:23:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 1666E72F5E; Mon, 24 Apr 2017 05:23:27 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by mail.openembedded.org (Postfix) with ESMTP id 5399F71E12 for ; Mon, 24 Apr 2017 05:21:21 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id z67so13855861itb.0 for ; Sun, 23 Apr 2017 22:21:23 -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=IIoivft4i2weChF+0P7O7BmpAUnkk3yM5xjMN+ySdAE=; b=o/H3yuEEmjcIVBOvdzjWEk3EosHwJvg2iL3HKpmqn9ZQUzKZ437mYSU0B0bv8nTBhH E6JVv2wKtPQD5momVWrR/7pNxUi6TsGi61PsrqThNVEwOUNXLiu8AwgFEX6O01ffPXVR tU5tR4bZthQK6U+3x6nxjsZ61yARC6b9uuha2mKAX3UZHpxXKAtmiwIgUM7bCG9ARmXw 4yreB0WGfJlcerpnPV1hlm0gP2usLARz6gDI6Y7w7wgSOXPDsEu+UG8U/qtcFCxDOjIR scSeumEMF1sahg4+ugZkDItwL54HpCM1/lu5XJWCiuCRlGsIrDUqm85vOg/yC16CUb7Q h+wg== 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=IIoivft4i2weChF+0P7O7BmpAUnkk3yM5xjMN+ySdAE=; b=hG2T9RpZMYEf0vJUXBirneDY4G0voFluCSD1PTBdqRnBQAR8RPlAsYebKbHhOYfMeo SYEyNUuOUg8TxDyfhipQn1+KvSBNfSIKuAK9ZB9tzxVtfb0rIFQ53HURhnZCvUZehmKt BS6hvbL0KI3d8+LlMVL3abRKdzcDhxo8dICC1WUlq/wNCUq/mHei+u8eZ6g6QOonyDV0 MLUgsbEextfPN10vftlmSrJ/GDBBVmMTZ/BvOhUz26ftZWL6Jmz9EUQwqtL2ZWAawCCp LtYUky8RFho3yivZHpqwiv5S0nDuopxVCxkZJlX0R0mFKU5OjKkVWradhUQNKS8h1TXU wcbQ== X-Gm-Message-State: AN3rC/7fG6hfLd7AY8cgoM9Tl6QhRT8XKjr87oBy2C9LxuDs46vFugX9 1hehtpuZvTZdnw== X-Received: by 10.99.100.194 with SMTP id y185mr23201666pgb.140.1493011283396; Sun, 23 Apr 2017 22:21:23 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:22 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:48 -0700 Message-Id: <20170424052058.4952-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 07/17] libsigc++: Disable PIE in SECURITY_FLAGS X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org doesnt compile yet Signed-off-by: Khem Raj --- meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb | 1 + 1 file changed, 1 insertion(+) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb index 00d465c15..53bd5de10 100644 --- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb +++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb @@ -19,3 +19,4 @@ FILES_${PN}-dev += "${libdir}/sigc++-*/" FILES_${PN}-doc += "${datadir}/devhelp" BBCLASSEXTEND = "native" +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" From patchwork Mon Apr 24 05:20:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98010 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327872qgf; Sun, 23 Apr 2017 22:23:57 -0700 (PDT) X-Received: by 10.84.192.37 with SMTP id b34mr1289196pld.174.1493011437874; Sun, 23 Apr 2017 22:23:57 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y3si1247212pgc.222.2017.04.23.22.23.57; Sun, 23 Apr 2017 22:23:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 5F04572F7B; Mon, 24 Apr 2017 05:23:28 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by mail.openembedded.org (Postfix) with ESMTP id 7444671D8C for ; Mon, 24 Apr 2017 05:21:23 +0000 (UTC) Received: by mail-it0-f67.google.com with SMTP id z67so13856024itb.0 for ; Sun, 23 Apr 2017 22:21:25 -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=m9la3FjFiidqczOclXqY89hP6620WYWl0qDwrlY7KL0=; b=uS0gKZHsgiJ8Wt+GnAUq3+2IYacB0yK6HEoL0xvBrZu5a+oGv9/pyDElhm+5LiXIkg SG7DCkY4YO3BOyFr36F8W0l/XbNeQnTBTLI1TzvwVnkyfmmV8EJm2xXkHNprh5k7v6Wi 04w8Oa/cDHbVYXf+KJC1dofOQ9Ap2aYjXersPWUP6ccFygNs9zMoCwLdT+lzczl6gQDM nlJJWoHTMkik/ph+7FdFW6gXvk9t3+aHw15xVtj7w+8qtF6MIw+XI9Egzj6pgMbOWuTs RHOAsOpXvqqmTo7cZTXlUjbeAzBi24JCTPzBEOOC/PTefAGEAEHH2yZWCtlHohBU5IYj EpJA== 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=m9la3FjFiidqczOclXqY89hP6620WYWl0qDwrlY7KL0=; b=qZV5H9mCGB1oeJlU/QvgOaFXsgCCrIB2buSIpuLORnBHTlqkCqj7unsEkDvehxBEjE viwxyy78wbqoJs+oRkCNLYgaQcYFc1my8fl4/6IeWyjWzAzWbCutJQxYpCsqJGTSZ13m sdykZFxyD7Bi+AkaHnw3DtiNVRBtbW0mrbZcPxp2t2YpljgPS7Sg6Xs1EwzcDhC5Ry8A Eq/7/gz+mMtDFS7BM4LOvp3mtPLUZQOMH9k3/rAEGzQ/gqBkXi4oiEp+qQ2CDCeYIi7U s38nSmZSNBWWsugXNdwo+v5aQCqWLoVCRBCilpv+U/2wZviEh+KP/HzzHgxEsVt6TURT DPtg== X-Gm-Message-State: AN3rC/4dxBHiQuw4KEKjHzycrLCNpno7FTPtwcjW+Ot8SdZ4RXZVT+Z3 sT31J1RUc9CchK7A X-Received: by 10.84.230.135 with SMTP id e7mr30870716plk.20.1493011285017; Sun, 23 Apr 2017 22:21:25 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:24 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:49 -0700 Message-Id: <20170424052058.4952-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 08/17] glibmm: Upgrade to 2.50.1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Disable PIE when building with SECURITY_FLAGS Signed-off-by: Khem Raj --- meta-oe/recipes-core/glib-2.0/{glibmm_2.50.0.bb => glibmm_2.50.1.bb} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename meta-oe/recipes-core/glib-2.0/{glibmm_2.50.0.bb => glibmm_2.50.1.bb} (84%) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.50.1.bb similarity index 84% rename from meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb rename to meta-oe/recipes-core/glib-2.0/glibmm_2.50.1.bb index 9cf822074..401b3b2ec 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.50.1.bb @@ -14,8 +14,8 @@ SRC_URI = " \ ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ file://remove-examples.patch \ " -SRC_URI[md5sum] = "e7416beff6cba1f38c2bccd0dc8c3278" -SRC_URI[sha256sum] = "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94" +SRC_URI[md5sum] = "a5b915dc42fc62983fa78ca8486f4391" +SRC_URI[sha256sum] = "1fd85051da9cb402cc8348cec72dfe4d79f9345df4a1dbf68703a4ded45846a4" do_install_append() { install -d ${D}${datadir}/glibmm-2.4 @@ -29,3 +29,4 @@ FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" RDEPENDS_${PN}-dev = "perl" +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" From patchwork Mon Apr 24 05:20:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98011 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327900qgf; Sun, 23 Apr 2017 22:24:05 -0700 (PDT) X-Received: by 10.99.63.203 with SMTP id m194mr13344869pga.210.1493011444992; Sun, 23 Apr 2017 22:24:04 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o1si17653339pfj.91.2017.04.23.22.24.04; Sun, 23 Apr 2017 22:24:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 6EDEF72F90; Mon, 24 Apr 2017 05:23:29 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by mail.openembedded.org (Postfix) with ESMTP id 1504B71D8C for ; Mon, 24 Apr 2017 05:21:25 +0000 (UTC) Received: by mail-it0-f67.google.com with SMTP id z67so13856268itb.0 for ; Sun, 23 Apr 2017 22:21:27 -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=DmZEJA5rLqxczMZN13FUsCmCOIUh3xLfArssSKnCerg=; b=hUlwIaX49/uAbIhEbZc4OaPU10mLyOehoOhNsKSoPUd7f1PwgKC/bZkns7y394B5A7 3sGzR3WtVhg2WVHtuTB3LYJDzDfme3qEdTcXNZRek/cNlG5AeFG15giUXlcRLJxfZjCC QmCMSWR3XUx1NM7dBRCdmEfOWyftlJz1jAIiNBiaUQZXiWA2bikaC40s/ELJtI3luX9s jklsl7k2YqZUqmSiqxRugS9shVGEtvbMyYFEcS6R62L/kSby4mGbqzOySZnQluszrpl/ XIg9mxZz0XeiaangMMPs6gLXEWR+AbvnhhQ6NUmJ4nF1QMdEeZcVPLo1805ccw28kX1n 9i7Q== 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=DmZEJA5rLqxczMZN13FUsCmCOIUh3xLfArssSKnCerg=; b=nY+i2Yx4QeMPBUIbV/DESKrjqnJdu/4VhAm2rIKl9cehVGLUn5tskUMULJa2gusGWj A2OxjmBZki/0Czs1JNG3nsYJwk8CBdgpQUomv0LGc7tqq/PJ/nSPE5h3ojFUh+7/B+C6 h2J2snGCXe3P33nyGUYfmVDWMxLrDpAjgRv/+BOAvPlDRrWr8+qSPRmPinIAWXuEuz6+ E1uU4eYjkfo2GLl9N2nl5BtOabrAC2RauYtYKruuVOVeJfPgwoHQ9/09ZcldmXAfZhAj VXW1FET1vpjg1ec30fnuVgHNHSgGhKc7s1Lftm7jgtQQwVxdsWpY1J8dK/7aBwofQZp/ FfFA== X-Gm-Message-State: AN3rC/6OE8x8qPC36+xxP0ADOB+XPBJiUyFwBEYNrAizn9/meegnPl/n 52Bd3vmtOt6+DQ== X-Received: by 10.99.95.134 with SMTP id t128mr22314070pgb.84.1493011286794; Sun, 23 Apr 2017 22:21:26 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:25 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:50 -0700 Message-Id: <20170424052058.4952-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 09/17] opensaf: Upgrade to 5.2.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix build with gcc7 Signed-off-by: Khem Raj --- .../opensaf/0001-Remove-unused-variables.patch | 43 +++++++ ...isable-format-overflow-if-supported-by-gc.patch | 127 +++++++++++++++++++++ ...gure-Pass-linker-specific-options-with-Wl.patch | 29 +++++ .../opensaf/opensaf/0001-plmcd-error-fix.patch | 43 ------- .../opensaf/install-samples-from-srcdir.patch | 11 -- .../opensaf/{opensaf_5.0.0.bb => opensaf_5.2.0.bb} | 35 +++--- 6 files changed, 214 insertions(+), 74 deletions(-) create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0001-Remove-unused-variables.patch create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0001-plmcd-error-fix.patch delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/install-samples-from-srcdir.patch rename meta-networking/recipes-daemons/opensaf/{opensaf_5.0.0.bb => opensaf_5.2.0.bb} (69%) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Remove-unused-variables.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Remove-unused-variables.patch new file mode 100644 index 000000000..1c88b81cd --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Remove-unused-variables.patch @@ -0,0 +1,43 @@ +From a441a75fbb8451268a8a57616c7158cddc1823aa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Apr 2017 12:40:19 -0700 +Subject: [PATCH] Remove unused variables + +Fixes build errors with gcc7 e.g. + +../opensaf-5.2.0/src/amf/amfd/imm.cc: In member function 'bool ImmObjCreate::immobj_update_required()': +../opensaf-5.2.0/src/amf/amfd/imm.cc:2174:28: error: unused variable 'pos' [-Werror=unused-variable] + std::string::size_type pos; + ^~~ +../opensaf-5.2.0/src/amf/amfd/imm.cc:2215:28: error: unused variable 'pos' [-Werror=unused-variable] + std::string::size_type pos; + ^~~ + +Signed-off-by: Khem Raj +--- + src/amf/amfd/imm.cc | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/amf/amfd/imm.cc b/src/amf/amfd/imm.cc +index 7932364..4f47b65 100644 +--- a/src/amf/amfd/imm.cc ++++ b/src/amf/amfd/imm.cc +@@ -2171,7 +2171,6 @@ bool ImmObjCreate::immobj_update_required() { + if (class_type == AVSV_SA_AMF_SI_ASSIGNMENT) { + std::string su_name; + std::string sisu_name; +- std::string::size_type pos; + while ((attribute = attrValues_[i++]) != nullptr) { + if (!strcmp(attribute->attrName, "safSISU")) { + sisu_name = Amf::to_string( +@@ -2212,7 +2211,6 @@ bool ImmObjCreate::immobj_update_required() { + } else if (class_type == AVSV_SA_AMF_CSI_ASSIGNMENT) { + std::string comp_name; + std::string csicomp_name; +- std::string::size_type pos; + AVD_CSI *csi = nullptr; + AVD_COMP *comp = nullptr; + AVD_COMP_CSI_REL *compcsi = nullptr; +-- +2.12.2 + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch new file mode 100644 index 000000000..512e246c5 --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch @@ -0,0 +1,127 @@ +From ab00d6f5793b2d850f975bcb6d5d0aa6d7a9eaa4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Apr 2017 12:34:37 -0700 +Subject: [PATCH] configure: Disable format-overflow if supported by gcc + +Signed-off-by: Khem Raj +--- + Makefile.am | 6 ++-- + configure.ac | 2 ++ + m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 79 insertions(+), 3 deletions(-) + create mode 100644 m4/ax_check_compile_flag.m4 + +diff --git a/Makefile.am b/Makefile.am +index d63fbbb..1012a2c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -52,10 +52,10 @@ AM_CPPFLAGS = \ + -pthread \ + -D_GNU_SOURCE -DINTERNAL_VERSION_ID='"@INTERNAL_VERSION_ID@"' \ + $(CORE_INCLUDES) \ +- $(all_includes) ++ $(all_includes) @NOWARNINGS@ + +-AM_CFLAGS = -pipe -std=gnu11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror +-AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror ++AM_CFLAGS = -pipe -std=gnu11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@ ++AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@ + AM_LDFLAGS = @OSAF_HARDEN_FLAGS@ -Wl,--as-needed -ldl -lrt -pthread -rdynamic + ACLOCAL_AMFLAGS = -I m4 + OSAF_LIB_FLAGS = +diff --git a/configure.ac b/configure.ac +index 02771c6..b76b0fe 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -557,6 +557,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then + fi + AC_SUBST(OSAF_HARDEN_FLAGS) + ++AX_CHECK_COMPILE_FLAG([-Werror=format-overflow],[NOWARNINGS=-Wno-error=format-overflow]) ++AC_SUBST(NOWARNINGS) + ############################################# + # List the output Makefiles + ############################################# +diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 +new file mode 100644 +index 0000000..dcabb92 +--- /dev/null ++++ b/m4/ax_check_compile_flag.m4 +@@ -0,0 +1,74 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) ++# ++# DESCRIPTION ++# ++# Check whether the given FLAG works with the current language's compiler ++# or gives an error. (Warnings, however, are ignored) ++# ++# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on ++# success/failure. ++# ++# If EXTRA-FLAGS is defined, it is added to the current language's default ++# flags (e.g. CFLAGS) when the check is done. The check is thus made with ++# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to ++# force the compiler to issue an error when a bad flag is given. ++# ++# INPUT gives an alternative input source to AC_COMPILE_IFELSE. ++# ++# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this ++# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Guido U. Draheim ++# Copyright (c) 2011 Maarten Bosmans ++# ++# This program is free software: you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation, either version 3 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ++# Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program. If not, see . ++# ++# As a special exception, the respective Autoconf Macro's copyright owner ++# gives unlimited permission to copy, distribute and modify the configure ++# scripts that are the output of Autoconf when processing the Macro. You ++# need not follow the terms of the GNU General Public License when using ++# or distributing such scripts, even though portions of the text of the ++# Macro appear in them. The GNU General Public License (GPL) does govern ++# all other use of the material that constitutes the Autoconf Macro. ++# ++# This special exception to the GPL applies to versions of the Autoconf ++# Macro released by the Autoconf Archive. When you make and distribute a ++# modified version of the Autoconf Macro, you may extend this special ++# exception to the GPL to apply to your modified version as well. ++ ++#serial 5 ++ ++AC_DEFUN([AX_CHECK_COMPILE_FLAG], ++[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF ++AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl ++AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ ++ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS ++ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" ++ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], ++ [AS_VAR_SET(CACHEVAR,[yes])], ++ [AS_VAR_SET(CACHEVAR,[no])]) ++ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) ++AS_VAR_IF(CACHEVAR,yes, ++ [m4_default([$2], :)], ++ [m4_default([$3], :)]) ++AS_VAR_POPDEF([CACHEVAR])dnl ++])dnl AX_CHECK_COMPILE_FLAGS +-- +2.12.2 + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch new file mode 100644 index 000000000..5756a027b --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch @@ -0,0 +1,29 @@ +From 6248b717b4861d16b80235fd8e57d64e4f636428 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Apr 2017 17:39:07 -0700 +Subject: [PATCH] configure: Pass linker specific options with -Wl + +This helps make it pass the options to linker correctly +and we can use non-gcc compilers + +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index df4fc58..02771c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -553,7 +553,7 @@ if test -z "$OSAF_HARDEN_FLAGS"; then + if echo "${CFLAGS} ${CXXFLAGS}" | grep -q -- -O0; then + OSAF_HARDEN_FLAGS="" + fi +- OSAF_HARDEN_FLAGS="${OSAF_HARDEN_FLAGS} -fstack-protector --param ssp-buffer-size=4 -fPIE -pie -zrelro -znow" ++ OSAF_HARDEN_FLAGS="${OSAF_HARDEN_FLAGS} -fstack-protector --param ssp-buffer-size=4 -fPIE -pie -Wl,-z,relro,-z,now" + fi + AC_SUBST(OSAF_HARDEN_FLAGS) + +-- +2.12.2 + diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-plmcd-error-fix.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-plmcd-error-fix.patch deleted file mode 100644 index 624cd2d7b..000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-plmcd-error-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f1813af4c154fb1d3950abbdf678c3a5a67222fc Mon Sep 17 00:00:00 2001 -From: Li xin -Date: Thu, 25 Jun 2015 11:44:27 +0900 -Subject: [PATCH] plmcd: error fix - -ld: cannot find -lsystemd-daemon -collect2: error: ld returned 1 exit status - -Signed-off-by: Li Xin ---- - contrib/plmc/plmcd/Makefile.am | 2 +- - contrib/plmc/plmcd/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/contrib/plmc/plmcd/Makefile.am b/contrib/plmc/plmcd/Makefile.am -index 8d847f2..dd7913a 100644 ---- a/contrib/plmc/plmcd/Makefile.am -+++ b/contrib/plmc/plmcd/Makefile.am -@@ -32,7 +32,7 @@ plmcd_SOURCES = \ - plmcd_LDFLAGS = -lpthread - - if ENABLE_SYSTEMD --plmcd_LDFLAGS += -lsystemd-daemon -+plmcd_LDFLAGS += -lsystemd - endif - - plmcd_LDADD = \ -diff --git a/contrib/plmc/plmcd/Makefile.in b/contrib/plmc/plmcd/Makefile.in -index 0185dc4..e40513a 100644 ---- a/contrib/plmc/plmcd/Makefile.in -+++ b/contrib/plmc/plmcd/Makefile.in -@@ -106,7 +106,7 @@ build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ - sbin_PROGRAMS = plmcd$(EXEEXT) --@ENABLE_SYSTEMD_TRUE@am__append_1 = -lsystemd-daemon -+@ENABLE_SYSTEMD_TRUE@am__append_1 = -lsystemd - subdir = plmcd - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.ac --- -1.8.4.2 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/install-samples-from-srcdir.patch b/meta-networking/recipes-daemons/opensaf/opensaf/install-samples-from-srcdir.patch deleted file mode 100644 index 016b64f2e..000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/install-samples-from-srcdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- opensaf-4.5.0.orig/Makefile.am 2014-12-31 14:45:54.088797989 +0800 -+++ opensaf-4.5.0/Makefile.am 2014-12-31 14:45:08.328796688 +0800 -@@ -219,7 +219,7 @@ install-data-local: - $(mkinstalldirs) $(DESTDIR)$(pkgpiddir) - $(mkinstalldirs) $(DESTDIR)$(lockdir) - $(mkinstalldirs) $(DESTDIR)$(pkglocalstatedir) -- cp -R samples/ $(DESTDIR)$(pkgdatadir) -+ cp -R $(srcdir)/samples/ $(DESTDIR)$(pkgdatadir) - - install-data-hook: - @for i in $$(grep -lr -e 'xxLIBDIRxx' -e 'xxLOGDIRxx' -e 'xxCLCCLIDIRxx' $(DESTDIR)$(pkgimmxml_svcdir)/*.xml) ; do \ diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.2.0.bb similarity index 69% rename from meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb rename to meta-networking/recipes-daemons/opensaf/opensaf_5.2.0.bb index 6ceb225e9..5abd560f0 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.2.0.bb @@ -15,14 +15,17 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" DEPENDS = "libxml2 python" +TOOLCHAIN = "gcc" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ - file://install-samples-from-srcdir.patch \ - file://0001-plmcd-error-fix.patch \ - " +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" -SRC_URI[md5sum] = "94cd1a4c0406e6a45bb04c003f8690e7" -SRC_URI[sha256sum] = "4b4188a0f3d0ed1ed0e3d77de27c45e2c96b437401de08e7df2ed9ecd54bb999" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ + file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ + file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ + file://0001-Remove-unused-variables.patch \ +" +SRC_URI[md5sum] = "08991fd467ae9dcea3c8747be8e3981e" +SRC_URI[sha256sum] = "903478244afe37e329be93050f1d48fa18c84ea17862134c4217b920e267a04a" inherit autotools useradd systemd pkgconfig @@ -33,34 +36,26 @@ USERADD_PARAM_${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nolog SYSTEMD_SERVICE_${PN} += "opensafd.service plmcboot.service plmcd.service" SYSTEMD_AUTO_ENABLE = "disable" -PACKAGECONFIG[systemd] = "--enable-systemd-daemon" +PACKAGECONFIG[systemd] = ",,systemd" PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03 --enable-ais-plm,,openhpi" -EXTRA_OECONF += " --libdir=${libdir}/opensaf " -EXTRA_OEMAKE += " -Wl,-rpath,${libdir}/opensaf " +PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" -PKGLIBDIR="${libdir}/opensaf/opensaf" - -do_configure_prepend () { - ( cd ${S}; autoreconf -f -i -s ) -} +PKGLIBDIR="${libdir}" do_install_append() { + cp -av --no-preserve=ownership ${B}/lib/.libs/*.so* ${D}${libdir} rm -fr "${D}${localstatedir}/lock" rm -fr "${D}${localstatedir}/run" rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \ - ${D}${systemd_unitdir}/system - install -m 0644 ${B}/contrib/plmc/config/*.service ${D}/${systemd_unitdir}/system - + rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" if [ ! -d "${D}${sysconfdir}/init.d" ]; then install -d ${D}${sysconfdir}/init.d install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ fi } -FILES_${PN} += "${localstatedir}/run ${systemd_unitdir}/system/*.service" +FILES_${PN} += "${systemd_unitdir}/system/*.service" FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" INSANE_SKIP_${PN} = "dev-so" From patchwork Mon Apr 24 05:20:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98012 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327936qgf; Sun, 23 Apr 2017 22:24:12 -0700 (PDT) X-Received: by 10.84.191.228 with SMTP id a91mr30501058pld.62.1493011452496; Sun, 23 Apr 2017 22:24:12 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v23si6373114pgb.44.2017.04.23.22.24.12; Sun, 23 Apr 2017 22:24:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 84BCB72F9C; Mon, 24 Apr 2017 05:23:30 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by mail.openembedded.org (Postfix) with ESMTP id D7A4C71D8C for ; Mon, 24 Apr 2017 05:21:26 +0000 (UTC) Received: by mail-it0-f65.google.com with SMTP id x188so13076284itb.3 for ; Sun, 23 Apr 2017 22:21:28 -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=zMANIstmrrXFmdg17AgGAlzNaU0VmVsh12vuCQhS84E=; b=bKUXv/dY7Qe4Y9cEuMIb8WmiUStSqhmZFD5QxtkE9TNx8z1yDVrz4u2Pxq1vYJCkKl 0iic2K/MdvKkNSREDSQcNtExR6WIeUDhKzFtt8p7bGNie+R5/cAL3hw1lD39cd/Fobkj 9G9Q8ADYOR49SlMxJN0YhLFGbwIDSWctqz20aqFN6DRSLFcb4kvcLxDwUinpMfr761c+ itS2EgqypbZFUOJtF3QkK93CjoOthTQ7fhGokkEoE3+tYN836HibhjrRjO15sjbV1uqU /aUfSSdm108G9IS97NpqO3QCvOY+VfQr7BO3pwdOeaLzOYgW4EnnkT9v2V6dsmo4n3P9 CrZQ== 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=zMANIstmrrXFmdg17AgGAlzNaU0VmVsh12vuCQhS84E=; b=OKPLwVaIzyT6+AFOa4gs17cLq+dxKJx1MbgeN0SYC3GPJwvd3cR/7VzuztAKVwOPdJ /pIvHLb4F16jeg83hCyo9U3cpR928VcJT/iqSHYE2xHX2Keww0RifzCM+eXY+Wq9wtEh i45b6A489XFjULlDXmkaYV/qlgdrFQxEBhdw1PfSViXTCRpV1S1wv5pR+eXNX5qKj8EO FH1Xfa40SNG4COTGYYz8089nk/LYB2icVodGYthhsN+QdFQkxKsaLjeaqlA1XSIMSf5s eIrZf3B0EaYgZP1URHnyZvR6QLIkheXxVzlnITKwiWUr+j6P2s12UfR3G8zKIPXyHc/r lANA== X-Gm-Message-State: AN3rC/77EQAy51mtiDwQfDCMoAS3gDR84zuvqSVPF/AfIq+MdvyGkg4k vec/6V2P96SyQA== X-Received: by 10.84.129.4 with SMTP id 4mr30758997plb.37.1493011288072; Sun, 23 Apr 2017 22:21:28 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:27 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:51 -0700 Message-Id: <20170424052058.4952-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 10/17] memcached: Upgrade to 1.4.36 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../memcached/memcached/redundant_comparison.patch | 13 ------------- .../memcached/{memcached_1.4.33.bb => memcached_1.4.36.bb} | 8 ++++---- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch rename meta-networking/recipes-support/memcached/{memcached_1.4.33.bb => memcached_1.4.36.bb} (87%) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch b/meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch deleted file mode 100644 index ed86ffae4..000000000 --- a/meta-networking/recipes-support/memcached/memcached/redundant_comparison.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: memcached-1.4.33/items.c -=================================================================== ---- memcached-1.4.33.orig/items.c -+++ memcached-1.4.33/items.c -@@ -148,7 +148,7 @@ item *do_item_alloc(char *key, const siz - uint8_t nsuffix; - item *it = NULL; - char suffix[40]; -- if (nbytes < 2 || nkey < 0) -+ if (nbytes < 2) - return 0; - - size_t ntotal = item_make_header(nkey + 1, flags, nbytes, suffix, &nsuffix); diff --git a/meta-networking/recipes-support/memcached/memcached_1.4.33.bb b/meta-networking/recipes-support/memcached/memcached_1.4.36.bb similarity index 87% rename from meta-networking/recipes-support/memcached/memcached_1.4.33.bb rename to meta-networking/recipes-support/memcached/memcached_1.4.36.bb index da9a693ac..48c3c9ee2 100644 --- a/meta-networking/recipes-support/memcached/memcached_1.4.33.bb +++ b/meta-networking/recipes-support/memcached/memcached_1.4.36.bb @@ -20,10 +20,10 @@ RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ " SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ - file://redundant_comparison.patch \ - file://memcached-add-hugetlbfs-check.patch" -SRC_URI[md5sum] = "2d7f6476283cd36e21e521d901d37a8f" -SRC_URI[sha256sum] = "83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d" + file://memcached-add-hugetlbfs-check.patch \ + " +SRC_URI[md5sum] = "1e028fbab7288911fcaa5ed2a21817fe" +SRC_URI[sha256sum] = "773b6bb20bf80223ca6a15d75f570fbab346ad11ec98595e5af5e33f54bd82d8" # set the same COMPATIBLE_HOST as libhugetlbfs COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux' From patchwork Mon Apr 24 05:20:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98013 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327960qgf; Sun, 23 Apr 2017 22:24:19 -0700 (PDT) X-Received: by 10.98.2.213 with SMTP id 204mr23141211pfc.125.1493011459697; Sun, 23 Apr 2017 22:24:19 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p17si17602145pgh.53.2017.04.23.22.24.19; Sun, 23 Apr 2017 22:24:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 94C8A72FB0; Mon, 24 Apr 2017 05:23:31 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by mail.openembedded.org (Postfix) with ESMTP id 5DE3771D8C for ; Mon, 24 Apr 2017 05:21:28 +0000 (UTC) Received: by mail-it0-f67.google.com with SMTP id x188so13076400itb.3 for ; Sun, 23 Apr 2017 22:21:30 -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=A/007H3gXydtS23wEbyqBhuz8RYX0evYYUGXpXTBXMQ=; b=iyacM4+DFVVZQTKgyYgmMYodObY20m3JckGFoWUpMS2FG7WVUfU9GwvushrAHL73UI c6MwzJfzF/09UhBfSzX7BvVPtqGDi5gseYcWjrtrQj/dPU0qLe/j8E2wg5IrAiybrfjf 1r0FjI3kDGZZgl1Ycafbq8tXwZaBVVYBM8JznOZ0CKmygH4W/Tiau6GccMe/BRKbREHB /wCpSWPaTmF9NUQBs2XVHgGR106ZjLsN5v3lx+cm9MhX64h9jlvNKqAkxXrUjrBWNBRK wlIjdcpT/Th7HyuwFlA1S0rGYKAGJWw0ObjtyWK4NzD08cxpKNRWnNzEaA/3RZmruSPz q7Eg== 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=A/007H3gXydtS23wEbyqBhuz8RYX0evYYUGXpXTBXMQ=; b=toY2YeqcUcmwym6fwNFGMzLh0IXP8+e4VZAUtdkPLnFN+G8/eEDzYwTafiww5ZK5+k qTvp/wDzKkox1Qs+q3MIQ1ZgRqK6C60lExbhmwXpIvdeFd3UzZAboD7PPMNylY/HTGdQ gE4m0vY81wzNXdwk/UXOP5Gq4wgdh/mQr0gW9Rv3JVpUhiYdmKkQEZo72t37p/5ryA2P Y2Lpb3+WiSPTLPzzMUYbkohFoeJpvN6eHiAhflN+oH0yb14EGb2pKLAzqTHkE5AwzTya 2wXPkrsELz2l1/wDbAMxL7vG7i67wJAZPH7Jeugbm2R9iNztg8jm1aSQLesK88QPCV4G Z0HA== X-Gm-Message-State: AN3rC/5si32rI5EsoxjssDh1Iy51Vf30v4qPzXGv50aoyHPfV0XhxrO0 +yY9iTKo1sVYA6OD X-Received: by 10.84.130.36 with SMTP id 33mr30450854plc.111.1493011289568; Sun, 23 Apr 2017 22:21:29 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:28 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:52 -0700 Message-Id: <20170424052058.4952-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 11/17] lowpan-tools: Fix build with gcc7 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../0001-Remove-newline-from-format-line.patch | 32 ++++++++++++++++++++++ .../lowpan-tools/lowpan-tools_git.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch new file mode 100644 index 000000000..1453b75d5 --- /dev/null +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch @@ -0,0 +1,32 @@ +From a36afac485745cf980fba1809526f2025cb4d101 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 23 Apr 2017 00:16:45 -0700 +Subject: [PATCH] Remove newline from format line + +Fixes + +error: '__builtin___snprintf_chk' output truncated before the last format character [-Werror=format-truncation=] + "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", + ^ + +Signed-off-by: Khem Raj +--- + addrdb/addrdb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/addrdb/addrdb.c b/addrdb/addrdb.c +index 4bb7f79..05d53f3 100644 +--- a/addrdb/addrdb.c ++++ b/addrdb/addrdb.c +@@ -178,7 +178,7 @@ int addrdb_dump_leases(const char *lease_file) + continue; + } + snprintf(hwaddr_buf, sizeof(hwaddr_buf), +- "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", ++ "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", + lease->hwaddr[0], lease->hwaddr[1], + lease->hwaddr[2], lease->hwaddr[3], + lease->hwaddr[4], lease->hwaddr[5], +-- +2.12.2 + diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index 0dcc6a785..be73f8ae4 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -13,6 +13,7 @@ SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ file://0001-Fix-build-errors-with-clang.patch \ file://0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch \ file://0001-src-iz.c-Undef-dprintf-before-redefining.patch \ + file://0001-Remove-newline-from-format-line.patch \ " SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" From patchwork Mon Apr 24 05:20:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98014 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1327988qgf; Sun, 23 Apr 2017 22:24:27 -0700 (PDT) X-Received: by 10.98.24.213 with SMTP id 204mr22495931pfy.237.1493011467661; Sun, 23 Apr 2017 22:24:27 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id u63si17640562pfi.269.2017.04.23.22.24.27; Sun, 23 Apr 2017 22:24:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 D6A2373122; Mon, 24 Apr 2017 05:23:32 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by mail.openembedded.org (Postfix) with ESMTP id 3DFA271D8C for ; Mon, 24 Apr 2017 05:21:29 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id e132so13852199ite.2 for ; Sun, 23 Apr 2017 22:21:31 -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=j196NGk8mXpCkjc8P1h2YB+ThdelHacmNnN4z6o+7KU=; b=vZPRB/qH5ANyNQQwEaCbNJ8V8ZYGi9PEl2kpuMDOl1exBTnGu6fFtB6P55JgTwu8hC NW9I5e49RMmUtQ3SSiNJe/6YctvYcXNiqrnq34yb8uJK3rnYtGc2qr8POUkr5Gtys6oh ZlxhlQpbxljmA/8j0br5YHxrA21ApyyoypLxOljYSPFeYJUMbluhXI5BPHmYq6z/c5DM uF+4kUCHviG20Gn0tIxz4AmjT6ms4CSvhbPCQzZwJwa0IkztVsuOZA3mThYdC5hp4DUc EQ1K5KrYuwihOU86SDlGSnSR1btKrbXB3CmKSUrRHQKFy/6yWSngWOFzmmmfslVa5pxp 803g== 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=j196NGk8mXpCkjc8P1h2YB+ThdelHacmNnN4z6o+7KU=; b=dzniyGTy5HZQAfrfkM7kCX8MDqyCk4cNTDYP42SdlkVKwr/zoHz30UTaDSvXv40CU5 TtEI4Jtz2+sRtdYXgIKX1eNOFS2kmcuYYvAN8FMJO+POv6aUXKMniDmavrLTHMOZRmRy L1wLSkQkTsCLyLbhYTVUFWnvbvrT2UCSIKcO2Zbw5DL1GlTBTF6nybPOUj3ER1FIXeiY bIyb+FEFAbwtXrQojaJzojqHiZzJu7LrKR8AzBDCup0eCt5+lKLaWqAd5WO8DSeE9C1f kQFKJ+U/XdwXz0PpTzalUoz6z5CE6KMeKTRitNqijhAvol0DQZc48ph2VK01iYbaGal/ GgWQ== X-Gm-Message-State: AN3rC/6orr1wwCceJANjZuuNK+lXzxFOdSTMu8/+tBXrdKuDu9rxQzX5 UsT9JIz0Fxk25w== X-Received: by 10.99.1.198 with SMTP id 189mr22858731pgb.229.1493011291183; Sun, 23 Apr 2017 22:21:31 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:30 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:53 -0700 Message-Id: <20170424052058.4952-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 12/17] squid: Upgrade to 3.5.25 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Add patch to fix throw() errors with gcc7 Update copyright year to 2017 Signed-off-by: Khem Raj --- ...e-noexcept-instead-of-throw-for-C-11-comp.patch | 48 ++++++++++++++++++++++ .../squid/{squid_3.5.23.bb => squid_3.5.25.bb} | 9 ++-- 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch rename meta-networking/recipes-daemons/squid/{squid_3.5.23.bb => squid_3.5.25.bb} (92%) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch b/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch new file mode 100644 index 000000000..48674c3c5 --- /dev/null +++ b/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch @@ -0,0 +1,48 @@ +From f9150a0dc092ab2cbd47ee428436b747dce323a9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 23 Apr 2017 10:28:28 -0700 +Subject: [PATCH] SquidNew: use noexcept instead of throw for C++11 compilers + +Fixes errors with gcc7 which is more pedantic about c++11 +conformance regarding deprecated features + +include/SquidNew.h:21:51: error: dynamic exception specifications are deprecated in C++11 +_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc) + ^~~~~ + +Signed-off-by: Khem Raj +--- + include/SquidNew.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/SquidNew.h b/include/SquidNew.h +index 39fcee0..c960347 100644 +--- a/include/SquidNew.h ++++ b/include/SquidNew.h +@@ -18,19 +18,19 @@ + */ + #include + +-_SQUID_EXTERNNEW_ void *operator new(size_t size) throw (std::bad_alloc) ++_SQUID_EXTERNNEW_ void *operator new(size_t size) noexcept(false) + { + return xmalloc(size); + } +-_SQUID_EXTERNNEW_ void operator delete (void *address) throw() ++_SQUID_EXTERNNEW_ void operator delete (void *address) noexcept(true) + { + xfree(address); + } +-_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc) ++_SQUID_EXTERNNEW_ void *operator new[] (size_t size) noexcept(false) + { + return xmalloc(size); + } +-_SQUID_EXTERNNEW_ void operator delete[] (void *address) throw() ++_SQUID_EXTERNNEW_ void operator delete[] (void *address) noexcept(true) + { + xfree(address); + } +-- +2.12.2 + diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.23.bb b/meta-networking/recipes-daemons/squid/squid_3.5.25.bb similarity index 92% rename from meta-networking/recipes-daemons/squid/squid_3.5.23.bb rename to meta-networking/recipes-daemons/squid/squid_3.5.25.bb index 0fe9673af..5116383b8 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.23.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.25.bb @@ -21,12 +21,13 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://volatiles.03_squid \ file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ -" -SRC_URI[md5sum] = "b9e5603f00b0c40109610667d8693b22" -SRC_URI[sha256sum] = "4384564e6227fbb4c18626d663e1b47912d3507b596ed997f2149f10dd8d70bd" + file://0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch \ + " +SRC_URI[md5sum] = "c34b228129a755f363367c45c46287ba" +SRC_URI[sha256sum] = "0bfd6182154b7f29574d71c659f1cfd1b7d9be9356895dac70dc0f3696a0639b" LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ - file://errors/COPYRIGHT;md5=0d98c4448c368d146f31a970bb0ced21 \ + file://errors/COPYRIGHT;md5=8861130fae91400bcf99b66f133172b3 \ " DEPENDS = "libtool krb5 openldap db cyrus-sasl" From patchwork Mon Apr 24 05:20:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98015 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1328016qgf; Sun, 23 Apr 2017 22:24:34 -0700 (PDT) X-Received: by 10.99.211.21 with SMTP id b21mr23260496pgg.48.1493011474804; Sun, 23 Apr 2017 22:24:34 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s36si17661289pld.3.2017.04.23.22.24.34; Sun, 23 Apr 2017 22:24:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 E660272F7A; Mon, 24 Apr 2017 05:23:33 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by mail.openembedded.org (Postfix) with ESMTP id 1161571D8C for ; Mon, 24 Apr 2017 05:21:31 +0000 (UTC) Received: by mail-it0-f68.google.com with SMTP id z67so13856685itb.0 for ; Sun, 23 Apr 2017 22:21:33 -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=S9hSQdjnPRIJgpCWpDY+8VOI+cny9mNRq1m6k/f7LTE=; b=d4B2W9pqgzXVHYrpdMlnk96U1ZNfufmLnRrewLc9rF1ACUKSmVQoC7bOg4bJYpwVHi 9MvPVrvMgZKIFiNTulhcbqa5fmdkCPQpC1X8gNnjZ0kauobA9ljJDkwBgAVTtSoXIWH6 Vy23Ab1bmnfKWP6oXdmCIOgjZFhdnTp7Vp5qiBUmAwW1Z68KxjRTKyZzOIy3PRdTYlv0 BeiprT8Y+ychK7lWw0AxjmI521xIGI69tyWjeFt/ss+Q+Cinrvmh9imgArbBZYN444OH 1yX9ucahR+IpwozVN4E2S9GUZdQvbkOqeOj/98p8WsvUsYRsVwKIF3b/nHy5SpFTAHjC ryFg== 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=S9hSQdjnPRIJgpCWpDY+8VOI+cny9mNRq1m6k/f7LTE=; b=dhtZEItfnzjBn9wQhgBpFJsobkldPJ6LRfgeKyAIupwL7O5lPRpzMOD8v805qJcyFG 8q/kzI7CzYjahYgW+TixSggRzM7MzPUQ1iB7uAFOhwLGP8OL0ODmfh7ClN7laIO5J4vv 4tJg0iKY7LhvvUDXdva/QpE2eMWKGm2SLXGFo3YT3MKM0K/HHxf4Fh+N97do1+vApGTv iTMOCfZFpA9N6afJgLhF63FC+z6N2hXMJ0V9U2uIwdqHq9Mbd1WzF2R0Zd/ffO2s+oCO yVWODgC4Ar36ZXG+oUE+bsBUqKCqmfvnDox/6eC6DsFwYxJZHhAu2T+O8XR1RxGLrKXn JQTw== X-Gm-Message-State: AN3rC/7+FZD/PDntg5innDbBv0anGxOvdICa31If56F5a38UOlcJBYF8 uLi8usDoH/8yyg== X-Received: by 10.84.230.131 with SMTP id e3mr31130069plk.100.1493011293025; Sun, 23 Apr 2017 22:21:33 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:31 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:54 -0700 Message-Id: <20170424052058.4952-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 13/17] glcompbench: Fix build with gcc7 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...001-waf-Disable-errors-due-to-Wdeprecated.patch | 31 ++++++++++++++++++++++ .../glcompbench/glcompbench_2012.08.bb | 3 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch b/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch new file mode 100644 index 000000000..deb60161c --- /dev/null +++ b/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch @@ -0,0 +1,31 @@ +From 49297e2fbe0420a255cbe67989d0ec539125412c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 23 Apr 2017 10:38:24 -0700 +Subject: [PATCH] waf: Disable errors due to -Wdeprecated + +throw() has been deprecated in c++11 and removed +from c++17, gcc7 is more pedandic about this warning +we therefore add a workaround to ignore this warning +for now. + +Signed-off-by: Khem Raj +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index 485a9fb..7f59761 100644 +--- a/wscript ++++ b/wscript +@@ -79,7 +79,7 @@ def configure(ctx): + ctx.check_cfg(package = pkg, uselib_store = uselib, args = '--cflags --libs', + mandatory = True) + +- ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -std=c++11 -Wextra'.split(' ')) ++ ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -std=c++11 -Wextra -Wno-error=deprecated'.split(' ')) + + # Prepend -O# and -g flags so that they can be overriden by the CFLAGS environment variable + if Options.options.opt: +-- +2.12.2 + diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb b/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb index 7cf9692f6..e8465855d 100755 --- a/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb +++ b/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb @@ -11,7 +11,8 @@ SRC_URI = "https://launchpad.net/glcompbench/trunk/${PV}/+download/${BPN}-${PV}. file://Fix_space_issues.patch \ file://Fix_auto_ptr_deprecated.patch \ file://0001-build-Specify-std-c-11-on-cmdline.patch \ -" + file://0001-waf-Disable-errors-due-to-Wdeprecated.patch \ + " SRC_URI[md5sum] = "c939d9156fe940960098f38707fea827" SRC_URI[sha256sum] = "b04b738cec06c6786ceafa86e4735fd8b971c078265754854ef356b0379542ee" From patchwork Mon Apr 24 05:20:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98016 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1328052qgf; Sun, 23 Apr 2017 22:24:42 -0700 (PDT) X-Received: by 10.99.8.193 with SMTP id 184mr22921949pgi.189.1493011482176; Sun, 23 Apr 2017 22:24:42 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g77si17614523pfg.410.2017.04.23.22.24.41; Sun, 23 Apr 2017 22:24:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 F0E45731A5; Mon, 24 Apr 2017 05:23:34 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by mail.openembedded.org (Postfix) with ESMTP id 4AC8071DDD for ; Mon, 24 Apr 2017 05:21:33 +0000 (UTC) Received: by mail-it0-f65.google.com with SMTP id e132so13852453ite.2 for ; Sun, 23 Apr 2017 22:21:35 -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=DyftTWdBdGYaM6PiS3I5lFJ70UFUBTsMRouN+yJHw78=; b=U/pSgvohGr71VgcQvkWs4KSOpip1cUggtY68TA1oSxyoWAlneSYrY6bKZXt1V/RhiG IdewxHcH2WDLT8p906s04juDOnqG74mxUaBEFVFtYjOoS4Ha5VjNrqWIamEOP9d4omHA WVFzOJCKxPxb2JkEr9UUSaYmTH+EmsMNTB9WbAWxR+livdHrLC5uERO33ZStoKDW9iy3 u8qATJwdbJn+yO0/bRjSYdLmMAkwriCCM5xZYQmq2R4aB0wptvj6X4VSE8fv6SC16Z7A mMNwygMG5NbfHM7Imnf07jd6z2XgmXkGwy1rw8HKvtZXwyvJhLidlq7jiyzYznefHUOb 8yxA== 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=DyftTWdBdGYaM6PiS3I5lFJ70UFUBTsMRouN+yJHw78=; b=NqYme6RJzdKlpdrwyAL15Kx9TopAPQuWbuaOopjIENRcM7QtqQfyjqgxrsQCqPsdf8 XJi/oIYBvcx5dqkeuZhhb90L/TMbeblm9s9VMC1oNMlCNxXFmlaA59ETLzp515/syME/ 6NSPkcGg6k1l2J0G6K3eM9NMNDtSFT2Qi9MFYNpj/lsEWAddpIFyoEG1N6y0MCfTJYPQ iutukudFVoTZzjz3Bb18CRf0Zird8K4eIjyy3XJduBbsZewIGc9QhvaMAdmhK2NxeImI bSVG/OYYVfYpLMWlHaer5uVQEZwpelMzQMBxIDVW9QRadKq50FNcxsFnPfkL7gRHtsMs hCsA== X-Gm-Message-State: AN3rC/6O3ftt+6VfE06vzlBZ+Pv2AcL0tm8MJFRyNzzA+Aj5tm/iyeOo LmA1/+swXBx0db7p X-Received: by 10.84.135.34 with SMTP id 31mr30002368pli.99.1493011294447; Sun, 23 Apr 2017 22:21:34 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:55 -0700 Message-Id: <20170424052058.4952-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 14/17] mariadb: Upgrade to 5.5.55 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix build with gcc7 Signed-off-by: Khem Raj --- .../{mariadb-native_5.5.52.bb => mariadb-native_5.5.55.bb} | 0 meta-oe/recipes-support/mysql/mariadb.inc | 5 +++-- meta-oe/recipes-support/mysql/mariadb/gcc7.patch | 13 +++++++++++++ .../mysql/{mariadb_5.5.52.bb => mariadb_5.5.55.bb} | 0 4 files changed, 16 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.52.bb => mariadb-native_5.5.55.bb} (100%) create mode 100644 meta-oe/recipes-support/mysql/mariadb/gcc7.patch rename meta-oe/recipes-support/mysql/{mariadb_5.5.52.bb => mariadb_5.5.55.bb} (100%) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb similarity index 100% rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.52.bb rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.55.bb diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 401907251..fd9dcbd1a 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -17,9 +17,10 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P file://fix-a-building-failure.patch \ file://change-cc-to-cc-version.patch \ file://0001-disable-ucontext-on-musl.patch \ + file://gcc7.patch \ " -SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" -SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293" +SRC_URI[md5sum] = "54a0bbbc9b67308e7c076622d02f0fcd" +SRC_URI[sha256sum] = "cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86" S = "${WORKDIR}/mariadb-${PV}" diff --git a/meta-oe/recipes-support/mysql/mariadb/gcc7.patch b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch new file mode 100644 index 000000000..3e75b26c7 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/gcc7.patch @@ -0,0 +1,13 @@ +Index: mariadb-5.5.55/client/mysql.cc +=================================================================== +--- mariadb-5.5.55.orig/client/mysql.cc ++++ mariadb-5.5.55/client/mysql.cc +@@ -2850,7 +2850,7 @@ You can turn off this feature to get a q + mysql_free_result(fields); + break; + } +- field_names[i][num_fields*2]= '\0'; ++ field_names[i][num_fields*2][0]= '\0'; + j=0; + while ((sql_field=mysql_fetch_field(fields))) + { diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.52.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.55.bb similarity index 100% rename from meta-oe/recipes-support/mysql/mariadb_5.5.52.bb rename to meta-oe/recipes-support/mysql/mariadb_5.5.55.bb From patchwork Mon Apr 24 05:20:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98017 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1328072qgf; Sun, 23 Apr 2017 22:24:49 -0700 (PDT) X-Received: by 10.99.143.69 with SMTP id r5mr22517410pgn.77.1493011489655; Sun, 23 Apr 2017 22:24:49 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a5si84399pgd.190.2017.04.23.22.24.49; Sun, 23 Apr 2017 22:24:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 0911E771A3; Mon, 24 Apr 2017 05:23:36 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by mail.openembedded.org (Postfix) with ESMTP id 768D271D8C for ; Mon, 24 Apr 2017 05:21:34 +0000 (UTC) Received: by mail-it0-f68.google.com with SMTP id x188so13076814itb.3 for ; Sun, 23 Apr 2017 22:21:36 -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=rk2CIB2hxGqMQ8kHZ1DXnbXOtJjYfZoGcYtN8laX39U=; b=cx7mQuDlcedFSjzr+E+NznQ6VZNWz4keSR3HbtdokqwMxl4AuzgdsvNdtTu4JrNhaE BZ5FpBSVxH2jH8Ky2uyYg1nR275H/Hz72epe5dk/Sj4qeXYBxtGTLNXn0ryPsOElSqfY KNX1lz8t6mF0caVx97T4+GyLxad6NuwuYOx/3gQDQYfcnxi3LDqLYYHrgZe585miDroZ tqc946O/h0qadYTBS1J5uqCiKgMRQ9rLEBWDB+A3Yq938/jHsf9fMeBo43KCuHTBr9kb DsWeEe+PNVDE9mSFx1NOywSpOx+9z+zIOaIw2I+6wGSVvPreyiFwFGjsRon2Hj9amd54 5jDQ== 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=rk2CIB2hxGqMQ8kHZ1DXnbXOtJjYfZoGcYtN8laX39U=; b=dGq5JJGLOBCgQ3YGACJXFx+zk16qYGdjkuqgnrq8iq+eYVykpMnlZTOWOK+iNk7oQi PqrBfTNO9cVBO63ERcvDPV0BYyGEihykr1x35Db7qbCc9/iPCTcUipmubjSA2wOPlJLE 8V5olejWcQtB/6Mquf3Zn1swl3dObBv1NEN1ay7cKN9EM951Z8x942HChHP1BfEMGS3h nVCtXcgA5WEVAJNUwqXXJwuIMApoP+lJptd4VOISwYnkTWeDba1+pmWVgyYl5jDLJHsw hWR0Y2y7fxTeRYlf1+j7QucYtcZeR37PYoDTeMWG8A6dT+pL0F+MliueimGW4JWjECSE FLxA== X-Gm-Message-State: AN3rC/5cyM2/S5S5MlKuHbJCgIrG8UK5vYpLa0J96V27sehG7ytkWxiu 2lcPravDAciZ3A== X-Received: by 10.84.237.8 with SMTP id s8mr17593967plk.163.1493011296042; Sun, 23 Apr 2017 22:21:36 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:34 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:56 -0700 Message-Id: <20170424052058.4952-15-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 15/17] efivar: Fix multiple definition of `efi_set_variable' X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org This patch is needed across all efivar when using gcc7 for target Signed-off-by: Khem Raj --- meta-oe/recipes-extended/efivar/efivar_0.24.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/efivar/efivar_0.24.bb b/meta-oe/recipes-extended/efivar/efivar_0.24.bb index be04defea..602fd81b4 100644 --- a/meta-oe/recipes-extended/efivar/efivar_0.24.bb +++ b/meta-oe/recipes-extended/efivar/efivar_0.24.bb @@ -15,13 +15,13 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" SRCREV = "963cb2e5adc145fe00717f94e382f2973f80e753" SRC_URI = "git://github.com/rhinstaller/efivar.git \ file://0002-disable-static-build.patch \ + file://allow-multi-definitions-for-native.patch \ " SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ file://0003-efivar-fix-for-cross-compile.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \ " SRC_URI_append_class-native = " file://fix-compile-failure-with-host-gcc-4.6.patch \ - file://allow-multi-definitions-for-native.patch \ " S = "${WORKDIR}/git" From patchwork Mon Apr 24 05:20:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98018 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1328101qgf; Sun, 23 Apr 2017 22:24:56 -0700 (PDT) X-Received: by 10.98.75.25 with SMTP id y25mr22810244pfa.157.1493011496735; Sun, 23 Apr 2017 22:24:56 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b2si13082103plm.291.2017.04.23.22.24.56; Sun, 23 Apr 2017 22:24:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 157D6773B9; Mon, 24 Apr 2017 05:23:37 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by mail.openembedded.org (Postfix) with ESMTP id AF7B772F1B for ; Mon, 24 Apr 2017 05:21:36 +0000 (UTC) Received: by mail-io0-f194.google.com with SMTP id x86so45540435ioe.3 for ; Sun, 23 Apr 2017 22:21:38 -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=QdZUp71FV6FXqZpR8xJ4bUl83R8U023B9r6ww2r8giU=; b=kBA/xfdvmmxh+WXFNmwvBjZSepgdTlxArEdgzEBApws6KTeptM3HxVGCz+RrfSFFcU oSSaKp4KT4pYie6hq+BC2tq6Ged7bnl7tjQHL4toRIdQAdhwWkKqxtbIgbLJOFnLD2JO 4pmiaBRPVO/aqR8IfEe44DFh5H1zaLbn2Q6qzqVwQaguLfFH2x8ckWHkQ3n/yUwxgz52 Fgrb83NDtfxeAHzk1nglItVq3GveNMmgV8R/ikycBMJVd4VUyGTvrBpg3YKRpkTNLcAN snw9e0dXBS5a3k2O2Q04VYAfYUsFD5MbrJGmVLXmk4oyp1MYRIE1a7KxHdnPnvV+5Cgx ywow== 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=QdZUp71FV6FXqZpR8xJ4bUl83R8U023B9r6ww2r8giU=; b=TzNk1SEsFlGrg/Ub+iQEL6Ga8mYH12Xwfe536ElEXrOQ8tP/gMhjQGox2c2PAwddQ3 HHLOuc46Na1N6Qdyhn/wfb2E7ANzNf2pjKzZ4dbCRaHnHr004afR47NYKB6adJlq9RSS 3s3CH6+OXTS+ubZlk2mtd7o/pcsGn6yC8d4kpHvg/DbMZ63or4BS7x3KZCZfgjxBj2eI GDegRWbjBeW5dcVmhco0lvnkUobQ3tiJhfg1YSBfyrCpyg8GPOuWOZDIRfLllENngT7q f521SyRiJRVshq9Pgt5PQQE1VATj3S8bgIn2tXmfN0Yo7PEnEPVjKgBtg/3yLyeHD0Sq KDXA== X-Gm-Message-State: AN3rC/4sNmKQw/2OF3nzO8WMqKHdX5Ag8IAsysuvLbIJS6mVBPpz2Nje UJ77pif0YiVMQ5dU X-Received: by 10.98.54.68 with SMTP id d65mr2287242pfa.90.1493011297543; Sun, 23 Apr 2017 22:21:37 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:36 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:57 -0700 Message-Id: <20170424052058.4952-16-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 16/17] libtalloc: Upgrade to 2.1.9 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../libtalloc/{libtalloc_2.1.8.bb => libtalloc_2.1.9.bb} | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) rename meta-networking/recipes-support/libtalloc/{libtalloc_2.1.8.bb => libtalloc_2.1.9.bb} (93%) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.1.9.bb similarity index 93% rename from meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb rename to meta-networking/recipes-support/libtalloc/libtalloc_2.1.9.bb index 0283088ff..d80af50d2 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb +++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.1.9.bb @@ -2,16 +2,15 @@ SUMMARY = "Hierarchical, reference counted memory pool system with destructors" HOMEPAGE = "http://talloc.samba.org" SECTION = "libs" LICENSE = "LGPL-3.0+ & GPL-3.0+" - -SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ - file://talloc-Add-configure-options-for-packages.patch \ -" LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ file://pytalloc.h;beginline=1;endline=18;md5=2c498cc6f2263672483237b20f46b43d" -SRC_URI[md5sum] = "6fb70af4174330e4cc139ea63b07c9e9" -SRC_URI[sha256sum] = "22d14911164d4de67ff76b5269fa5250d01f78c955bc77e28615350996877130" +SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ + file://talloc-Add-configure-options-for-packages.patch \ +" +SRC_URI[md5sum] = "19ba14eba97d79a169fa92ea824d2b9e" +SRC_URI[sha256sum] = "f0aad4cb88a3322207c82136ddc07bed48a37c2c21f82962d6c5ccb422711062" inherit waf-samba From patchwork Mon Apr 24 05:20:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 98019 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1328141qgf; Sun, 23 Apr 2017 22:25:05 -0700 (PDT) X-Received: by 10.84.168.69 with SMTP id e63mr30303304plb.124.1493011505244; Sun, 23 Apr 2017 22:25:05 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id e6si2528381pgf.93.2017.04.23.22.25.04; Sun, 23 Apr 2017 22:25:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 503A177921; Mon, 24 Apr 2017 05:23:38 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by mail.openembedded.org (Postfix) with ESMTP id 0445F71D8C for ; Mon, 24 Apr 2017 05:21:38 +0000 (UTC) Received: by mail-it0-f67.google.com with SMTP id x188so13077033itb.3 for ; Sun, 23 Apr 2017 22:21:39 -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=CtYfCqOvS0bHT26GsxIvf/lMKXi9vAOjLqbXSesxjls=; b=poln9hdjOMK+XvTMw5zdNZ9l3HjLyvR2UgM/pzkvdqg6dNZRijDW8TQIrTzT09H2VY En6hcVhYP1ON86wOEoH4j8VwbzhquGJqxWj1Tr7SXiStesPkPoEHaSXFAh9XMrQsDrrM QA7D2MuMwWUQy7sf4ewI2eXLu3FMqlYLo50/WVnN4z0adAXA8Kr0PYXqlTdNiDEDEZxt rLvT3JQwYJ6MW2Lw6UXmqfjG9tWbzBEZPob1haeob5gaoYDmVRBunpVJTDXLdtUldA1n 2CP6V536rLCjCKASqLDScwiKJli9nm7dYmjgOvN8YoDSLk28+lAHcJtnhrQetuxtJo59 OtGg== 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=CtYfCqOvS0bHT26GsxIvf/lMKXi9vAOjLqbXSesxjls=; b=cJW1wd91Af8kuAaJRbUM/wYxsFcPH/wmduTmXypH4w0M9FuINIyQH/PR0doJrzZNdi fNyyBUH2erjwCSNmlITvDKxWDz1szQFH0AQSHUE/vSHwPUUt72wnER7vcfZuPF7bkWMD RDuiaEFwvHnoydv39qMVyE67Qm2HrE5b9rAS2PX7n96+I8Fp04nLPUSBH6AKT8nxyuqw ITLtML4KAuPwHazPtCLPIVI59uDhCBxZHKQtR3Os6Di2K/7yrekWfJWvp7RTth29pDI2 6Dpkpu1Ka3ju3tW/8GPP3eMROBJlcjWWsaTmwGZfHN0tLZew/VJdHKx5VBUnLfKmXCis yIVw== X-Gm-Message-State: AN3rC/6eKmhcgfKVz1EGPebQUiKLSa6v4AElY5plbVSnU0B9hENZ0xkc 0dzCoEkgW6kiFg== X-Received: by 10.84.229.144 with SMTP id c16mr30525254plk.27.1493011299354; Sun, 23 Apr 2017 22:21:39 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id v13sm24001176pgo.44.2017.04.23.22.21.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 22:21:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Apr 2017 22:20:58 -0700 Message-Id: <20170424052058.4952-17-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424052058.4952-1-raj.khem@gmail.com> References: <20170424052058.4952-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 17/17] samba: Upgrade to 4.6.2 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../waf-cross-answers/cross-answers-aarch64.txt | 1 + .../files/waf-cross-answers/cross-answers-arm.txt | 1 + .../files/waf-cross-answers/cross-answers-i586.txt | 1 + .../files/waf-cross-answers/cross-answers-i686.txt | 1 + .../files/waf-cross-answers/cross-answers-mips.txt | 1 + .../waf-cross-answers/cross-answers-mips64.txt | 1 + .../waf-cross-answers/cross-answers-mipsel.txt | 1 + .../waf-cross-answers/cross-answers-powerpc.txt | 1 + .../waf-cross-answers/cross-answers-powerpc64.txt | 1 + .../waf-cross-answers/cross-answers-x86_64.txt | 1 + .../samba/samba-4.4.5/10-use-only-libsystemd.patch | 30 ------- .../samba-4.4.5/internal_tevent_to_0.9.31.patch | 92 ---------------------- .../00-fix-typos-in-man-pages.patch | 0 ...void-timeout-for-nmbd-if-started-offline-.patch | 0 ...006-avoid-using-colon-in-the-checking-msg.patch | 0 .../16-do-not-check-xsltproc-manpages.patch | 0 ...-import-target-module-while-cross-compile.patch | 0 .../21-add-config-option-without-valgrind.patch | 0 .../{samba-4.4.5 => samba}/samba-4.2.7-pam.patch | 0 .../samba-4.3.9-remove-getpwent_r.patch | 0 .../{samba-4.4.5 => samba}/volatiles.03_samba | 0 .../samba/{samba_4.4.5.bb => samba_4.6.2.bb} | 10 +-- 22 files changed, 13 insertions(+), 129 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch delete mode 100644 meta-networking/recipes-connectivity/samba/samba-4.4.5/internal_tevent_to_0.9.31.patch rename meta-networking/recipes-connectivity/samba/{samba-4.4.5 => samba}/00-fix-typos-in-man-pages.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.5 => samba}/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.5 => samba}/0006-avoid-using-colon-in-the-checking-msg.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.5 => samba}/16-do-not-check-xsltproc-manpages.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.5 => samba}/20-do-not-import-target-module-while-cross-compile.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.5 => samba}/21-add-config-option-without-valgrind.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.5 => samba}/samba-4.2.7-pam.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.5 => samba}/samba-4.3.9-remove-getpwent_r.patch (100%) rename meta-networking/recipes-connectivity/samba/{samba-4.4.5 => samba}/volatiles.03_samba (100%) rename meta-networking/recipes-connectivity/samba/{samba_4.4.5.bb => samba_4.6.2.bb} (97%) -- 2.12.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt index bbf7f1620..1023f6aff 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt @@ -36,3 +36,4 @@ getcwd takes a NULL argument: OK Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/files/waf-cross-answers/cross-answers-arm.txt b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt index e926fcd3c..a5cd9981a 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-arm.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt @@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/files/waf-cross-answers/cross-answers-i586.txt b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt index e926fcd3c..a5cd9981a 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-i586.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt @@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/files/waf-cross-answers/cross-answers-i686.txt b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt index e926fcd3c..a5cd9981a 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-i686.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt @@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt index 18bfa0203..3e239e727 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-mips.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt @@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt index 8fa015ab9..82e694fda 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt @@ -36,3 +36,4 @@ getcwd takes a NULL argument: OK Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt b/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt index 18bfa0203..3e239e727 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt @@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt index fb93b56fc..27b9378a4 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt @@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt index fd585f0d5..7fd3092cb 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt @@ -37,3 +37,4 @@ getcwd takes a NULL argument: OK Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt b/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt index bbf7f1620..1023f6aff 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt @@ -36,3 +36,4 @@ getcwd takes a NULL argument: OK Checking for small off_t: NO Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK +Checking whether fcntl lock supports open file description locks: OK diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch b/meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch deleted file mode 100644 index 0ddc9410c..000000000 --- a/meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur samba-4.4.2/lib/util/debug.c samba-4.4.2/lib/util/debug.c ---- samba-4.4.2/lib/util/debug.c 2016-05-08 18:33:24.000000000 +0200 -+++ samba-4.4.2/lib/util/debug.c 2016-05-08 18:27:09.341481492 +0200 -@@ -102,7 +102,7 @@ - .fd = 2 /* stderr by default */ - }; - --#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL) -+#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD) - static int debug_level_to_priority(int level) - { - /* -@@ -179,7 +179,7 @@ - } - #endif /* WITH_SYSLOG */ - --#ifdef HAVE_LIBSYSTEMD_JOURNAL -+#ifdef HAVE_LIBSYSTEMD - #include - static void debug_systemd_log(int msg_level, - const char *msg, const char *msg_no_nl) -@@ -251,7 +251,7 @@ - }, - #endif - --#ifdef HAVE_LIBSYSTEMD_JOURNAL -+#ifdef HAVE_LIBSYSTEMD - { - .name = "systemd", - .log = debug_systemd_log, diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/internal_tevent_to_0.9.31.patch b/meta-networking/recipes-connectivity/samba/samba-4.4.5/internal_tevent_to_0.9.31.patch deleted file mode 100644 index bd4cd6407..000000000 --- a/meta-networking/recipes-connectivity/samba/samba-4.4.5/internal_tevent_to_0.9.31.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- samba-4.4.5.orig/lib/tevent/tevent_internal.h 2016-01-26 12:45:46.000000000 +0100 -+++ samba-4.4.5/lib/tevent/tevent_internal.h 2016-10-07 06:45:35.000000000 +0200 -@@ -228,6 +228,16 @@ - void *additional_data; - }; - -+struct tevent_threaded_context { -+ struct tevent_threaded_context *next, *prev; -+ -+#ifdef HAVE_PTHREAD -+ pthread_mutex_t event_ctx_mutex; -+#endif -+ struct tevent_context *event_ctx; -+ int wakeup_fd; -+}; -+ - struct tevent_debug_ops { - void (*debug)(void *context, enum tevent_debug_level level, - const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0); -@@ -241,24 +251,41 @@ - /* the specific events implementation */ - const struct tevent_ops *ops; - -+ /* -+ * The following three pointers are queried on every loop_once -+ * in the order in which they appear here. Not measured, but -+ * hopefully putting them at the top together with "ops" -+ * should make tevent a *bit* more cache-friendly than before. -+ */ -+ -+ /* list of signal events - used by common code */ -+ struct tevent_signal *signal_events; -+ -+ /* List of threaded job indicators */ -+ struct tevent_threaded_context *threaded_contexts; -+ -+ /* list of immediate events - used by common code */ -+ struct tevent_immediate *immediate_events; -+ - /* list of fd events - used by common code */ - struct tevent_fd *fd_events; - - /* list of timed events - used by common code */ - struct tevent_timer *timer_events; - -- /* list of immediate events - used by common code */ -- struct tevent_immediate *immediate_events; -- -- /* list of signal events - used by common code */ -- struct tevent_signal *signal_events; -+ /* List of scheduled immediates */ -+ pthread_mutex_t scheduled_mutex; -+ struct tevent_immediate *scheduled_immediates; - - /* this is private for the events_ops implementation */ - void *additional_data; - - /* pipe hack used with signal handlers */ -- struct tevent_fd *pipe_fde; -- int pipe_fds[2]; -+ struct tevent_fd *wakeup_fde; -+ int wakeup_fd; /* fd to write into */ -+#ifndef HAVE_EVENT_FD -+ int wakeup_read_fd; -+#endif - - /* debugging operations */ - struct tevent_debug_ops debug_ops; -@@ -282,6 +309,10 @@ - * tevent_common_add_timer_v2() - */ - struct tevent_timer *last_zero_timer; -+ -+#ifdef HAVE_PTHREAD -+ struct tevent_context *prev, *next; -+#endif - }; - - const struct tevent_ops *tevent_find_ops_byname(const char *name); -@@ -327,6 +358,12 @@ - const char *handler_name, - const char *location); - bool tevent_common_loop_immediate(struct tevent_context *ev); -+void tevent_common_threaded_activate_immediate(struct tevent_context *ev); -+ -+bool tevent_common_have_events(struct tevent_context *ev); -+int tevent_common_wakeup_init(struct tevent_context *ev); -+int tevent_common_wakeup_fd(int fd); -+int tevent_common_wakeup(struct tevent_context *ev); - - struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev, - TALLOC_CTX *mem_ctx, diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/00-fix-typos-in-man-pages.patch b/meta-networking/recipes-connectivity/samba/samba/00-fix-typos-in-man-pages.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.5/00-fix-typos-in-man-pages.patch rename to meta-networking/recipes-connectivity/samba/samba/00-fix-typos-in-man-pages.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch b/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.5/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch rename to meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/0006-avoid-using-colon-in-the-checking-msg.patch b/meta-networking/recipes-connectivity/samba/samba/0006-avoid-using-colon-in-the-checking-msg.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.5/0006-avoid-using-colon-in-the-checking-msg.patch rename to meta-networking/recipes-connectivity/samba/samba/0006-avoid-using-colon-in-the-checking-msg.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/16-do-not-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.5/16-do-not-check-xsltproc-manpages.patch rename to meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/20-do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.5/20-do-not-import-target-module-while-cross-compile.patch rename to meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/21-add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.5/21-add-config-option-without-valgrind.patch rename to meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/samba-4.2.7-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.5/samba-4.2.7-pam.patch rename to meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/samba-4.3.9-remove-getpwent_r.patch b/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.5/samba-4.3.9-remove-getpwent_r.patch rename to meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/volatiles.03_samba b/meta-networking/recipes-connectivity/samba/samba/volatiles.03_samba similarity index 100% rename from meta-networking/recipes-connectivity/samba/samba-4.4.5/volatiles.03_samba rename to meta-networking/recipes-connectivity/samba/samba/volatiles.03_samba diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb similarity index 97% rename from meta-networking/recipes-connectivity/samba/samba_4.4.5.bb rename to meta-networking/recipes-connectivity/samba/samba_4.6.2.bb index f2d52a2c8..38876c2c3 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb @@ -13,22 +13,19 @@ ${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://00-fix-typos-in-man-pages.patch \ - file://10-use-only-libsystemd.patch \ file://16-do-not-check-xsltproc-manpages.patch \ file://20-do-not-import-target-module-while-cross-compile.patch \ file://21-add-config-option-without-valgrind.patch \ file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \ file://0006-avoid-using-colon-in-the-checking-msg.patch \ - file://internal_tevent_to_0.9.31.patch \ file://volatiles.03_samba \ " SRC_URI_append_libc-musl = " \ file://samba-4.2.7-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ " - -SRC_URI[md5sum] = "6950c5e9f7bdeb8a610c2ca957a15be4" -SRC_URI[sha256sum] = "b876ef2e63f66265490e80a122e66ef2d7616112b839df68f56ac2e1ce17a7bd" +SRC_URI[md5sum] = "461def8190ffc651fd8458b24ca2a622" +SRC_URI[sha256sum] = "927afcc16e444718985e3952de92d34e7b776b9ca0238179d866da18a6441c35" inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl @@ -201,9 +198,8 @@ FILES_${PN}-base = "${sbindir}/nmbd \ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ ${bindir}/ctdb_run_cluster_tests \ ${sysconfdir}/ctdb/nodes \ - ${libdir}/ctdb-tests \ ${datadir}/ctdb-tests \ - /run/ctdb \ + ${datadir}/ctdb/tests \ " FILES_${BPN}-common = "${sysconfdir}/default \