From patchwork Mon Feb 4 18:10:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 157446 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4212182jaa; Mon, 4 Feb 2019 10:11:14 -0800 (PST) X-Google-Smtp-Source: AHgI3IZao8j9lMaMMGBv3vNDBiqQ6IfC36DYZSxZmproPNloRa9WfqHArDe+s0qMZfAHNpOskcih X-Received: by 2002:a63:e74b:: with SMTP id j11mr552987pgk.397.1549303874068; Mon, 04 Feb 2019 10:11:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549303874; cv=none; d=google.com; s=arc-20160816; b=yN6/J20SeXKtUf20M5/v7pB/zlEPhA30oAkzUrvGZkR4jZn8N4v7aRs2B1DB+e9sEh fLTbkgcpjSVFtEilMHGqIH6igDwQNpPA4qYu03jrf+7bp/MworfBMoG0cwqC5Ps1KjLl n/7ZfJ6k6euQMdVAxtaMts3GJt8qUJKay7y3JB4GMmNSCIf4tQJUQ/2+pdgUlqY38cT7 WXhtuJ6KWUyC1t7e3BfyHxC23Pj6usLnuKn24lW0CQYd4Fi6XzBoGKNY9JrMom1zX9j+ zffxoAL/3ToQUlCxNxL0h19BsSQis3vZPn0Bqh+g8Q7m3My9DOwXqen3KpJNDq7kbFTN RxpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=/bgnv+2MDxwCVLe1bKmyY9YDkFzgUxpRlERJQbvPk/w=; b=0ot98S0aBBo5qaz2F2LbdhKvUhI5FCkQ1cg+c+bSKOVv9qoBb4ZFWG260EFWFloMCY ZLRSdMn0abLyJaGD+qGekiqyVOwmYmu79Z/Vep3hv4KvKjl/gR2SoKTUgcIJZmLaBWMS Foq0puC3levAwrWqKSb39y3YM188wWYrOvkSfpz/nonjxxdeHzBJEm4q7tnW/jvckJVf W9MMP4I7P4HUsIUfHfX/5kutAVzAQ62jnKqGLdz3b7wVpkJkUGDBImSO8KGCbXOmWs69 D1lLb5etvLmf2fxQ0Yopwsuh5j4R1ybcbPkEC4NKIjMH526/ta5hcZxaEsCCMiYR6yKK keUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gU2+uC3Z; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b7si542599plb.234.2019.02.04.10.11.13; Mon, 04 Feb 2019 10:11:14 -0800 (PST) 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 header.s=20161025 header.b=gU2+uC3Z; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1EC8A7C1E1; Mon, 4 Feb 2019 18:11:10 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mail.openembedded.org (Postfix) with ESMTP id 4F22C7BF9E for ; Mon, 4 Feb 2019 18:11:09 +0000 (UTC) Received: by mail-pg1-f172.google.com with SMTP id z11so277686pgu.0 for ; Mon, 04 Feb 2019 10:11:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1Ugl4dfk07YOLVpbriaohauUa5j3LMzTZ4pfATkikCQ=; b=gU2+uC3ZO8uU5IZKV4g3CmsxR54waMOC2WJ8rskwnU8DQGZMk2mjdsvthPOqAKeBQO MvaGl76Cp1+eui88jL6Vt2/7n8Q+wxsbVom4C0gbF7cy/D+eYJ/VXGgrtjG8EAlTByxp 121QIktU/uEdC9UXjR+CzKsOX6YH+fKCzLi3MXNRHD2GIWTuuwPq5e9CMKZqt/9hb5QD nnqCQ1c7RZcDEQFtPy3UM3rga0CM/aCX2NltZJ+vdozGeUF1R7vn1utWsQH5a2ZvoWWG Xsip82WMdYTNtRkbG79CUZl+NVblyePQ1JiwQzkiRRtS++d2uPtDc9XWFh4t61ftJgXc izUA== 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:mime-version :content-transfer-encoding; bh=1Ugl4dfk07YOLVpbriaohauUa5j3LMzTZ4pfATkikCQ=; b=jCRZZNITlLOJUnJlXTYxe/TIaMMPT7yuY3Zk2T9cfjqX/e5fSEpLbivc1YdpVfjx4x fD9B63oOcMFlKYZhLjO9BvTetfUz8siJX5+FtWB19MiNmABN447W6hbzPKiwWbyQrZyr FsPNu5toqOYfzTpsi+FOt5+y2MyQFCLT4V5n3nokYQ0jr53M770P1+trIat5adFZhIvD vKaL1mdxIX5SCAS+PGTilWzeMovUsrNnW0aVvJ5PkdWaCVgXUtHGOkom7XoXNnRh2z/S wIhRbTTwDrqHe3ytUdweahaqWEUAvM6p06pdFzkWzqXfaZm9krefzZDOTTizNzprf00I gjtw== X-Gm-Message-State: AHQUAuYl9/YfQWbsLLKJL2LW8+U92sxyUW9/AKIvv/9EHJ7x4YzsPNdc h2gi6H8z3HCuzmhQsLZbb7uIyyOE X-Received: by 2002:a62:16d6:: with SMTP id 205mr637901pfw.256.1549303869735; Mon, 04 Feb 2019 10:11:09 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::1609]) by smtp.gmail.com with ESMTPSA id b2sm991515pfm.3.2019.02.04.10.11.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 10:11:09 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 4 Feb 2019 10:10:59 -0800 Message-Id: <20190204181101.22055-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 1/3] opencv: Upgrade to 3.4.5 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: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Drop adding git revs to PV, its not needed since we are on release tag Drop upstreamed patches Signed-off-by: Khem Raj --- ...001-Add-missing-multi-line-separator.patch | 36 ------------------- ...Check-for-clang-before-using-isystem.patch | 32 ----------------- .../{opencv_3.4.3.bb => opencv_3.4.5.bb} | 22 ++++++------ 3 files changed, 11 insertions(+), 79 deletions(-) delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Check-for-clang-before-using-isystem.patch rename meta-oe/recipes-support/opencv/{opencv_3.4.3.bb => opencv_3.4.5.bb} (94%) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch b/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch deleted file mode 100644 index 513597b8c2..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 60857229aab13ccc426572a43ab891409bb76ea4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 9 Sep 2018 22:52:55 -0700 -Subject: [PATCH] Add missing multi-line separator - -Otherwise this fails to build ( found on mips ) - -Fixes -contrib/modules/surface_matching/src/hash_murmur86.hpp:97:15: error: -expected constructor, destructor, or type conversion before '(' token - && defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && -__GNUC_MINOR__>=3)) - ^ - -Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/1764] -Signed-off-by: Khem Raj ---- - modules/surface_matching/src/hash_murmur86.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/surface_matching/src/hash_murmur86.hpp b/modules/surface_matching/src/hash_murmur86.hpp -index 1edf6bf4..0477d37e 100644 ---- a/modules/surface_matching/src/hash_murmur86.hpp -+++ b/modules/surface_matching/src/hash_murmur86.hpp -@@ -93,7 +93,7 @@ void hashMurmurx86 ( const void * key, const int len, const uint seed, void * ou - /* Now find best way we can to READ_UINT32 */ - #ifndef WORDS_BIGENDIAN - # define READ_UINT32(ptr) (*((uint32_t*)(ptr))) --#elif defined(WORDS_BIGENDIAN) -+#elif defined(WORDS_BIGENDIAN) \ - && defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && __GNUC_MINOR__>=3)) - # define READ_UINT32(ptr) (__builtin_bswap32(*((uint32_t*)(ptr)))) - #endif --- -2.18.0 - diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Check-for-clang-before-using-isystem.patch b/meta-oe/recipes-support/opencv/opencv/0001-Check-for-clang-before-using-isystem.patch deleted file mode 100644 index 319071a311..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-Check-for-clang-before-using-isystem.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fa76d8646bb2b9b514728eeef41afed7c43a36f2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 11 Sep 2018 18:18:33 -0700 -Subject: [PATCH] Check for clang before using -isystem - -When cross compiling with clang, the internal C++ headers are not found -when adding sysroot to -isystem, that is redundant anyway because it -will look for headers insider --sysroot path with same quality as it -would do with -isystem otherwise - -Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/12504] -Signed-off-by: Khem Raj ---- - cmake/OpenCVUtils.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake -index fae91c165f..60c20192dc 100644 ---- a/cmake/OpenCVUtils.cmake -+++ b/cmake/OpenCVUtils.cmake -@@ -259,7 +259,7 @@ function(ocv_include_directories) - ocv_is_opencv_directory(__is_opencv_dir "${dir}") - if(__is_opencv_dir) - list(APPEND __add_before "${dir}") -- elseif(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND -+ elseif(((CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0") OR CV_CLANG) AND - dir MATCHES "/usr/include$") - # workaround for GCC 6.x bug - else() --- -2.18.0 - diff --git a/meta-oe/recipes-support/opencv/opencv_3.4.3.bb b/meta-oe/recipes-support/opencv/opencv_3.4.5.bb similarity index 94% rename from meta-oe/recipes-support/opencv/opencv_3.4.3.bb rename to meta-oe/recipes-support/opencv/opencv_3.4.5.bb index 2b25e39dc9..d299c599b8 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.4.3.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.4.5.bb @@ -10,9 +10,9 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "b38c50b3d0c31e82294315ec44b54b7ef559ef12" -SRCREV_contrib = "1f6d6f06266e1ef336437ae5404bee1c65d42cda" -SRCREV_ipp = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a" +SRCREV_opencv = "8f1356c3c5b16721349582db461a2051653059e8" +SRCREV_contrib = "7292df62624ded8af8035231435dfd17c93e1a80" +SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59" @@ -22,17 +22,17 @@ def ipp_filename(d): import re arch = d.getVar('TARGET_ARCH') if re.match("i.86$", arch): - return "ippicv_2017u3_lnx_ia32_general_20180518.tgz" + return "ippicv_2019_lnx_ia32_general_20180723.tgz" else: - return "ippicv_2017u3_lnx_intel64_general_20180518.tgz" + return "ippicv_2019_lnx_intel64_general_20180723.tgz" def ipp_md5sum(d): import re arch = d.getVar('TARGET_ARCH') if re.match("i.86$", arch): - return "ea72de74dae3c604eb6348395366e78e" + return "4f38432c30bfd6423164b7a24bbc98a0" else: - return "b7cc351267db2d34b9efa1cd22ff0572" + return "c0bd78adb4156bbf552c1dfe90599607" IPP_FILENAME = "${@ipp_filename(d)}" IPP_MD5 = "${@ipp_md5sum(d)}" @@ -40,21 +40,19 @@ IPP_MD5 = "${@ipp_md5sum(d)}" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180518;destsuffix=ipp;name=ipp \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz;destsuffix=git/3rdparty/tinydnn/tiny-dnn-1.0.0a3;name=tinydnn;unpack=false \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://uselocalxfeatures.patch;patchdir=../contrib/ \ - file://0001-Add-missing-multi-line-separator.patch;patchdir=../contrib/ \ file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ file://0003-To-fix-errors-as-following.patch \ file://fixpkgconfig.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ - file://0001-Check-for-clang-before-using-isystem.patch \ " -PV = "3.4.3+git${SRCPV}" +PV = "3.4.5" S = "${WORKDIR}/git" @@ -180,6 +178,8 @@ SUMMARY_python3-opencv = "Python bindings to opencv" FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" RDEPENDS_python3-opencv = "python3-core python3-numpy" +RDEPENDS_opencv-apps = "bash" + do_install_append() { cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h From patchwork Mon Feb 4 18:11:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 157447 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4212721jaa; Mon, 4 Feb 2019 10:11:46 -0800 (PST) X-Google-Smtp-Source: AHgI3IY9TN7X+R3nu1q84+nurtV7PZVa9Zi2tNBj03nryGew84FCwk3e044obC3HGS1dz5GgPCX+ X-Received: by 2002:a17:902:3143:: with SMTP id w61mr650309plb.253.1549303906452; Mon, 04 Feb 2019 10:11:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549303906; cv=none; d=google.com; s=arc-20160816; b=mkaP8L8/+zR89f31kV1ImQUDa5oXPauxtkn5UEFTtwfgYrzECp4O06j1957bT99CSl dVnQNu0vfdoU07ttFqBvCcNnYv56Tj3G1eNGteFnbBOgTJeGE2HgulkKlBVtbe1hrTsl ip1I3uVGzoun/jkrBSwn2xjqpLIX6z5te7xX/q7E7xj469MhUH4Z6WzhEHJ23JukZSa0 gP5H8I+Isd+ap4FpHT2/Zd96db/fu8kpUximg8jroMYHYikAo+fCDRAnk9MpZVhNClGa BYZVPa1A6j1Fup/SxeyjjYgByRouPoUqxFYuyMb1FY/R0GGR2qYWkzFCMOIplBaAuII0 XpUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=2rnn9uv1yhOgNrnrhIHZA60gzRkOndwVDrasrP+Va3Q=; b=g58/KBUzovI/QNoO9KyexSNmIuzsWam4jJW8g5lYObsGiPM/OqQ/gphi8JBXzq+//c FTVjrvplJrgTEyOa0X+E5y2CWZrmkgPLBckla5EEO7F6G7B9DuXVtPhxllph9VB4ARxC 83PmsPG/E10+qCQ1SsiiDYcSv1h2I8JqjD+PsfYsBW+i2aakXhwoMlJKbxfSpWogQILX 9AQWI0TMCI8eWVK69hELEOjKWFjDcMIIY5TQqw5QVIgVMxkerveizvxqXyifuCqYAOtB PC3v3ik9Kq18VqFoXztq/ojkopWsjNO6CwNMzNr+g7SbixFInY6ijLCWn+6u1cxousOD 8oxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=i4ap63SE; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w11si569577pgp.161.2019.02.04.10.11.45; Mon, 04 Feb 2019 10:11:45 -0800 (PST) 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 header.s=20161025 header.b=i4ap63SE; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2E6A27C215; Mon, 4 Feb 2019 18:11:42 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mail.openembedded.org (Postfix) with ESMTP id D79AC7C1E1 for ; Mon, 4 Feb 2019 18:11:09 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id z9so290987pfi.2 for ; Mon, 04 Feb 2019 10:11:11 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=+1rLQo3LX/W4EOLUeR6nhRso38p4N8lyMz2xbR4gYRE=; b=i4ap63SEGPQwO+yutgxQeFxW8meKKZRxfUmcRqXrguFdpb/sz0ap9YvE8U0irBqZqT C44XsTjs4+HiIbRRzMtH4PVBdTOP5b6HMJq5YYB4pTiC4DOC4xKcUvi99yemE5pCiibx Ed6GQKtPHMvyrvmkgQJQKslKkFxtYRA824vrvTYP1oNS4mEQ0bHTEr+/IRNUZEcqd+c3 RHzR7ma3kPhD7kd/cl9HgS+F5kWOlMtgrXwwTK7y4+/aZ0hnwiYde1G/5K1Qyd3Ir6uM n/BvI5h/oaS+EA8OpkeoWtc9OwkjSgWvSavBbR700M1JpGfeq548Sd2CJx7E0RIihY/V e+kw== 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:mime-version:content-transfer-encoding; bh=+1rLQo3LX/W4EOLUeR6nhRso38p4N8lyMz2xbR4gYRE=; b=kwKv8XBENsExk+ju55VNeL9MWqPCSm9WeBIxEeL0BGLqO/65Oyhj/hQzOe9l9n6IGW N5tAQZ9Oql6waV8ywOxwUlrM8/T6VxfKLwxsQ6yXwnmWU9Sdf5Q6/oXLxVUQPNc7FP+5 VsmHWXX+cCv/uGWmGd4AIpSf6EOnh9Oq745sFV+azWF1HsZqnVHDRkHAtF+0FAJCZS11 EUZB+GvakZ0Y61pf3+FNvNNAt1B8qD45rVZq8gE98tTzfF9y0cG85YaaZu0Ht0rLUi9h A4Ztm+J6CahiGsMlVwBumAQn64GbKGAlGsDSyDUk/hoQM9t6mhrPvniKoRhOB3sffpsA 4jZA== X-Gm-Message-State: AHQUAubIOkBJ54p8PotLDcGvEJqYJwh+x7d8XKh1RErUz33+9gGcSgmI uXk/Y2ZYPPR+OB2L0eq/aJupQYQl X-Received: by 2002:a63:4d:: with SMTP id 74mr617056pga.248.1549303870496; Mon, 04 Feb 2019 10:11:10 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::1609]) by smtp.gmail.com with ESMTPSA id b2sm991515pfm.3.2019.02.04.10.11.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 10:11:10 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 4 Feb 2019 10:11:00 -0800 Message-Id: <20190204181101.22055-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204181101.22055-1-raj.khem@gmail.com> References: <20190204181101.22055-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 2/3] breakpad: Drop SRCPV from PV 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: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org This causes errors like OSError: [Errno 36] File name too long: Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/breakpad/breakpad_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index 528c237564..5f9a72e0ac 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -13,9 +13,9 @@ inherit autotools BBCLASSEXTEND = "native" -PE = "1" +PE = "2" -PV = "1.0+git${SRCPV}" +PV = "1.0" SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp" From patchwork Mon Feb 4 18:11:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 157448 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4212840jaa; Mon, 4 Feb 2019 10:11:53 -0800 (PST) X-Google-Smtp-Source: AHgI3IYhKNn6/qsuSpYBbYPuuiQzxzgA6hAPnoay7Zvf9W6F2mPVTgE/9inp6nZaWTkaC3K8bB5g X-Received: by 2002:a17:902:2c03:: with SMTP id m3mr676158plb.125.1549303913521; Mon, 04 Feb 2019 10:11:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549303913; cv=none; d=google.com; s=arc-20160816; b=eRvgpYdvQhsYesCIw0GOefipQWKGdhEkLYfNiwjcuinAnwUqdzAuD4ebysyx65KtU2 YVFEt7kb2R7eg33/7LqTI1Nm3oUShFveyUO+0ieIkI4p6mTE2XJRbSoXCDmq+129W70Q 0aCmarUKwDNQ46ryYUnNLH635K2jJGj0m/FPztgPjJ8MYmASh+DRvE3C4tUJFgXv8H1X P4KSQ5TRK//aNjBOrBqlHuR1zeLWcYovAx4lNhtP8wTC6REFjACw6yB1t7rTQgSfp+vf 2wfkjki/Le9V3eeIvXwKccTBaLnQET/qNtlmMzIT1Bhx/r6SV+73bMe5vsSrQAOFG/w2 ARjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=WjF7qkNCU0qc6e8erjHKO+X9H7tAqaG8V2/AV+9zvfY=; b=qirQZHFr3UOtb7HTA1a8OR/AXedMCKkaSDSzWcWvIiHj6Mcf+qc51/J2cGr2g3SC0f NR8aTSBmLG4YBPHwNWczhsxTTr1aqJV6DcRND9QrPz9BDvrwv5W7/RoVl2kHpuPhSaDW 2RcKXOJHX2DaAsw2oQ6dt2O/BQ6iJopmFZlNg91++PLeuePu/kxbm9fiEXfgDbpUALNU AsyU3BdypEQH9Qls4Dkvw9JIsVHAb1nU6VtE+QanGTbwST3qxW6fy5x1zmv9rg9HMbye xsD7vfKQrq5mdePTNUo80Z6GmEbX7x2pYPzhLg0Mz1Ma/bqNWPAsWoOuvaHBwxl8mWiX tLmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cBd3TiBC; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c15si593480pgg.446.2019.02.04.10.11.53; Mon, 04 Feb 2019 10:11:53 -0800 (PST) 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 header.s=20161025 header.b=cBd3TiBC; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D88F17C210; Mon, 4 Feb 2019 18:11:46 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mail.openembedded.org (Postfix) with ESMTP id B645B7C200 for ; Mon, 4 Feb 2019 18:11:11 +0000 (UTC) Received: by mail-pg1-f178.google.com with SMTP id y1so251648pgk.11 for ; Mon, 04 Feb 2019 10:11:13 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=QpTT7GelLPhNg71BdWTVHHIUbDypIWEEmfD2HUKiwgo=; b=cBd3TiBCrQi5C7lH4uA9LPIBxvGA32f8BP6wNOPHLwgzQY1cCz5tktYBHFlDccHirO frujRYuP+m/+fKlDPz4kGpthuRAAMp88b6oJy37/5GIVhEOgRRmTaFa0wyQgrvjIb7t8 ThK9jNnbVEy1YJ3eyFWcVDI5GDZr655u8Uwb5xdenelWzKwvQMKJyYJA2PywSm9Cw1Ph qMvKnToyHOE3OGitDJjYfotRw+3tc6iL0zbi3i1vvVn/dNFUiG8dC5NxkfyNqTyi28c9 /E4sYN+40/0mwVlsEV9BCGSvCz/tXAVITxP90E2b8bOlPZf4FpjCbxxwLsCAa2TM4hn0 I8TQ== 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:mime-version:content-transfer-encoding; bh=QpTT7GelLPhNg71BdWTVHHIUbDypIWEEmfD2HUKiwgo=; b=KVfh4XTSiD5gxa6cZem3pB2I7xwuzsP03MKRSG/nTS+CUM/jt3ik2G7caY0l6Z8mw4 0GYbopbK8Ub1KH2j/uNy+K9qGScZBwEVIneOxqOlnYq0TyGHg70F64Nzh6oqJN6nAkdU VtGmVlZJOFlVcJoxRXmj2hHIgUFPyucFs3IwSuZFlLhcj9Lp8rtzvx6BeXxYmGAlBvYe 3RyqN65HH9j9iGhO97S5SHP4W5e3DyAtnA8c/Kg1VS2NkxcpTwetwmQHQn9gWL9ybwEA 3dVJJQXcr+D/anSF/H6TbWD8r2vEnI8DaiiPhc1xkZAAzwCnOEby91H8itgOxjIyk8Ji Nm9A== X-Gm-Message-State: AHQUAubzBcHOOWHt9J5wAXSjwSzkvp4UhQ6fmER4rmoonotUK0xoMtaR qaoIglOMNvhb/vCWFN5PyCK+9LJb X-Received: by 2002:a63:f658:: with SMTP id u24mr572930pgj.267.1549303872388; Mon, 04 Feb 2019 10:11:12 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::1609]) by smtp.gmail.com with ESMTPSA id b2sm991515pfm.3.2019.02.04.10.11.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 10:11:10 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 4 Feb 2019 10:11:01 -0800 Message-Id: <20190204181101.22055-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204181101.22055-1-raj.khem@gmail.com> References: <20190204181101.22055-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 3/3] ltrace: Fix build with clang 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: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...hook-Do-not-append-int-to-std-string.patch | 34 +++++++++++++++++++ meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch -- 2.20.1 -- _______________________________________________ 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-hook-Do-not-append-int-to-std-string.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch new file mode 100644 index 0000000000..69e078741d --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch @@ -0,0 +1,34 @@ +From 8321f8b3befbaa355cfed988fdd8494133989676 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 4 Feb 2019 00:38:16 -0800 +Subject: [PATCH] hook: Do not append int to std::string + +Clang find this error + +| ../../../git/sysdeps/linux-gnu/hooks.c:205:51: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus +-int] +| || sprintf(syspath, "%s/%s", sysconfdir, FN + 1) < 0) +| ~~~^~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + sysdeps/linux-gnu/hooks.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/linux-gnu/hooks.c b/sysdeps/linux-gnu/hooks.c +index 327fdf3..4750d85 100644 +--- a/sysdeps/linux-gnu/hooks.c ++++ b/sysdeps/linux-gnu/hooks.c +@@ -202,7 +202,7 @@ os_get_ltrace_conf_filenames(struct vect *retp) + /* No +1, we skip the initial period. */ + syspath = malloc(strlen(sysconfdir) + sizeof FN); + if (syspath == NULL +- || sprintf(syspath, "%s/%s", sysconfdir, FN + 1) < 0) ++ || sprintf(syspath, "%s/%s", sysconfdir, FN) < 0) + goto fail; + } + +-- +2.20.1 + diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 83043cd212..3dc269c80e 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -26,6 +26,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \ file://0001-mips-plt.c-Delete-include-error.h.patch \ file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ + file://0001-hook-Do-not-append-int-to-std-string.patch \ " S = "${WORKDIR}/git"