From patchwork Sat Jul 15 01:55:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 107842 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1666070qge; Fri, 14 Jul 2017 18:56:06 -0700 (PDT) X-Received: by 10.98.63.83 with SMTP id m80mr471086pfa.193.1500083766821; Fri, 14 Jul 2017 18:56:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500083766; cv=none; d=google.com; s=arc-20160816; b=EsCqsy2UBFY2zabDgDz1OHDTTriW3v/jEwrXA+FWWMHU4ZuK4E0YY4Eq+0V5IpnuAN UX72XeDLuW78HaXguvDo0uASunnzh6yxS4zbC5vk//dPJkqz180rdbUBHj2MLI82qKXb HlBycnitTm/9Cghou2T4FjN9o0RnZio160KUZASAxQwNhSxG1jxW0e4vTqRP30Ld96B1 F7G0Vgc5EcQX1dG0KIIb7gddqnIIlpz2BDiwOIOGrmIBILUpGFJroMBJEEzlCHwjSF4q gaZSNBBnCLr7R53mBb/iQ6k8UTcL3a/qix9OD399Q4POPDgu5ew7I/tZA6sRABJD7Ygp OiKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=OdVGS8j1ij76vxrifKy2wBHbSXzsOFKRXcmAFLA/IqE=; b=MyKFfRUsEwrH/Qu379dVMGke0tMEHtRQ2o9Th7535tLNSkb9A8DbNWHtR/uMf23h9h 8FLgoRUBqcctu20UZ2o0dPLVV2aVGHKQEpkzmkHGQCsA9N7cO7RdhLvAIfEvqN2kcO/J zGtdpSqz67ACGQiDRHIwUdVGGKgjY7/IikC5PstnWzQ/Lm7FN/AeWdF9BRQFMThwsfPT JhLifvoCJ8sJHlAblKUGNE0TPQYKm+c4EZ9PPBlO9FyZ0kdJpJH/jBmfYuSbrb1QGTWM RJtent+MjwgziK16Ci1z6U3DKoEoMEc+tH89hthlXpZUJGp4g3DGFmmV2fpPNJDYyNqy p9dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=g2nZ0Erp; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w12si8011675pld.268.2017.07.14.18.56.06; Fri, 14 Jul 2017 18:56:06 -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 header.b=g2nZ0Erp; 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 7FFC978235; Sat, 15 Jul 2017 01:55:51 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id 9B42A78245 for ; Sat, 15 Jul 2017 01:55:47 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id d193so12308175pgc.2 for ; Fri, 14 Jul 2017 18:55:49 -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=9e3QtWEqeKPgelXmsKac2md+Ikpdsh1pYFkkQGgnfnY=; b=g2nZ0ErpjxfNCrF6AhOjCzdZBrMqFQY8C8od1Rp0O3qrWiq2U2fqQg1qWYgpmf9xN9 /fS7JM8qjAMg29YhQmLJ/Bc/aYNP+XIStWFIUPQNs4z/2XMoNJ2aDwBt5HKdg9P6WNCp EY2eOAPI9tnbuCAMUlabtU9u/uBb2qGwgdtVFgZsoBml5SzhQiw+5wckkACVvRbyCO4x 34M0pewB/nhXLJH3qJDTCdlbb5njNjbuBj9BrENbirFcGi1Gt8SAaQHE86RNvJurvg1n K2JDJxKfP7PxSr5MapgWgG0ex874zE8RC7N/gLMHtq+F9/M0Mqu6ZoIyxrb6ZRj984OF IXXw== 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=9e3QtWEqeKPgelXmsKac2md+Ikpdsh1pYFkkQGgnfnY=; b=cZCh7ci/78QCagPlQO3xphMKm/bHmza81FFf/aZKIE/t2TlH802CIq3IAOp+68+gVU RAZuHeGfSU4sq1q025rqXANB2T4+XHFXqCYZZCLwcrVWlfhfbv71hAxZvc+ksGwv6mEI IquUI5IIx9EVq5nFmnYmfJ+5XsQL4zDRP0L5BFXscYPbfTjuJ5BQDHJS4wiPWYNbgQLI Z+jtBKxnaO69n/ngVRMu6pjFXw33ByQfYFrkgUHMX8YPXx98kL77ElloKYD9RdhHlP5I RMQWjZRmKoiwDxxYk56LTgisQhUS57681xEn4Ce6KoEXmHoQTY4ehU5V3dLAZsua8RxB TzwA== X-Gm-Message-State: AIVw113AQGVEEFCGuLCimxTxAIIdI0Jpmx9/YfP4zoP9HMAR33nHAVmc 2GCtnVHNpNTSJ/oO X-Received: by 10.99.44.206 with SMTP id s197mr17754122pgs.116.1500083747942; Fri, 14 Jul 2017 18:55:47 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id l4sm18189589pgr.21.2017.07.14.18.55.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 18:55:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 14 Jul 2017 18:55:34 -0700 Message-Id: <20170715015539.31584-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [oe] [meta-oe][PATCH 1/6] iperf3: Fix missing stdint.h and do not link with -pg 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 Helps compile with musl Signed-off-by: Khem Raj --- ...de-stdint.h-for-various-std-c99-int-types.patch | 39 ++++++++++++++++++++++ .../0002-Remove-pg-from-profile_CFLAGS.patch | 31 +++++++++++++++++ meta-oe/recipes-benchmark/iperf3/iperf3_git.bb | 11 +++--- 3 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch create mode 100644 meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch new file mode 100644 index 000000000..ae3620800 --- /dev/null +++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch @@ -0,0 +1,39 @@ +From be653711fb92d2430b3ecc546b4e3ad927d19ec5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Jul 2017 12:59:42 -0700 +Subject: [PATCH 1/2] include stdint.h for various std c99 int types + +Signed-off-by: Khem Raj +--- + src/cjson.h | 2 ++ + src/timer.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/src/cjson.h b/src/cjson.h +index fb8cd3b..69cd272 100644 +--- a/src/cjson.h ++++ b/src/cjson.h +@@ -23,6 +23,8 @@ + #ifndef cJSON__h + #define cJSON__h + ++#include ++ + #ifdef __cplusplus + extern "C" + { +diff --git a/src/timer.h b/src/timer.h +index 0f9c5eb..0b195be 100644 +--- a/src/timer.h ++++ b/src/timer.h +@@ -31,6 +31,7 @@ + #define __TIMER_H + + #include ++#include + + /* TimerClientData is an opaque value that tags along with a timer. The + ** client can use it for whatever, and it gets passed to the callback when +-- +2.13.3 + diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch new file mode 100644 index 000000000..06eb41ac0 --- /dev/null +++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch @@ -0,0 +1,31 @@ +From 6db0e28f906bc3784019dfb5bb011237a8034fda Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Jul 2017 13:00:16 -0700 +Subject: [PATCH 2/2] Remove -pg from profile_CFLAGS + +musl fails to link with missing gcrt1.o + +Signed-off-by: Khem Raj +--- + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 23b0c72..6268145 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -49,9 +49,9 @@ iperf3_LDFLAGS = -g + iperf3_profile_SOURCES = main.c \ + $(libiperf_la_SOURCES) + +-iperf3_profile_CFLAGS = -pg -g ++iperf3_profile_CFLAGS = -g + iperf3_profile_LDADD = libiperf.la +-iperf3_profile_LDFLAGS = -pg -g ++iperf3_profile_LDFLAGS = -g + + # Specify the sources and various flags for the test cases + t_timer_SOURCES = t_timer.c +-- +2.13.3 + diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb index d19aa1ec4..4a01896ca 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb @@ -11,10 +11,11 @@ AUTHOR = "ESNET , Lawrence Berkeley National Laboratory X-Patchwork-Id: 107843 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1667337qge; Fri, 14 Jul 2017 18:57:41 -0700 (PDT) X-Received: by 10.98.215.23 with SMTP id b23mr8009721pfh.139.1500083861685; Fri, 14 Jul 2017 18:57:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500083861; cv=none; d=google.com; s=arc-20160816; b=HN8cpDOBNywdzogbQEvKNT5cE3XTot9A4uhV3QMlvvwdfn/k+hFM3IwdTxNxkZAV1p COYC8dH7igOU8HOuqkLIwRRH8AoB7FR00rXXFedh9uEcpp4sC3EGthjIprzwNu3gAhqu v2ULoDR+Hw4A+uRGfbKIESoBJlZaKzWZ3USL3RReElaDTf4zqygFG2LAeDR/F6+537DB FgJfGYTCKLs3v2DOfMzW/ELCk0Ts+Ftdt/AOmeHyg7YsNZ0wVj0e7tM7O6PZcy3mifr/ 1EjtQIbvEebTThliub0qxCbVBtfmhkjBkf3akH/L0haNW6HFpT9CV7zUTglsF+SU90AG sksA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=HnKPK/wnU4jeJSVuO9quz/oUQgTfXOtigkfjowFKzXY=; b=xcNcsDlow5cgmheSUIuYTieVmTql0Smjoxb69Nh8/RG32NyF0dZGy4TiSv5wbLv48v kPQ6k47t4f8IX+QvYO5aHXZ4ZFynCREVl9NklUvLn1eEct/qNt8j7wjxVHgBL544TvE6 JvSVUl5tzDWFZxDdgFf1mMtdwVPH6kye8UaYNRBlCdOGA1y9jsQykxiMfv441+QuVRPM fsewdtKZ0mV66BoWg1VAeC6uSVTpFNrPSzvoO4bQIEYA7+WT52WxFcPU4dgNxXG5bA2d AXQvSLf7hw/mM4rAYqoxhlTBWmIW4MJhUYgCOM0mplcIPXJHXwU7hpVu7FM9Rr1O8SP6 JGCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=kcLxeRqS; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y185si638716pgb.328.2017.07.14.18.57.41; Fri, 14 Jul 2017 18:57: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 header.b=kcLxeRqS; 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 523AC782B5; Sat, 15 Jul 2017 01:57:38 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by mail.openembedded.org (Postfix) with ESMTP id 8CA0E78245 for ; Sat, 15 Jul 2017 01:55:48 +0000 (UTC) Received: by mail-pf0-f171.google.com with SMTP id c73so52873399pfk.2 for ; Fri, 14 Jul 2017 18:55:49 -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=dtxirfz5/7QK7pUoRxuyggx5BA2u9W42nGdGz/gLfGQ=; b=kcLxeRqShuQEdRfmuWxJC/KxxtfWlIGHbAyljKwzkpUX9Ala5XuXuzcDh9pwM/iIrv xuSdaoyvBQUo4oVNyALFT8yb+MiUzCBwBpwN8P3RcIo2ebKmGZMbYZ9WXxfDnZLibnqB w0P7AOaXWX3xg2E2sOmveoGvER+NHR6BzJFuLxe0iW6KIF99kCX99893z1ra4CfKaPp6 atPGjhl6/LuHCbmfEqJAU/wFE+XpwLM5XE/Z26nfjOEsGVM+FoB0MRA4389YtF+SPmdu H3I1+34KuuFPHOmqDwaY35G0cJe5r/VyVo/VN6hcX+Mlg41xPPcV4Tj5N7stiZIB4ZHe 5Iow== 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=dtxirfz5/7QK7pUoRxuyggx5BA2u9W42nGdGz/gLfGQ=; b=LJrVhDt/1FHp1i4HLAhFiYwa/ooOebfYhx62HJnbZ3N3U4yeCSZ+Cj75nTiQVqihmf 5VhvkwP/ZYOmV5c06zGvXefzBXz0msW2ZGw8vGM0kWb1cswGZF15m9+E09DhjQuIucp5 M2RPTL0SltgjHpTQAs+4OiGh8KyFgEA+YZ/7hDzeERR38zl/HamiINuXuMyrFry1NMuu prL1KXSYC9XE36Sv36KiJ7qrUNXyVsGA1Jop5JRR4EIZy7Fh2ZlNTYRuCMfjAQouR4lj R1fPdWcNAaMHiZiBpeVtXIi0Sw0ifsFZBmlMkkSF24BE5D/pxnoyIVX9L6bdLnyhMa6P mG4w== X-Gm-Message-State: AIVw111cSZvqJF8ekj+2jUG0r2SMKd90xSp1HTGTKsPaNWIsq3A1CcfE /lIqoEFAKFyZgq3f X-Received: by 10.98.108.74 with SMTP id h71mr8117350pfc.206.1500083749291; Fri, 14 Jul 2017 18:55:49 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id l4sm18189589pgr.21.2017.07.14.18.55.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 18:55:48 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 14 Jul 2017 18:55:35 -0700 Message-Id: <20170715015539.31584-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170715015539.31584-1-raj.khem@gmail.com> References: <20170715015539.31584-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 2/6] v4l-utils: Fix build with musl 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 --- ...tl-Define-TEMP_FAILURE_RETRY-if-undefined.patch | 55 ++++++++++++++++++++++ ...t-Link-mc_nextgen_test-with-libargp-if-ne.patch | 28 +++++++++++ .../0003-v4l2-ctl-Do-not-use-getsubopt.patch | 49 +++++++++++++++++++ .../v4l2apps/v4l-utils_1.12.3.bb | 5 +- 4 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch new file mode 100644 index 000000000..f1e11da3f --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch @@ -0,0 +1,55 @@ +From e60aea50e41ae8a17672beb5859beecb66e7a305 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Jul 2017 13:11:25 -0700 +Subject: [PATCH 1/3] ir-ctl: Define TEMP_FAILURE_RETRY if undefined + +use strndup() instead of strndupa() which is not +universally available in C libraries + +Taken from AlpineLinux + +Signed-off-by: Khem Raj +--- + utils/ir-ctl/ir-ctl.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c +index bc58cee..1a44011 100644 +--- a/utils/ir-ctl/ir-ctl.c ++++ b/utils/ir-ctl/ir-ctl.c +@@ -42,6 +42,16 @@ + # define _(string) string + #endif + ++/* taken from glibc unistd.h */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + # define N_(string) string + + +@@ -344,12 +354,14 @@ static struct file *read_scancode(const char *name) + return NULL; + } + +- pstr = strndupa(name, p - name); ++ pstr = strndup(name, p - name); + + if (!protocol_match(pstr, &proto)) { + fprintf(stderr, _("error: protocol '%s' not found\n"), pstr); ++ free(pstr); + return NULL; + } ++ free(pstr); + + if (!strtoscancode(p + 1, &scancode)) { + fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1); +-- +2.13.3 + diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch new file mode 100644 index 000000000..2fb4057ec --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch @@ -0,0 +1,28 @@ +From b3acc4c6407f9553f32582a9aee6a11b5fcd1d8a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Jul 2017 13:17:19 -0700 +Subject: [PATCH 2/3] contrib/test: Link mc_nextgen_test with libargp if needed + +musl depends on external argp implementation e.g. + +Signed-off-by: Khem Raj +--- + contrib/test/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am +index 4641e21..e47b948 100644 +--- a/contrib/test/Makefile.am ++++ b/contrib/test/Makefile.am +@@ -32,7 +32,7 @@ v4l2gl_LDFLAGS = $(X11_LIBS) $(GL_LIBS) $(GLU_LIBS) $(ARGP_LIBS) + v4l2gl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la + + mc_nextgen_test_CFLAGS = $(LIBUDEV_CFLAGS) +-mc_nextgen_test_LDFLAGS = $(LIBUDEV_LIBS) ++mc_nextgen_test_LDFLAGS = $(ARGP_LIBS) $(LIBUDEV_LIBS) + + + ioctl_test_SOURCES = ioctl-test.c ioctl-test.h ioctl_32.h ioctl_64.h +-- +2.13.3 + diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch new file mode 100644 index 000000000..0a986ae5d --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch @@ -0,0 +1,49 @@ +From d04aa6866cbea57c4a81b033cd60586a9436ac6b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Jul 2017 13:20:05 -0700 +Subject: [PATCH 3/3] v4l2-ctl: Do not use getsubopt + +POSIX says that behavior when subopts list is empty is undefined. +musl libs will set value to NULL which leads to crash. + +Taken from AlpineLinux + +Signed-off-by: Khem Raj +--- + utils/v4l2-ctl/v4l2-ctl-common.cpp | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp +index 3ea6cd3..291fb3e 100644 +--- a/utils/v4l2-ctl/v4l2-ctl-common.cpp ++++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp +@@ -692,16 +692,17 @@ static bool parse_subset(char *optarg) + + static bool parse_next_subopt(char **subs, char **value) + { +- static char *const subopts[] = { +- NULL +- }; +- int opt = getsubopt(subs, subopts, value); ++ char *p = *subs; ++ *value = *subs; + +- if (opt < 0 || *value) +- return false; +- fprintf(stderr, "No value given to suboption <%s>\n", +- subopts[opt]); +- return true; ++ while (*p && *p != ',') ++ p++; ++ ++ if (*p) ++ *p++ = '\0'; ++ ++ *subs = p; ++ return false; + } + + void common_cmd(int ch, char *optarg) +-- +2.13.3 + diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb index 42da5cc09..b408bb0a9 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb @@ -18,7 +18,10 @@ SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ file://0001-buildsystem-do-not-assume-building-in-source-tree.patch \ file://mediactl-pkgconfig.patch \ file://export-mediactl-headers.patch \ - " + file://0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch \ + file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \ + file://0003-v4l2-ctl-Do-not-use-getsubopt.patch \ + " SRC_URI[md5sum] = "89e1ed6c69c94e0489dc0a638c7841aa" SRC_URI[sha256sum] = "5a47dd6f0e7dfe902d94605c01d385a4a4e87583ff5856d6f181900ea81cf46e" From patchwork Sat Jul 15 01:55:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 107847 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1667845qge; Fri, 14 Jul 2017 18:58:15 -0700 (PDT) X-Received: by 10.84.128.9 with SMTP id 9mr18562437pla.61.1500083895307; Fri, 14 Jul 2017 18:58:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500083895; cv=none; d=google.com; s=arc-20160816; b=LJF4u11gxzsScvMiisSR6EuG72Gs7RxiAv8glYfavGXjOYdhpcxqc7JARtlPH7ck+V aD3xH/WfRe2FaaAlC0N6geuTGdWjXpBWqqC8d1aYgpGsEt2vipqnrgoU1PuIZfr+UJT9 dDvsuGrwMzihd23X9mXG49KakDikVAPb6bHTm8TghUvihi/khedXljwjiRkUc7AshVMO PhxH7WXhXZgI6ZEDa0wjWD7Q2VA7clH8JdNLD2XlwObQXJqx6djbTMkk1fVfyPaT4ahy VmGEy1YN3eifyZvwriDuxwr/s9FvZNOMJF5zu353aU2l+Fz5EkEmwSBcims+TySO06Dr Nnlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=t9xglvvD3+jvpOO1u0dcIjDL5EgeiW0wF2EEsdh68KE=; b=gPIP5UrfKUswE/2LrS67ey3N/EAa2VNP2er7P9lvuyWS9jGTrJnHLrzc20jvJBkxln lYJ4itEW6cI62QeJw0nWyfCyvIWJXnQn1lu12Nr6NKaJT7/ymSwcRI16578IXDw9unLH PuU17rV0aWiR6uxOxy/5bcf1gExH31qQtJ7lIzMVwGhQt7N16khqTtk2C5483ssJtdv3 +oK2L4bvSJ79BddbGXt9uQltzKMc5fTo1hhnWmFNE4ABPWSdiw3ok7UW8z1cRZqzUuXR 0OH9GDBm2BjsWwHqjduCEFpUeWw87EJeMpOW7hjWi5yzubu9ZTSFs5aFCy9MjovXA1UP vykQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=lbH4/TWV; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t9si7676146pge.491.2017.07.14.18.58.15; Fri, 14 Jul 2017 18:58:15 -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 header.b=lbH4/TWV; 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 764D1782E0; Sat, 15 Jul 2017 01:57:55 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f44.google.com (mail-pg0-f44.google.com [74.125.83.44]) by mail.openembedded.org (Postfix) with ESMTP id 9E551782B4 for ; Sat, 15 Jul 2017 01:55:54 +0000 (UTC) Received: by mail-pg0-f44.google.com with SMTP id k14so53320046pgr.0 for ; Fri, 14 Jul 2017 18:55:56 -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=sbA+tHv2/EQwEktLI5CbrMIDVQiU6igUgW6cwBKAhWI=; b=lbH4/TWVX1O3JdyXH5ciR962rOOMdOx2mC18Wpe9J2ouxxCE3G4b1OED7dLLEFgKeG 5MO1ZJX6WBoCmABR+LXpZhq19rXmgzHf1HrWnNJ1V8pQPxOQn91QbvWcaJSKBL/yriP6 nduSNvIX92vubypDr2WpRTRLLNQJh9QEihi/wERUBgssy1WXglSgOb49O+3aeCaW0P4A uODQd4TE+N3E55nPfxlsboECh6I/Ezw+kzUToH6Ds0Owb6wcysoFAPM/fv24Sx1ipNWI AuqJ3aVWrBJKznqo3ZxN2Cc1BwIVviu0lJISJhSeQI2KMz/oyRuDSrs0zxCHMkj7r26I Gzvg== 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=sbA+tHv2/EQwEktLI5CbrMIDVQiU6igUgW6cwBKAhWI=; b=OSxnh0jPkMtMUh/oKFCBTyVp2qj5c212ywMAyO0xUIOLq41AVd0torilrFQBgqHUZ7 m5tmlmBX6A5fRZ+Zk/cOMrl4EU7esJvQME+n4GO2lkdWG+EV5cP40j4nOGbhXLQFNDHL jd9kZmM/9D1litTeDzMCnhCXg3JWL29JjyE1nyll9NHSGk6pZOkxhS5GoRtczQKabD+b OEaYZSA2E9phWrALYQ120n9O2fshCd1z0buwaY1SBVv4t07E4WQEkJWbYfLVtE0zcP/w sRD3qPPQxg7XaTtE+AGl/Zp34Z4dbB4wlM2Qvt8wxeoe336MZ3P79ElTd6KDyzJYypls kiSQ== X-Gm-Message-State: AIVw113XWngPL3RrrK73ZT//7VgQIV9MzpuLS3UpPapyEBMXqfvwZI88 oGK3X9bY7iudD9pZ X-Received: by 10.99.122.3 with SMTP id v3mr17518296pgc.98.1500083755535; Fri, 14 Jul 2017 18:55:55 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id l4sm18189589pgr.21.2017.07.14.18.55.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 18:55:54 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 14 Jul 2017 18:55:39 -0700 Message-Id: <20170715015539.31584-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170715015539.31584-1-raj.khem@gmail.com> References: <20170715015539.31584-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 6/6] pimd: Upgrade to 2.3.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 --- ...ure-Dont-use-uname-to-determine-target-OS.patch | 28 ++++++++++++++++++++++ meta-networking/recipes-support/pimd/pimd_2.1.8.bb | 19 --------------- meta-networking/recipes-support/pimd/pimd_2.3.2.bb | 20 ++++++++++++++++ 3 files changed, 48 insertions(+), 19 deletions(-) create mode 100644 meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch delete mode 100644 meta-networking/recipes-support/pimd/pimd_2.1.8.bb create mode 100644 meta-networking/recipes-support/pimd/pimd_2.3.2.bb -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch b/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch new file mode 100644 index 000000000..eb549ded9 --- /dev/null +++ b/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch @@ -0,0 +1,28 @@ +From f3e04281bad361249a8dad0cde150a801d720f67 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Jul 2017 18:46:52 -0700 +Subject: [PATCH] configure: Dont use uname to determine target OS + +Helps with cross-compiling + +Signed-off-by: Khem Raj +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 6c35a72..f9714e2 100755 +--- a/configure ++++ b/configure +@@ -31,7 +31,7 @@ + #DEFS += -DSCOPED_ACL + # + +-OS=`uname` ++OS="Linux" + CFG=config.mk + TMP=`mktemp /tmp/XXXXXX` + BUGREPORT_URL="https://github.com/troglobit/pimd/issues" +-- +2.13.3 + diff --git a/meta-networking/recipes-support/pimd/pimd_2.1.8.bb b/meta-networking/recipes-support/pimd/pimd_2.1.8.bb deleted file mode 100644 index 7edb6422d..000000000 --- a/meta-networking/recipes-support/pimd/pimd_2.1.8.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "pimd is a lightweight stand-alone PIM-SM v2 multicast routing daemon." -HOMEPAGE = "http://troglobit.com/pimd.html" -SECTION = "net" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94f108f91fab720d62425770b70dd790" - -SRC_URI = "ftp://ftp.troglobit.com/pimd/${BP}.tar.bz2" -SRC_URI[md5sum] = "a12448bc7c9bfcebf51a13ebf1ffa962" -SRC_URI[sha256sum] = "01016940543a0a6131d4e6c91b595d47e187012c59a298eec14c3dbc38564b3a" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" -CFLAGS += "-I ${S}/include " - -do_install() { - unset datadir - unset mandir - oe_runmake 'DESTDIR=${D}' install -} - diff --git a/meta-networking/recipes-support/pimd/pimd_2.3.2.bb b/meta-networking/recipes-support/pimd/pimd_2.3.2.bb new file mode 100644 index 000000000..2faa7cb1c --- /dev/null +++ b/meta-networking/recipes-support/pimd/pimd_2.3.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "pimd is a lightweight stand-alone PIM-SM v2 multicast routing daemon." +HOMEPAGE = "http://troglobit.com/pimd.html" +SECTION = "net" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94f108f91fab720d62425770b70dd790" + +SRC_URI = "ftp://ftp.troglobit.com/pimd/${BP}.tar.gz \ + file://0001-configure-Dont-use-uname-to-determine-target-OS.patch \ + " +SRC_URI[md5sum] = "a3c03e40540980b2c06e265a17988e60" +SRC_URI[sha256sum] = "c77a9812751f114490a28a6839b16aac8b020c8d9fd6aa22bf3880c054e19f1d" + +EXTRA_OECONF_append_libc-musl = " --embedded-libc" + +inherit autotools-brokensep + +do_configure() { + oe_runconf +} +