From patchwork Tue Jan 2 19:00:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123201 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9300488qgn; Tue, 2 Jan 2018 11:04:07 -0800 (PST) X-Google-Smtp-Source: ACJfBostcanhySU3+fCy8Q410qEBdJMlm6Hopu5VGEC8175hQeg4gMQSVgVz5eP5sP6l2Mz+ZiVM X-Received: by 10.55.102.149 with SMTP id a143mr59002222qkc.296.1514919847185; Tue, 02 Jan 2018 11:04:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514919847; cv=none; d=google.com; s=arc-20160816; b=RUXarXquWZ6/rb4hkxUM87XfzWh9v8NkSFu4ynQJgQzZ/aP8+kNTvXP51+amvBWNnl skMD2YtOoZrif7iHhKGOGImP4A6/gZg6etJBG9IuHiucyJYsBw/bjSvI/cj5MSXQk2pi HZOxHxfBYUJOw+5xhSHD4Y1UvqtCgkUua81KpyATZEUqZDK3oDUoftUFj+VG9MQl5gWV 2RHopWfZq/hCnX5B8JiNsPdJlyPMa67/nyzkZeTWj6wSRJG1rBt8mXMQVNsLCPDXY6/J QBA2NKUkMXjaVBmC9XtgkNJfrzsNwvaf/vA03dvoovZju2L9ZthAzQdnaw8FemZfuXEf jRvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=kEoFYmdGhSXfD0qF1LrzpVJtmCIGTSyIQZK1aoRF7XU=; b=DDRKxtaxLnKzjH1lNVWOJ/p8XV/VCEziAJyHIdAcu0sbKQKSTZ6XQ4on+P+s9YnqMf QfZsALtfGVxG0Lh20XouYN8vlB6SQuUsqllg7uJeOD3yoXluMQkvs6mwWJcMndehh+4+ mK1G7ag8XCym5BWFqpWPjOhoVRISrNwEPgjCVnqj3JsmfGLjb4JHHKurYS6v+nHcizoV zN4IT1c6Y3XRrt1llvV51VrnkAA8/6DJE5IsgOhTnCgJNXJwex9w/NlgTHRMbZfY1IPT 23QzmUQO90tInuuNE5GmkDYf/QYTyIKLlZCl+Z7l4JfX9XEzwz9QblnnCqRBrzoqNX7d IH1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id a185si353602qke.379.2018.01.02.11.04.06; Tue, 02 Jan 2018 11:04:07 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id D5D356172B; Tue, 2 Jan 2018 19:04:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id CE0EB61555; Tue, 2 Jan 2018 19:02:22 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D50496151E; Tue, 2 Jan 2018 19:02:08 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 02795608E8 for ; Tue, 2 Jan 2018 19:00:47 +0000 (UTC) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward105j.mail.yandex.net (Yandex) with ESMTP id CE8F3181DD3 for ; Tue, 2 Jan 2018 22:00:45 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id vHFF11izDI-0Mg4s1hb; Tue, 02 Jan 2018 22:00:22 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0LNi8eod; Tue, 02 Jan 2018 22:00:22 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:06 +0300 Message-Id: <1514919619-15466-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 1/14] helper: link against libpthread and libodp-linux X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov libodphelper.so uses symbols from libpthread and libodp-linux.so, link it aganst those libraries. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ helper/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helper/Makefile.am b/helper/Makefile.am index ee1c17d6d..ebb67346c 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include +AM_CFLAGS = $(PTHREAD_CFLAGS) AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' @@ -60,4 +61,6 @@ __LIB__libodphelper_la_SOURCES += \ linux/thread.c endif +__LIB__libodphelper_la_LIBADD = $(PTHREAD_LIBS) $(LIB)/libodp-linux.la + lib_LTLIBRARIES = $(LIB)/libodphelper.la From patchwork Tue Jan 2 19:00:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123202 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9302003qgn; Tue, 2 Jan 2018 11:05:31 -0800 (PST) X-Google-Smtp-Source: ACJfBotPaeDDXjmvbtNR7DpFWzcOm/VCW6fquG+TrQE7ysejU9w0pDFH5o8jCvy70/JEWSTcrOQc X-Received: by 10.55.106.129 with SMTP id f123mr1748643qkc.103.1514919931230; Tue, 02 Jan 2018 11:05:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514919931; cv=none; d=google.com; s=arc-20160816; b=z6v2276F2nE1Rll0YwwjPXK7k7zhPrpUevEyRdIUARabibBcw6TFt4mVPRuG57OW1a rtPPCZ/9nasSA2Ct6frIeghrTkFxslnprAbzFZArkhaqPu+KnDOO82jAgjiLaBcWauyJ 1aryx6eDrLV8rjnNp3HmD9bUcy7bjvT+v+4aLYzyZ9UpqgO8dyV3BFvQylOb9nty+Z50 rLYuvz4KJGIcn1JKRv5EhVIY96CmWDslC7Obm8lR9kjTfxg5g8Phnu8Et2gCUXZy+piq 1gYGCr+fPZYIEpcwoiWkmmOKwgRvL4NQz1PE6zmgkwLKUoOPFiGZwO98WmJCwZ81oaRN 00aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=gV6RJxjKTb3BtG0RayLxbGpVmIdRgvTczMvRtZTgM84=; b=JL+GpfYQbg14VQ6AtEnpS0xHIncQxG6/y9pBZPMl1gg0+hI/ynRW/uaIs0rVZa0liz WE7ozz7v9F5Mm7W0jjs65/34f9Oaf8soXOiThcXqojPh6F8mzB2veEhOo/Y+5l8dsKUG sHzffr/VPhdsFn9EkRQcg1suKrGHTKcm9RftreCDP4Q29J6K3evG6TEkvL76itgiEzUW CcQPaiMm9U6b3mPYLXKO1ADOx7TUQt1uFBCXeDkW4Rjl8yUChzJlvNgiomkXi1HjMl8e AU6nisywKptjZGmGzdWgjyxMafZaDJW7vUfK5reMwIYG+aEADcTjgNphGuPomOg/wpDX bODQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 20si2456550qkt.45.2018.01.02.11.05.31; Tue, 02 Jan 2018 11:05:31 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id DC32D61738; Tue, 2 Jan 2018 19:05:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 25563616D9; Tue, 2 Jan 2018 19:02:31 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5779B60905; Tue, 2 Jan 2018 19:02:09 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id D35BF60953 for ; Tue, 2 Jan 2018 19:00:47 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 7709734C1F1A for ; Tue, 2 Jan 2018 22:00:46 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id trnIFO5iCf-0kV0vx6e; Tue, 02 Jan 2018 22:00:46 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0jNut3M7; Tue, 02 Jan 2018 22:00:45 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:07 +0300 Message-Id: <1514919619-15466-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 2/14] doc: add missing user-guide images to Makefile.am X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Omitting those images in Makefile.am made them disappear from distribution tarball resulting in an improperly-built documentation files. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ doc/users-guide/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index b2ebd4d4f..7be32ddc1 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -32,6 +32,12 @@ IMAGES = $(IMAGES_DIR)/overview.svg \ $(IMAGES_DIR)/pktio_fsm.svg \ $(IMAGES_DIR)/pktout_direct_send.svg \ $(IMAGES_DIR)/pktout_queue_send.svg \ + $(IMAGES_DIR)/ref.svg \ + $(IMAGES_DIR)/refpkt1.svg \ + $(IMAGES_DIR)/refpkt2.svg \ + $(IMAGES_DIR)/refpktmulti.svg \ + $(IMAGES_DIR)/refpktsingle.svg \ + $(IMAGES_DIR)/refstatic.svg \ $(IMAGES_DIR)/release_git.svg \ $(IMAGES_DIR)/segment.svg \ $(IMAGES_DIR)/simple_release_git.svg \ From patchwork Tue Jan 2 19:00:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123200 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9299423qgn; Tue, 2 Jan 2018 11:03:04 -0800 (PST) X-Google-Smtp-Source: ACJfBoumbHngBiJdulmLijMFVCTWIScCiSgwHE7rDA4aead7L7vhxwIRw+U+WuLLR4mPXUvLYDzQ X-Received: by 10.55.139.7 with SMTP id n7mr9003483qkd.263.1514919784207; Tue, 02 Jan 2018 11:03:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514919784; cv=none; d=google.com; s=arc-20160816; b=GO1JowzBQj/FZnuQJaQhQR9qaJVxVgU71zV/LIcMiYmS88OStFbgvzhNJ5O33NTMB+ /gZFWm9FEVNyO73fuF+vQw0grD4egdMnkwSJE8OkFD6wLSFDa1VmHjtr59poXZFxwgzw 3MD9ufV7tgkjdvALIKjoPGKtnRd/2aDz/4BbPItIktcS2HPgM2e7UxR7Rkcq1RKnVgt7 ETgYsGqV30TU9bMHVSRSwWXxresp4Tp9MeYuMS1bud2Tdd1013QNR74Ubhlw1Q0dpPwU Gt4qJfucuYef5qGW/XEl6tHuX+v/OuTZJ85Y5mYl294f/gefMZZbTO7ovI+tz8o1vs2J TrHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=B7kUct0i/5Ybr6zSVjt9St/pJUyjKAMaszXmcHKW1Lg=; b=OlLM/5JxUgzRNmw3U5HuFsjJyDu9b282c0D0+Au5uf52q9aNAVCiSEZpGsHLPi8YNu K0UsMdLr/3zy4CRqeCwe3CpKDe4oRrbj4GK5a6uo58s81wBFTfioGrmaou0I/rlhxNya Om9FGC/z+0EjO7DO3ozGC7mHfnWvVfTmwaDhSzUGJfb4YOqeYH7cSFBEHGrprsfXUAVi Hb8HVrDaGC2MfTuzxLYXvcj1cAE1XjJbG6w0sW1R3/UzBUcBztQT6H9aNhlOxWszIq9F CJmmFofKSDrE8afb9WCd5Kvw5UdCjKq8DF2+6X5Bflr16DoXh0mVd40ihHRYBVGNnkOx XcVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id h89si1290030qtd.12.2018.01.02.11.03.03; Tue, 02 Jan 2018 11:03:04 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id C81D9616ED; Tue, 2 Jan 2018 19:03:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 775146095D; Tue, 2 Jan 2018 19:02:16 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1CE1661524; Tue, 2 Jan 2018 19:02:08 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id 204186095D for ; Tue, 2 Jan 2018 19:00:48 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 303EA34C1E10 for ; Tue, 2 Jan 2018 22:00:47 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id uVB5H1vSdD-0lt0rSOB; Tue, 02 Jan 2018 22:00:47 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0kNu8lKO; Tue, 02 Jan 2018 22:00:46 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:08 +0300 Message-Id: <1514919619-15466-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 3/14] doc: add missing implementers-guide images to Makefile.am X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Omitting those images in Makefile.am made them disappear from distribution tarball resulting in an improperly-built documentation files. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ doc/implementers-guide/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 07ee141c8..c407339e2 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -2,10 +2,12 @@ include ../Makefile.inc SRC = implementers-guide.adoc TARGET = implementers-guide.html +IMAGES = $(IMAGES_DIR)/abi_llvm.svg \ + $(IMAGES_DIR)/abi_traditional.svg -EXTRA_DIST = $(SRC) +EXTRA_DIST = $(SRC) $(IMAGES) doc_DATA = $(TARGET) -$(TARGET): $(SRC) +$(TARGET): $(SRC) $(IMAGES) CLEANFILES = $(doc_DATA) From patchwork Tue Jan 2 19:00:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123204 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9304084qgn; Tue, 2 Jan 2018 11:07:25 -0800 (PST) X-Google-Smtp-Source: ACJfBov25xohL0QrYdoyjN6Qsu6sBHdxPunblWIH2RSOPeuDCxiZPL75LH6WQptr/nOqlvHsGDn0 X-Received: by 10.200.49.29 with SMTP id g29mr63964959qtb.215.1514920045040; Tue, 02 Jan 2018 11:07:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514920045; cv=none; d=google.com; s=arc-20160816; b=TLtCAbNlAuWEf89v5UVzg2+0Y2klj+h2aSD+S5vVIg9o8eMr9Xuo/mxgV/cyyfZXEy YIU/UA+ZXLLJJZad60ydUQ8OXuMCVtCr55Uhk+Y0u20G6XxPvM4Va6P1uL1/YXkDigmp OPsFJtks1O68A3shDBmS0F97MTTtC0TutEHMl1DM6FuR0RqqObF0ZyFDBTWpZRRlhIP6 7vZO0G1DNK/AhsVfQ9qgZ23mR4XieRG6xVMAyZi6kbMvESeOT2GwMYPcjNHph8Gze0Cs 3TZnRxQ9GuZfqWTeiLYeadteUfC4shmPdOFtBKnSKabx7viL1x9xl52AOWpPSQQIcmEA BrLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=EuP8w341bLZWfPt1cq6JPg3ZRp6wFC6qghCMEP9Jiv0=; b=xsW3xUugbPmMh+vCEPNLj4AWQ25yu7wCIYUTfEVNfCBe0siuq2vhZGTsX/cV2p4Djc NXhEm/0SOa7MWi5NmQN7PPvn+GZmc1vRTKSdBAS872cV6kv2GzT04/4SJ9kEeidk+uk8 LqtCtae8vXAQmY8mgOTPXvL3WN+rohhH733ej+7NIkwuJH/7SM6gA5ThUgDWSsVoDFF6 y1Zz1OGxnjZkm3WWjQ4c7npkj8OWlA2iCqoPe/0kQ1Sj/uDDTLUakE+XbMEpAKVO0Wx/ DuixLktslo9oEeoThU7V1jk36llUvDtcaia3Qgsl85Vnt+dsEXH6Qvidf8nSVLVPZIcI RWaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id m190si4107385qkb.363.2018.01.02.11.07.24; Tue, 02 Jan 2018 11:07:25 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 9092D616EF; Tue, 2 Jan 2018 19:07:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id BC5866097F; Tue, 2 Jan 2018 19:02:43 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E10E460953; Tue, 2 Jan 2018 19:02:10 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id AAB006095E for ; Tue, 2 Jan 2018 19:00:48 +0000 (UTC) Received: from mxback13j.mail.yandex.net (mxback13j.mail.yandex.net [IPv6:2a02:6b8:0:1619::88]) by forward105j.mail.yandex.net (Yandex) with ESMTP id B2A4B181DD3 for ; Tue, 2 Jan 2018 22:00:47 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback13j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ef5l6Wdea3-0l80Jk0a; Tue, 02 Jan 2018 22:00:47 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0lN8JTxP; Tue, 02 Jan 2018 22:00:47 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:09 +0300 Message-Id: <1514919619-15466-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 4/14] performance: odp_crypto: correct typo X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Receieved -> Received. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ test/performance/odp_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 0cbc2754e..761cc8cff 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -612,7 +612,7 @@ run_measure_one(crypto_args_t *cargs, if (cargs->debug_packets) { mem = odp_packet_data(out_pkt); - print_mem("Receieved encrypted packet", + print_mem("Received encrypted packet", mem, payload_length + config-> From patchwork Tue Jan 2 19:00:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123203 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9303089qgn; Tue, 2 Jan 2018 11:06:30 -0800 (PST) X-Google-Smtp-Source: ACJfBotisaSy2fjz/RCFyomqI/dVduUluiocg+EBdYNsm+qQ5TzmrKpEst6kBHkr+/OdHf7XcILS X-Received: by 10.200.38.6 with SMTP id u6mr60285842qtu.1.1514919990151; Tue, 02 Jan 2018 11:06:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514919990; cv=none; d=google.com; s=arc-20160816; b=JOgXedE2WEeg59Snk/nwFhPczdbaKS+w7i2Hq9eQ1yabSaI9YggOBLjVtnA/wklh8T u4zJwA8uW6HpoY4y8p5INSucdGvrB9i8YjoS0zWrUf7bTR0rJ07pBan8sbnl33P28wto kedbMht+0ETOMkniVN+sIusGTEi8iKGy5CxJ+1gsrVL11PykQHe+gQUs9BxDEcozxLn7 E/P2AUrw/+U0vnJHDOmbVAFEZ+O9BU5O0s2+GSsCNB3UiJi6KN+ldw2Xg8u4wdnJdRWa gi5UBhkHg8Z0S1BSQu7bjTUmV4vBedF3t+AAP5mbsXiZ+/ksMGc8RBcvKj4rc01Dl1Us m3iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=oPGZasUSo66KXAUYSqvn8XqXvRP/33MNFD/bwyi686M=; b=HvrbIux9Lkl3rvCCixFdTYlLRgLkFmgSeVeCY3kNTeR82TZALmB3BYGQTSZaABZCDf bHjR81IPvs6ccAf59NOH1iW5KJDTh+aTi1rqj5UpW8UcMDxPt33o4aGppfsMoQWFHfcW h8n+Wn5smK5eoReKvTIcxe6ZcPyLqZ0RnvsH3GIsmECkwooyAjTI5htYwyBPhdcLHXj+ b2ARhiTQ2fXl8fLPYxqAI/ZmrNYTsUbs6DYX3RwAxn0/8g7osv37Uy9RGqV0wb13gXwr voolENufe6MvOzElFv9fB/V+3CfFyBmvHc1hfyjFE+IcGSrV3rVrpFi91pyj35XFfnn8 Dtbg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id q2si2536216qkh.350.2018.01.02.11.06.29; Tue, 02 Jan 2018 11:06:30 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 862C361741; Tue, 2 Jan 2018 19:06:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 6978A6152B; Tue, 2 Jan 2018 19:02:37 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C036860905; Tue, 2 Jan 2018 19:02:09 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id 95E6D6096B for ; Tue, 2 Jan 2018 19:00:49 +0000 (UTC) Received: from mxback20j.mail.yandex.net (mxback20j.mail.yandex.net [IPv6:2a02:6b8:0:1619::114]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 627CB41DA5 for ; Tue, 2 Jan 2018 22:00:48 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback20j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ymUrK8ZiVo-0mouuqhk; Tue, 02 Jan 2018 22:00:48 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0lN8sDBk; Tue, 02 Jan 2018 22:00:47 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:10 +0300 Message-Id: <1514919619-15466-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 5/14] build: provide an option to link examples dynamically X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Distributions won't like statically-linked binaries. Provide configure switch to link examples and tests dynamically. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ configure.ac | 11 +++++++++++ example/Makefile.inc | 4 ++++ test/Makefile.inc | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/configure.ac b/configure.ac index 177881a58..3242c453c 100644 --- a/configure.ac +++ b/configure.ac @@ -172,6 +172,16 @@ AS_IF([test "${with_platform}" = "linux-generic"], AC_DEFINE_UNQUOTED([IMPLEMENTATION_NAME], ["$IMPLEMENTATION_NAME"], [Define to the name of the implementation]) +########################################################################## +# Build examples/tests dynamically +########################################################################## +AC_ARG_ENABLE([static-tests], + [AS_HELP_STRING([--disable-static-tests], + [disable static linking of examples and tests] + [ with ODP])], [], + [enable_static_tests=yes]) +AM_CONDITIONAL([STATIC_LINK], [test "x$enable_static_tests" != "xno"]) + ########################################################################## # Include m4 files ########################################################################## @@ -383,6 +393,7 @@ AC_MSG_RESULT([ Deprecated APIs: ${deprecated} debug: ${enable_debug} cunit: ${cunit_support} + static tests linkage: ${enable_static_tests} test_vald: ${test_vald} test_perf: ${test_perf} test_perf_proc: ${test_perf_proc} diff --git a/example/Makefile.inc b/example/Makefile.inc index 1609066e6..4cf5cfacc 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -13,4 +13,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include +if STATIC_LINK AM_LDFLAGS = -L$(LIB) -static +else +AM_LDFLAGS = +endif diff --git a/test/Makefile.inc b/test/Makefile.inc index f7c0da214..d7e435038 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -18,7 +18,11 @@ INCFLAGS = \ AM_CPPFLAGS = $(INCFLAGS) AM_CFLAGS = $(CUNIT_CFLAGS) +if STATIC_LINK AM_LDFLAGS = -L$(LIB) -static +else +AM_LDFLAGS = +endif @VALGRIND_CHECK_RULES@ From patchwork Tue Jan 2 19:00:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123206 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9306298qgn; Tue, 2 Jan 2018 11:09:40 -0800 (PST) X-Google-Smtp-Source: ACJfBotViHDfHJ2fUA4KnZN3rUn5+NXzO7SAk6dKH/qoKdqUHw8gTsv7y1n5KgJb9boE0fr/eZJe X-Received: by 10.55.177.2 with SMTP id a2mr34811807qkf.152.1514920180649; Tue, 02 Jan 2018 11:09:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514920180; cv=none; d=google.com; s=arc-20160816; b=pacHEY2whI9uQBW9YAhV+6YJp09V3Smryrx71jvSEqYcMDRwHuy6nxtdJvXANyQXgc s+OxU6yuS2VWJhRVOawUubL3PeHbFYxyHExDmfPU1ezPJ+Vi6leycAAylfmSF0c0F9cM f3PaPQ6kBdosQU2YnAsxht25Ok3D9v5NEsIbhXlR3d+8jxO8ej2Q1GQPvgPJDBVoPTGu NrwXlDhBxCXK8xlZ6+7LUZ2lHMukur4pKGfMtrzOTKa0JfRGFYr/uXsGn4miN1yFy3He zoEG/0ZOwTAhgWp64O38QCAtuLmW6hnUla8PfwrQh/Wt2pwyCYHQW+0i59xduInuuN6A vCPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=/xPOhSL0ripdMThSbCDe+HRTJK5/iWyOt96HftUu3G4=; b=va1zYdkQjJdREWVELuupdasFikaD80VFKv6za7jkh3YlZ4Vcwi1H9Q5YaBIKdLj9CX P09+bAd1o1bisob/P8WhLHXJGIh2bj6KumnoQ3t49RWuU2yDnmxpvn2QwTFX//f0IiA5 GuQtbQbW79s/rBpDghY4l1lEuvhgQRoKHGFOnQbO1yunm9swNojdOh0gjnhh5VqKvDGv MFW+KYl2M4U31hC13OTf2r8ase9101ey45ivp4PPpA+roVjq95DYATKd/0cxwhk+O361 SBO/Nk3XUpgRUcxGRsO5F67wU1/OAQnZz4Vkk95imGTkhl7ew8tD6gr4QKjK/Bl/rUjS hLdA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id d31si1334171qtc.430.2018.01.02.11.09.40; Tue, 02 Jan 2018 11:09:40 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 564D9606A0; Tue, 2 Jan 2018 19:09:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id B1322608DD; Tue, 2 Jan 2018 19:02:55 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 7E58260975; Tue, 2 Jan 2018 19:02:45 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 331EA60958 for ; Tue, 2 Jan 2018 19:00:50 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 12BFF51013E1 for ; Tue, 2 Jan 2018 22:00:49 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id aNQSoLGHNN-0mtieN7i; Tue, 02 Jan 2018 22:00:48 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0mNWb3po; Tue, 02 Jan 2018 22:00:48 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:11 +0300 Message-Id: <1514919619-15466-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 6/14] linux-gen: don't pass DPKD_LIBS for dynamic linking with libodp-linux X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ platform/linux-generic/libodp-linux.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/linux-generic/libodp-linux.pc.in b/platform/linux-generic/libodp-linux.pc.in index 220dbc9c6..962a4f78f 100644 --- a/platform/linux-generic/libodp-linux.pc.in +++ b/platform/linux-generic/libodp-linux.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libodp-linux Description: The ODP packet processing engine Version: @PKGCONFIG_VERSION@ -Libs: -L${libdir} -lodp-linux @DPDK_LIBS@ +Libs: -L${libdir} -lodp-linux Libs.private: @OPENSSL_STATIC_LIBS@ @DPDK_PMDS@ @DPDK_LIBS@ @PCAP_LIBS@ @PTHREAD_LIBS@ @TIMER_LIBS@ -lpthread @ATOMIC_LIBS@ Cflags: -I${includedir} From patchwork Tue Jan 2 19:00:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123209 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9309012qgn; Tue, 2 Jan 2018 11:12:27 -0800 (PST) X-Google-Smtp-Source: ACJfBosugse0n64fOHbpCXwArXQwiWvdZozZO9Gcu1A3XNUQu+Q0yagTOfJY4TtBGoFDl0J6Jgrj X-Received: by 10.237.60.206 with SMTP id e14mr56371792qtf.157.1514920347542; Tue, 02 Jan 2018 11:12:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514920347; cv=none; d=google.com; s=arc-20160816; b=KCMGftdwhFq7qtXfUKZI0JOgJdS8jjJREAN5+cz2u7Uh5rzDhG8mUJtfQfjI8gReuv cFXhdygN0GvH1KCNQTBEXnRkNNkfAW50PwnFkfWO28UbYSOAW2pY0H+3ku3tfidYYaN+ BVrapeydNxh3PKW1qrp/cdrFc8BSEZ1H644QRhr7kYq4xuNommPCDoXgXNB9H4SV2KTO sBOFtBrJfozllVjXlsIjuQUXttxHOhB90+k+jqjPFBHqct0VPYYkFObWLxoeK+nUJFAO 9kR5FnlfjaxnfjSouAx68qxks4yiBzrY/4C4CuXe5NJZ99iBFYKtPF4QObv7x1b9Y5sY V7HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=jbo1MsWBGt/7wqU9S/BKnIM3nunJ1mgTCB8S0YewZkM=; b=B302+soCdsBRocULZCeMoqaJrqqxDVslD28dYIuYcDASCq0+rcEk5Kxj+Q0OqyejPb Po7Z2Ic/+NkkL5pMNLI34yYEUgaV9qVaULFld9h01w5nxpIDthR1YtA33sAAkyQWEm0q 4P7UUSDTHJOqFWxFaINAILmyGfxK0+6GSnX1HtUYWmN2n8nlRPRGNAs6VFHBjHLvI33p I0mqwXe8YoZckBbnt4jBinaCTvaj95O57QKeHl4a5pjrB/DX3V9xrnkjmimuTyFsur0I Dch7lMRpMMjtH88YlNPLurxOimMgJAj/OaWP/159Mp7bbuDVO5JqE+sYqsm401dIh809 /hDg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id l15si3180559qtc.475.2018.01.02.11.12.27; Tue, 02 Jan 2018 11:12:27 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 31EF7616F1; Tue, 2 Jan 2018 19:12:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 6CDF4616FE; Tue, 2 Jan 2018 19:03:18 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 7C12D60958; Tue, 2 Jan 2018 19:02:48 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id D2AC960960 for ; Tue, 2 Jan 2018 19:00:50 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward105j.mail.yandex.net (Yandex) with ESMTP id D70AC181E6A for ; Tue, 2 Jan 2018 22:00:49 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id mjLF681Bpm-0nNamBq5; Tue, 02 Jan 2018 22:00:49 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0nNWC00F; Tue, 02 Jan 2018 22:00:49 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:12 +0300 Message-Id: <1514919619-15466-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 7/14] linux-gen: dpdk: simplify linking with shared libdpdk X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov There is no need to pass PMDs when linking with shared DPDK library. Just pass -ldpdk which will pick up all PMDS dynamically. When linking with static DPKD library it is required to pass additional libraries after whole PMD string to fix linking when Libtool will reorder flags. So provide just two variables DPDK_LIBS and DPDK_LIBS_LT. Former should be passed directly to gcc, while later should be passed to libtool. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ example/Makefile.inc | 2 +- m4/odp_dpdk.m4 | 83 ++++++++++++++++++++++++------- platform/linux-generic/Makefile.am | 2 +- platform/linux-generic/libodp-linux.pc.in | 2 +- platform/linux-generic/m4/odp_dpdk.m4 | 24 +-------- platform/linux-generic/test/Makefile.inc | 2 +- test/Makefile.inc | 2 +- test/validation/api/Makefile.inc | 1 - 8 files changed, 73 insertions(+), 45 deletions(-) diff --git a/example/Makefile.inc b/example/Makefile.inc index 4cf5cfacc..829977ce8 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,7 +1,7 @@ TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} LIB = $(top_builddir)/lib -LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) +LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_LIBS_LT) AM_CFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/example \ diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 05e60cc06..127c498b2 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -1,22 +1,38 @@ # ODP_DPDK_PMDS(DPDK_DRIVER_PATH) # ------------------------------- -# Build a list of DPDK PMD drivers in DPDK_PMDS variable +# Build a list of DPDK PMD drivers in DPDK_PMDS variable. +# Updated DPDK_LIBS to include dependencies. AC_DEFUN([ODP_DPDK_PMDS], [dnl -AS_VAR_SET([DPDK_PMDS], [-Wl,--whole-archive,]) +AS_VAR_SET([DPDK_PMDS], ["-Wl,--whole-archive,"]) for filename in "$1"/librte_pmd_*.a; do cur_driver=`basename "$filename" .a | sed -e 's/^lib//'` -# rte_pmd_nfp has external dependencies which break linking -if test "$cur_driver" = "rte_pmd_nfp"; then - echo "skip linking rte_pmd_nfp" -else - AS_VAR_APPEND([DPDK_PMDS], [-l$cur_driver,]) -fi +AS_VAR_APPEND([DPDK_PMDS], [-l$cur_driver,]) +AS_CASE([$cur_driver], + [rte_pmd_nfp], [AS_VAR_APPEND([DPDK_LIBS], [" -lm"])], + [rte_pmd_pcap], [AS_VAR_APPEND([DPDK_LIBS], [" -lpcap"])], + [rte_pmd_openssl], [AS_VAR_APPEND([DPDK_LIBS], [" -lcrypto"])]) done AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) -AC_SUBST([DPDK_PMDS]) ]) -# _ODP_DPDK_CHECK_LIB(LDFLAGS, [LIBS], [EXTRA_LIBS]) +# _ODP_DPDK_SET_LIBS +# -------------------- +# Set DPDK_LIBS/DPDK_LIBS_LT depending on DPDK setup +AC_DEFUN([_ODP_DPDK_SET_LIBS], [dnl +AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl + DPDK_LIBS="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" + DPDK_LIBS_LT="" +], [dnl + ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + DPDK_LIBS_LT="`echo $DPDK_LIBS | sed -e 's/^/-Wc,/' -e 's/ /,/g'`" + DPDK_LIBS="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" + DPDK_LIBS_LT="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS_LT" +]) +AC_SUBST([DPDK_LIBS]) +AC_SUBST([DPDK_LIBS_LT]) +]) + +# _ODP_DPDK_CHECK_LIB(LDFLAGS, [LIBS]) # ---------------------------------- # Check if one can use -ldpdk with provided set of libs AC_DEFUN([_ODP_DPDK_CHECK_LIB], [dnl @@ -31,7 +47,7 @@ LIBS="$LIBS -ldpdk $2" AC_MSG_CHECKING([for rte_eal_init in -ldpdk $2]) AC_LINK_IFELSE([AC_LANG_CALL([], [rte_eal_init])], [AC_MSG_RESULT([yes]) - DPDK_LIBS="$1 -ldpdk $3 $2"], + DPDK_LIBS="-ldpdk $2"], [AC_MSG_RESULT([no])]) ########################################################################## @@ -41,10 +57,10 @@ LDFLAGS=$OLD_LDFLAGS LIBS=$OLD_LIBS ]) -# ODP_DPDK_CHECK(CPPFLAGS, LDFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) -# ----------------------------------------------------------------------- +# _ODP_DPDK_CHECK(CPPFLAGS, LDFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) +# ------------------------------------------------------------------------ # Check for DPDK availability -AC_DEFUN([ODP_DPDK_CHECK], [dnl +AC_DEFUN([_ODP_DPDK_CHECK], [dnl ########################################################################## # Save and set temporary compilation flags ########################################################################## @@ -59,13 +75,14 @@ AC_CHECK_HEADERS([rte_config.h], [], DPDK_LIBS="" _ODP_DPDK_CHECK_LIB([$2]) AS_IF([test "x$DPDK_LIBS" = "x"], - [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread], [-lm])]) + [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread])]) AS_IF([test "x$DPDK_LIBS" = "x"], - [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread -lnuma], [-lm])]) + [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread -lnuma])]) AS_IF([test "x$DPDK_LIBS" = "x"], [dpdk_check_ok=no]) AS_IF([test "x$dpdk_check_ok" != "xno"], - [AC_SUBST([DPDK_LIBS]) + [_ODP_DPDK_SET_LIBS + AC_SUBST([DPDK_CPPFLAGS]) m4_default([$3], [:])], [m4_default([$4], [:])]) @@ -74,3 +91,35 @@ AS_IF([test "x$dpdk_check_ok" != "xno"], ########################################################################## CPPFLAGS=$OLD_CPPFLAGS ]) + +# ODP_DPDK(DPDK_PATH, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ----------------------------------------------------------------------- +# Check for DPDK availability +AC_DEFUN([ODP_DPDK], [dnl +AS_IF([test "x$1" = "xsystem"], [dnl + DPDK_CPPFLAGS="-isystem/usr/include/dpdk" + DPDK_LDFLAGS="" + DPDK_RPATH="" + DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.so`" + if test "x$DPDK_LIB_PATH" = "x" ; then + DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.a`" + else + DPDK_SHARED=yes + fi + AS_IF([test "x$DPDK_LIB_PATH" = "x"], + [AC_MSG_FAILURE([Could not locate system DPDK library directory])]) + DPDK_PMD_PATH=`AS_DIRNAME(["$DPDK_PMD_PATH"])` +], [dnl + DPDK_CPPFLAGS="-isystem $1/include" + DPDK_LIB_PATH="$1/lib" + DPDK_LDFLAGS="-L$DPDK_LIB_PATH" + DPDK_PMD_PATH="$DPDK_LIB_PATH" + if test -r "$DPDK_LIB_PATH"/libdpdk.so ; then + DPDK_RPATH="-R$DPDK_LIB_PATH" + DPDK_SHARED=yes + else + DPDK_RPATH= + fi +]) +_ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [$2], [$3]) +]) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7e40448bd..92ce2cce6 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -306,7 +306,7 @@ endif __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) __LIB__libodp_linux_la_LIBADD += $(OPENSSL_LIBS) -__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS) $(DPDK_PMDS) +__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LT) __LIB__libodp_linux_la_LIBADD += $(PTHREAD_LIBS) __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS) diff --git a/platform/linux-generic/libodp-linux.pc.in b/platform/linux-generic/libodp-linux.pc.in index 962a4f78f..5125f83ad 100644 --- a/platform/linux-generic/libodp-linux.pc.in +++ b/platform/linux-generic/libodp-linux.pc.in @@ -7,5 +7,5 @@ Name: libodp-linux Description: The ODP packet processing engine Version: @PKGCONFIG_VERSION@ Libs: -L${libdir} -lodp-linux -Libs.private: @OPENSSL_STATIC_LIBS@ @DPDK_PMDS@ @DPDK_LIBS@ @PCAP_LIBS@ @PTHREAD_LIBS@ @TIMER_LIBS@ -lpthread @ATOMIC_LIBS@ +Libs.private: @OPENSSL_STATIC_LIBS@ @DPDK_LIBS@ @PCAP_LIBS@ @PTHREAD_LIBS@ @TIMER_LIBS@ -lpthread @ATOMIC_LIBS@ Cflags: -I${includedir} diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index 471bbcd51..b2193a168 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -13,17 +13,6 @@ AC_ARG_WITH([dpdk-path], [DPDK_PATH="$withval" pktio_dpdk_support=yes],[]) -AS_IF([test "x$DPDK_PATH" = "xsystem"], - [DPDK_CPPFLAGS="-isystem/usr/include/dpdk" - DPDK_LDFLAGS="" - DPDK_PMD_PATH="`$CC --print-file-name=librte_pmd_null.a`" - DPDK_PMD_PATH="`dirname "$DPDK_PMD_PATH"`" - AS_IF([test "x$DPDK_PMD_PATH" = "x"], - [AC_MSG_FAILURE([Could not locate system DPDK PMD directory])])], - [DPDK_CPPFLAGS="-isystem $DPDK_PATH/include" - DPDK_LDFLAGS="-L$DPDK_PATH/lib" - DPDK_PMD_PATH="$DPDK_PATH/lib"]) - ########################################################################## # Enable zero-copy DPDK pktio ########################################################################## @@ -42,22 +31,13 @@ AC_ARG_ENABLE([dpdk-zero-copy], ########################################################################## if test x$pktio_dpdk_support = xyes then - ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [], - [AC_MSG_FAILURE([can't find DPDK])]) - - ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + ODP_DPDK([$DPDK_PATH], [], + [AC_MSG_FAILURE([can't find DPDK])]) AC_DEFINE([ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], [Define to 1 to enable DPDK zero copy support]) - - if test -r "$DPDK_PMD_PATH/librte_pmd_pcap.a" && - ! test -r "$DPDK_PMD_PATH/librte_pmd_pcap.so" ; then - DPDK_LIBS="$DPDK_LIBS -lpcap" - fi - AC_SUBST([DPDK_CPPFLAGS]) - AC_SUBST([DPDK_LIBS]) else pktio_dpdk_support=no fi diff --git a/platform/linux-generic/test/Makefile.inc b/platform/linux-generic/test/Makefile.inc index dd21917eb..419a63d1c 100644 --- a/platform/linux-generic/test/Makefile.inc +++ b/platform/linux-generic/test/Makefile.inc @@ -8,7 +8,7 @@ AM_CFLAGS = $(CUNIT_CFLAGS) LIBCUNIT_COMMON = $(top_builddir)/test/common/libcunit_common.la LIB = $(top_builddir)/lib -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_LIBS_LT) INCCUNIT_COMMON = -I$(top_srcdir)/test/common INCODP = \ diff --git a/test/Makefile.inc b/test/Makefile.inc index d7e435038..857de4512 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -3,7 +3,7 @@ LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_LIBS_LT) INCFLAGS = \ -I$(top_builddir)/platform/@with_platform@/include \ diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 4af010002..6e66301be 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -3,7 +3,6 @@ include $(top_srcdir)/test/Makefile.inc COMMON_DIR = $(top_builddir)/test/common AM_CFLAGS += -I$(top_srcdir)/test/common -AM_LDFLAGS += $(DPDK_PMDS) AM_CFLAGS += $(CUNIT_CFLAGS) From patchwork Tue Jan 2 19:00:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123208 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9308004qgn; Tue, 2 Jan 2018 11:11:29 -0800 (PST) X-Google-Smtp-Source: ACJfBot87bwjogEKo3xaAM2UmvoVlRQ9ekEOGKXd5Hrl/WUHnYpHCOAJWPKoGiv2Bi8eX5Y2GbfX X-Received: by 10.55.170.142 with SMTP id t136mr10453002qke.114.1514920289520; Tue, 02 Jan 2018 11:11:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514920289; cv=none; d=google.com; s=arc-20160816; b=XggEUnT0PbJ37BY0O3Kh+e51mhATnYGtJ6Kltrh+0JNvG0eYBEkTtbOQgqm1RgFU1B 3gV8/BPCjuCUMSqyCOcpXVj+PD9tae9tP0Ci+az+4Csy5wytArRtppWSjNEGW3M2teC4 F6ZQrqRTlFIuEp4L9l27NOzGkw1y4XHiltTSzTj5iu/aMGOff97/z6OQn3wfxBSKmKJv Ct1rv/jRPVR50BAFE28l3Teurvm4ZwPzXTb7JsUXepkXrSKFsV95wBTwXsmkkRkLYQ23 4yBi3+zTiC3/UQukUZexPR6ByRbt8A85Z3pgKeNnQLIPdZ/KzZ46KbgSzs40EhQTkxba LvOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=d6v5ElIFzk+BxD7fs4K6etuvSQjOFsJm71OqezqhM8g=; b=bawtR3v4Wh+rye8yiS06DB9M+2YuSzBwx+LRBlDiL2Qb8F39hYN7GLjmjdTgSwG1oW bW0ztalm/5FVuxjU75fhIyJTEFOcNxtrJZy4RqJlvi03aayi2w4t0WVPv3/DhUDEw+KM LBU79hdIyI3ZMQS2i6gGjlyJ6OknwKbW2mspT+Aj5sCi6L6rFb5BfcEQUvIqMkK5HrUb y6nRJT8e3zt1aOTgNb3uVnUw68gvubxc3R2dYopzF8XT+7RpCTYWJ3I5yuowwNc6J91Y s1v8kor6RcEpl03wgXuo4zBddf/I8UptKwUNlMtr6nOglKxG8vcBSpUep8lpOTLxR7x5 Y5fA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 103si2182978qky.191.2018.01.02.11.11.29; Tue, 02 Jan 2018 11:11:29 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 185E161524; Tue, 2 Jan 2018 19:11:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 2F853616F1; Tue, 2 Jan 2018 19:03:07 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id BD46260958; Tue, 2 Jan 2018 19:02:46 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 8E9DA60974 for ; Tue, 2 Jan 2018 19:00:51 +0000 (UTC) Received: from mxback3j.mail.yandex.net (mxback3j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10c]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 954BE5101E33 for ; Tue, 2 Jan 2018 22:00:50 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback3j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id k9pAG1fh01-0ocGCIZZ; Tue, 02 Jan 2018 22:00:50 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0nNiwoxk; Tue, 02 Jan 2018 22:00:50 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:13 +0300 Message-Id: <1514919619-15466-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 8/14] example: add missing libraries to LDADD variables X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ example/ipfragreass/Makefile.am | 2 ++ example/ipsec/Makefile.am | 1 + example/ipsec_api/Makefile.am | 3 +++ 3 files changed, 6 insertions(+) diff --git a/example/ipfragreass/Makefile.am b/example/ipfragreass/Makefile.am index fa7d5c8bd..b98e066f8 100644 --- a/example/ipfragreass/Makefile.am +++ b/example/ipfragreass/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/example/Makefile.inc +LDADD += $(ATOMIC_LIBS) + bin_PROGRAMS = odp_ipfragreass odp_ipfragreass_SOURCES = odp_ipfragreass.c \ diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index 85905ffa7..eba9b8bda 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) +LDADD += $(OPENSSL_LIBS) bin_PROGRAMS = odp_ipsec diff --git a/example/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 847326fc0..14bc5dd66 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/example/Makefile.inc +AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) +LDADD += $(OPENSSL_LIBS) + bin_PROGRAMS = odp_ipsec dist_bin_SCRIPTS = \ From patchwork Tue Jan 2 19:00:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123205 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9305548qgn; Tue, 2 Jan 2018 11:08:56 -0800 (PST) X-Google-Smtp-Source: ACJfBotbMISMQepkX3o55I+eKY8DoWMFvfRhf3qr7uLbPhpBiqndVg1p78sx0+jrJB7EYlae/Bk+ X-Received: by 10.200.4.130 with SMTP id s2mr62815767qtg.170.1514920136875; Tue, 02 Jan 2018 11:08:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514920136; cv=none; d=google.com; s=arc-20160816; b=c9wIIt8/Hs/w694Lv5gbPrf6wCsbeNd1zXXHVs4PYlfe0dNV1xbZQK3BhPkD4OtQIQ EWKhZqpT7EWgv8K259GyXYjupMpJLwt0WvqXqGfc2NL+BqGSvWB8UzO+dFm9Dl6bKPQn /KNumDfvnV+we/FlZDy/ZzK2jCFZ1dfQdUbW8z1j+u+D+PtTRK/W46+57Rt0SlfHhon6 Ed0dtcfLUI0X77OIE4ZAxhZeeedNSKPUAAv0EgM89qddMnAR631t7Kj30Iojo+mWVwBp Zes39xuzAwWWnhH3ewa6ZWPqTZNqzBM+bnzcQjTFWasg4Hk4rl0jmj1YvlOOlvxKs/Mb 87AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=eONHG0vtsBUNgTYsCfiFUPVJMXit8xcTAUE7PPEEq8I=; b=UjystXPv15Rtjvw3nRorDDEFvFtSiwSlEaNhvmxhr4sEb+Vshyhr2In6FQMMB5DNr6 srJwvVea3KdOSm64XeClV54YVmAvYQ+WTuMUTDOGpNAdRqyGqMPKRfJyMXUBP0zs8Yhn vy2vLiu9qPrUBPRzFmF+8wkTD0RdTBwdPxI75nWgA+cgNYtVgSiuHCAgNaamqtpXtz54 oIQjcTyeae2EU5f1rr+8yYNP6PQTB0nSq0QnRVXaeJTVuuFWBHCcbcIT/IQGrFlNxFH2 GwgSecFIULcfRpG8JWZZWEzvUCptUktxhSMB8viqbQ7FpNRnpfY9JZ3miyC4MerImI6p Sxrg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id t73si2119394qkt.234.2018.01.02.11.08.56; Tue, 02 Jan 2018 11:08:56 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 896736170E; Tue, 2 Jan 2018 19:08:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 67C2160958; Tue, 2 Jan 2018 19:02:51 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 45645616ED; Tue, 2 Jan 2018 19:02:45 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 7464F60975 for ; Tue, 2 Jan 2018 19:00:52 +0000 (UTC) Received: from mxback16j.mail.yandex.net (mxback16j.mail.yandex.net [IPv6:2a02:6b8:0:1619::92]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 454FF181721 for ; Tue, 2 Jan 2018 22:00:51 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback16j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id xfWTJojLsI-0pLCbnFd; Tue, 02 Jan 2018 22:00:51 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0oNWARUS; Tue, 02 Jan 2018 22:00:50 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:14 +0300 Message-Id: <1514919619-15466-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 9/14] travis: run tests with dynamically-linked tests X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fa352b572..a70df39d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ env: - CONF="--enable-schedule-iquery" - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" + - CONF="--disable-static-tests" - CROSS_ARCH="arm64" - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - CROSS_ARCH="powerpc" From patchwork Tue Jan 2 19:00:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123212 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9311875qgn; Tue, 2 Jan 2018 11:15:41 -0800 (PST) X-Google-Smtp-Source: ACJfBosZMbAKILb0k2zZxb6gDxoOScZKHH9MRXOrO+6L8ptM37/rYYLXLBT8KfEf944gfc7BiD5L X-Received: by 10.200.51.107 with SMTP id u40mr14187826qta.152.1514920541665; Tue, 02 Jan 2018 11:15:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514920541; cv=none; d=google.com; s=arc-20160816; b=sccLop1ngBl35Ntwx8lR0/OMx0PDmsFtIRvHcJDzu3oJTQGlvzFAtu1sWS4ob3vDxl AvXm+o4KDJKTmv6ZUm3RjteeNPZU0MAdUtmLmZFztMlw3h3utsspeSghSsV0k86cNqMU aGMEKAFq1McP6cdiHwyXn3jJ9qCZasLl5t/q5wKph3G/UKZvIdTmpLPUkIy26TwOLVMZ b/dhO1NSeQBPJXBK3s0/Ezhrtyn9L3msooHRJmtWHrQQKuIKDmjQdpBNSOeJtm7o23HI OFZ+rdqriCHK8dDcIIt0yiFm6YvBOOvYlbFyD72B6X27jXL+NnMLzc6xY+n5nuz5yam6 dgoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=jaIINz/iKv4nFVgjHhFmK9HK8I2AdExEkWsk+qMAfaU=; b=rosZYyhT7hoW9uypxWdbF2p7pFTJ1OFwhuQh5SuEQ6mrH5T1TJf4SF7DwurHaIV+zO /Y/9qx+NHsvXhIPsVDunMdwqPFJoRlHP7wBsOJlSSlrTAHcCb0pFXnBqDjHE/ZlCntmN 495NdihFC0dNKdkMej+GqtirdA4Crx0rnjtsW0NlMcVsDeOfETR0hyZt/KVgXKIvIgGe JSSEJikCcUt6sh9ikBB18MPR/5+Le0bG93qZQ/WVEmBVuIxSi6WnYxfTZmv1Eap/jTOL ZDWYfU4ftpxSIa0+oUAdUGvyxmi/toeR6vFwnEk9TTwzUjRzLaSVKekZyKq8TiTTAgsn JFGQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id u64si2762386qkd.303.2018.01.02.11.15.41; Tue, 02 Jan 2018 11:15:41 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 2F8A261744; Tue, 2 Jan 2018 19:15:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 6073E6170B; Tue, 2 Jan 2018 19:03:31 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 39C7060A4A; Tue, 2 Jan 2018 19:02:52 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 578606097D for ; Tue, 2 Jan 2018 19:00:53 +0000 (UTC) Received: from mxback11g.mail.yandex.net (mxback11g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:90]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 32605430187E for ; Tue, 2 Jan 2018 22:00:52 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback11g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 5odmIdOH93-0qZerb9G; Tue, 02 Jan 2018 22:00:52 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0pNKhdWb; Tue, 02 Jan 2018 22:00:51 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:15 +0300 Message-Id: <1514919619-15466-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 10/14] helper/tests: use common Makefile.inc for tests X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ helper/test/Makefile.am | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 8eee643be..662d6c758 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,26 +1,4 @@ -TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} - -LIB = $(top_builddir)/lib - -#in the following line, the libs using the symbols should come before -#the libs containing them! The includer is given a chance to add things -#before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la - -INCFLAGS = \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/helper - -ODP_PLATFORM=${with_platform} - -AM_CPPFLAGS = $(INCFLAGS) -AM_LDFLAGS = -static +include $(top_srcdir)/test/Makefile.inc EXECUTABLES = chksum \ cuckootable \ From patchwork Tue Jan 2 19:00:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123207 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9307276qgn; Tue, 2 Jan 2018 11:10:43 -0800 (PST) X-Google-Smtp-Source: ACJfBouaazSvm36oGyUK4QW7ZLTZ2/0OkXXZb9bgS1d6OETZeqUFlYhpcO3Oeh9yvDmbQcVH1xZi X-Received: by 10.237.35.37 with SMTP id h34mr64558754qtc.9.1514920243812; Tue, 02 Jan 2018 11:10:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514920243; cv=none; d=google.com; s=arc-20160816; b=aNQK1+AywztX8aHzHgDjLo1bfLqfbcXMwAT+/CtAPTehJ1bG+C4QvZzu3QPMvsqvC5 SJcNkawBy84PO58BO+obbeijjGOz4hNliwBAph0PiVdNEbS5kI3G1U4tuSSOrXNz5pCA TxDfOCucN/tK/FXT5CXeQQtItKwMF7k5eHDAa+5jZrxjRYKM6KZhEe2TRYNbKD8H1+f4 rynCh+Ar6AoCiUIw4ZlVUjLeDrHlGr+bKhu1rQzkrklckqgklJkhQmGAbZWQUYHPTlAY WXtqeS0yCgKb3cR0YuUl801m2pKOXsvhRVXf4/ypK2zLbBsdCGRRo5c/Mh6LmuFf0ODH OMJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=5BpnUOLxwjo+du1z0v2BTWUsjwuebe/fRKCB3X8Ir34=; b=Gz0md4sTq+633qG/+l7kPlUAc/d/jGBJcpEhz0ftgMBHGS/8/cF5wvygH3RoKyWsXu vUVFRAACu/TqOwCRcmGVMn9hoTISm84b4UR6Q12dhjmO4HYLensTkT1RU3+NZY9C069w LRk4SFfYoENIQVrmiSeStCDlto0WrKdMbKbAiPQlKWa3uIdIb4FGuFuvhw6Az6yQ/S2W UsfyDUQB3o3YQh+SekAHq2tSLP0JUJGmPxqJjCn4RRODOpR+fGZxGvjTUqn7yb3k0rv3 2aMcwpiFa9uC9sAxSQk4/pTKyRGhdL17kiiX5A7vJYLttC6TzRYHB78+Sg7hjg7iyGzJ L56A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id l73si3807229qkh.130.2018.01.02.11.10.43; Tue, 02 Jan 2018 11:10:43 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 3ED7E6172A; Tue, 2 Jan 2018 19:10:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id DC47860A4A; Tue, 2 Jan 2018 19:03:00 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CF7AE60912; Tue, 2 Jan 2018 19:02:45 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 1944860912 for ; Tue, 2 Jan 2018 19:00:54 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward106o.mail.yandex.net (Yandex) with ESMTP id D47AC782D17 for ; Tue, 2 Jan 2018 22:00:52 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id UH8HRubBSf-0qxuDAf3; Tue, 02 Jan 2018 22:00:52 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0qNuAlcL; Tue, 02 Jan 2018 22:00:52 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:16 +0300 Message-Id: <1514919619-15466-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 11/14] validation: time: use time() instead of clock() X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov ODP test for time API uses clock() to compare time against. However clock() returns processor time used by program, which can differ between runs. Use time() as a time source to compare against. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ test/validation/api/time/time.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index c8f90dbac..95422b683 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -423,11 +423,11 @@ static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns) { int i; odp_time_t t1, t2, wait, diff; - clock_t c1, c2; + time_t c1, c2; double sec_t, sec_c; odp_time_t sec = time_from_ns(ODP_TIME_SEC_IN_NS); - c1 = clock(); + c1 = time(NULL); t1 = time_cur(); wait = odp_time_sum(t1, sec); @@ -436,12 +436,12 @@ static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns) wait = odp_time_sum(wait, sec); } + c2 = time(NULL); t2 = time_cur(); - c2 = clock(); diff = odp_time_diff(t2, t1); sec_t = ((double)odp_time_to_ns(diff)) / ODP_TIME_SEC_IN_NS; - sec_c = ((double)(c2 - c1)) / CLOCKS_PER_SEC; + sec_c = ((double)(c2 - c1)); /* Check that ODP time is within +-5% of system time */ CU_ASSERT(sec_t < sec_c * 1.05); From patchwork Tue Jan 2 19:00:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123211 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9311105qgn; Tue, 2 Jan 2018 11:14:43 -0800 (PST) X-Google-Smtp-Source: ACJfBovEr6WQ+qdwDT/lgPtuLiTgs6jyXs1D6Eq+ruW1lSUHJqCMhuwwO6ee0gGXKyK7vV7Zg4kP X-Received: by 10.237.63.233 with SMTP id w38mr1355081qth.213.1514920483800; Tue, 02 Jan 2018 11:14:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514920483; cv=none; d=google.com; s=arc-20160816; b=q3kfqkDyP2tvoNPVdnzIeRDn5DLS2Bkg+ylbeRAWn63qI/PIDvyMfLhfmK+Gx8joWV cQxMU+tnzSKKeD2b51R/JL62lJNfLBvxheIjIskJxhnmPbOBv/81GOoDBmncYE2zOF3N YDWJyX8jzhnM3r0yaB6pqt2iEjHI+ODd9pSzoXDifFbKWfbjteslm2CWgPeqQ/RDF+P2 mebLeq1VcXnDcPfwFrZ/DiUHWdGixxSHu1zOXIr/zNS2CV9Ys0PvqboLshC0AaMbZ1ML o7Yp547uImyAVRi3UR6kzqkin5CpTm1WC3oU5zlyA681a2gNw4khcI6niZvSeLfkuQku 4BtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=pY9oh7nVbEvjQWYPEKOmobKzMeHirG4aI3WJHJ4CswQ=; b=Qj6QnsFrNoCRbWMSWOnl+e3MZwzfzLI9YKSZcHmqwCgB9YkJ15Aeymhsc25w9QBFV+ IseEqkxa0dbnrqiiYyMg/KuXZ1aDyP4MJd7gSIwR4YHm8sCLUDdKfT5AtmEyEfmmJbHv wBneRecFJ5YfHA2blLz2vn4fVOgJVWgYJAOo7mPOFe8mRFSYxVMT6K5PtzdYoeq+m6sA JJpLEcf2Ju68PImzuXiW+yBkmw1sRkkY4M3qFpyMdwQnePrIxiNvhKkIRZr44J9sg64V aY4cIukTByykYGbPRYycSVnhzgsSHMLNUWEK5dYmP3VAMx5DCA8GXVquGp64ZOyFqEYP lxug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id o31si14771075qkh.66.2018.01.02.11.14.43; Tue, 02 Jan 2018 11:14:43 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 8603761739; Tue, 2 Jan 2018 19:14:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 21A9561704; Tue, 2 Jan 2018 19:03:30 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 32AEE60960; Tue, 2 Jan 2018 19:02:51 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id A219560928 for ; Tue, 2 Jan 2018 19:00:54 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 6FAC321829FC for ; Tue, 2 Jan 2018 22:00:53 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 4m1UYHN0aP-0rrKaoA8; Tue, 02 Jan 2018 22:00:53 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0qNWAseH; Tue, 02 Jan 2018 22:00:52 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:17 +0300 Message-Id: <1514919619-15466-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 12/14] linux-gen: don't use SYSCONFDIR X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov sysconfig is not used in TigerMoth, so let's drop the variable in linux-gen's Makefile. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ platform/linux-generic/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 92ce2cce6..b7a8ff255 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS += -I$(top_builddir)/include AM_CPPFLAGS += -Iinclude AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default -AM_CPPFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) From patchwork Tue Jan 2 19:00:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123210 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9310374qgn; Tue, 2 Jan 2018 11:13:56 -0800 (PST) X-Google-Smtp-Source: ACJfBouWKpwPRzxDldmb3CzgCFCPJhhGS/lJlMZZpUFnRAT0CgKIcFckwp1+6kQdIDI8lJFZU6Mb X-Received: by 10.55.16.39 with SMTP id a39mr63289390qkh.97.1514920436075; Tue, 02 Jan 2018 11:13:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514920436; cv=none; d=google.com; s=arc-20160816; b=F+/Symh3J6KdIA8t19RsNUppNV+3bSKkV+8ozwKIfm6zTJ5hnex9yZuO2hXWJsnLrH 8Z7pfXo/4eL3jIaSB9KWiw1gWmwDTUX4PIKZxnl2tDjSFXaWSbbAHD4ZZAu4CPpE0jSV 5wGJ5OUXlhNEqSZVCQC+sP30nmh9JujPHN9oxiD9Y9IFzryiyGlyYBsQtz265EPNcgna 1Xaf/3kGTb1Ss+kQM5MnWPiS08d4gcBU4Su9eb344L9OWTKbix7iYd69yEb0wq5Lbm8p Y1iYHYHkNXAA5oZ6goBrtJUSXJFwvA5oZw3HGk1GaiV9MaNN8UceM/eBJTAxrmEAO9BB Lnew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=E9bHNDZFqugTe9KG9ANSvt+imMnGWTZzt0lDLlN1V2E=; b=qKd0Stg4SYXOUblovszYAdSUorXXQMA6IFJCL1gFbAkwxjvXvsCLi3P34IbFFEGyfH viS71IbvMsoFMK0o5FNfyUdybeDZwMpTBJ0Kf0sHdrSlHf+lgiyxQX8ExjfHTmKxMmxn Fl6NwhE9+j/skENrtzOIQ6SU6/51NDf1L3oPzHnQOlKcX+WuxBJlJxDX6LElGsCsLbR6 op615hlV5wgDDLxu4JBsCMLXAxl7orJgI++O9F1kTCHn7lNR8VZLwekn1bjxhhIpYWQs LDM9NI5iNfmNydt2NRR4D7hgvbAtapOLL34tBtmENBiBaibitaDEvtRl0IfDtmwSxc7Y /LyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id q36si9267327qkq.13.2018.01.02.11.13.55; Tue, 02 Jan 2018 11:13:56 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id B80B76173A; Tue, 2 Jan 2018 19:13:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C7E72616FA; Tue, 2 Jan 2018 19:03:22 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B84FC60960; Tue, 2 Jan 2018 19:02:50 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 45BFA60A4A for ; Tue, 2 Jan 2018 19:00:55 +0000 (UTC) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 458001817FF for ; Tue, 2 Jan 2018 22:00:54 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback8j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id mlQZHh95oF-0s7m2GZF; Tue, 02 Jan 2018 22:00:54 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0rNi4ctd; Tue, 02 Jan 2018 22:00:53 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:18 +0300 Message-Id: <1514919619-15466-14-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 13/14] tests: don't use ODP_SYSCONFIG_FILE X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov libconfig is not used in TigerMoth, so let's drop the variable in test's Makefile.inc. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ test/Makefile.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/Makefile.inc b/test/Makefile.inc index 857de4512..267c28a26 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -27,5 +27,4 @@ endif @VALGRIND_CHECK_RULES@ TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} \ - EXEEXT=${EXEEXT} \ - ODP_SYSCONFIG_FILE=none + EXEEXT=${EXEEXT} From patchwork Tue Jan 2 19:00:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123213 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9313495qgn; Tue, 2 Jan 2018 11:17:26 -0800 (PST) X-Google-Smtp-Source: ACJfBou7VVbHHsQlLShL1IzIOnSQxFlevyItbPHcYKrto9M2I/K2u9g9RjoIueMh12FtHfRZogBl X-Received: by 10.55.12.69 with SMTP id 66mr59938705qkm.93.1514920646239; Tue, 02 Jan 2018 11:17:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514920646; cv=none; d=google.com; s=arc-20160816; b=QRTD0j1Zhm0xz3/h09rNFQXPINBa40iR8Dun2iVJNRn4QeYo44r5WRbJXhJzp0qhVj ADti0nJMEExd5x6ytznZ1pjV2cnhbX8HQrp6IoiSHBytOMvzo6DPDb53cfIfljrnfQfz vN+QIvdht7qVUIIi+Z726+ZREEHJWhT4xuBao3+WKB+2+RrQ7i653vqsubQeKmHGaojG orDojZvrqVcGr7lZElR1OgXbOsKpGA5wLccYSQZeYCPYsvLaK7HHkyz8FU3749iKD3o1 xcBFM+PTsi86YG14xFBPyIJgtaOF4GaZ1ocACJKSZkgz9CeKqoJV7iSIgbzG99qxMEbZ Olkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=JMP9boH9vqLR9Sk5byEre56UO34G4QH2n3k3jozxDzY=; b=XOOA4mlGGrO8sBdTK1wIoe9N0nJbnN2dxoTiwNUWZSAbHE78Nq6IvkPCGozJXGpdcL fmLgkBD6qD1zyjVsYbH/02CNn/lQB7xEzVRJ+CKIdf1Ada2XWsqLB4F56Xx0oyv1Msr8 K5i6B84xQuLbn2v5Bpqiz8+0Vuh549SZ8RLCFbvSCNE9EsaOn8IVJKs4dKRggYWMbL86 cFOGFWfUWZ5FQvmSZl2bXCMdCOWPV63EEgJKYe/qp6rgMitcwxKWVf6mGUQgcjLMM4GR +M7wczS9oPiS5LaSgdDsgb/rBTeUhBqw3i6UUWbGr6fKiifpp0jeCffpgrZfVNAFF35z FXMA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id p10si1182760qtf.100.2018.01.02.11.17.26; Tue, 02 Jan 2018 11:17:26 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id EB114616E6; Tue, 2 Jan 2018 19:17:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id CB7666171D; Tue, 2 Jan 2018 19:03:50 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C812B609AA; Tue, 2 Jan 2018 19:02:56 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id B93E160997 for ; Tue, 2 Jan 2018 19:00:56 +0000 (UTC) Received: from mxback2j.mail.yandex.net (mxback2j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10b]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 8E961134201E for ; Tue, 2 Jan 2018 22:00:55 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback2j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id gbaacMrHUP-0tnq9n9v; Tue, 02 Jan 2018 22:00:55 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VfOU5TsWNg-0sNWbwba; Tue, 02 Jan 2018 22:00:54 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 2 Jan 2018 22:00:19 +0300 Message-Id: <1514919619-15466-15-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> References: <1514919619-15466-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v6 14/14] example: ipsec_api: remove file conflict with ipsec example X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov ipsec_api example installs program with the same name, as ipsec example does. Remove file conflict between two examples. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: ef18568eed1d993a510166c16e978a3d9014ac83 **/ example/ipsec_api/Makefile.am | 27 +++++++++++----------- ...sec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} | 2 +- ...c_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} | 2 +- ...ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} | 2 +- ..._tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} | 2 +- ...c_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} | 2 +- ...run_esp_out.sh => odp_ipsec_api_run_esp_out.sh} | 2 +- ...p_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} | 2 +- ...tun_out.sh => odp_ipsec_api_run_esp_tun_out.sh} | 2 +- ...ipsec_run_live.sh => odp_ipsec_api_run_live.sh} | 2 +- ...c_run_router.sh => odp_ipsec_api_run_router.sh} | 2 +- ...c_run_simple.sh => odp_ipsec_api_run_simple.sh} | 2 +- 12 files changed, 25 insertions(+), 24 deletions(-) rename example/ipsec_api/{odp_ipsec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_esp_out.sh => odp_ipsec_api_run_esp_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_out.sh => odp_ipsec_api_run_esp_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_live.sh => odp_ipsec_api_run_live.sh} (94%) rename example/ipsec_api/{odp_ipsec_run_router.sh => odp_ipsec_api_run_router.sh} (85%) rename example/ipsec_api/{odp_ipsec_run_simple.sh => odp_ipsec_api_run_simple.sh} (87%) diff --git a/example/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 14bc5dd66..848683e00 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -3,22 +3,23 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) LDADD += $(OPENSSL_LIBS) -bin_PROGRAMS = odp_ipsec +bin_PROGRAMS = odp_ipsec_api dist_bin_SCRIPTS = \ - $(srcdir)/odp_ipsec_run_ah_in.sh \ - $(srcdir)/odp_ipsec_run_ah_out.sh \ - $(srcdir)/odp_ipsec_run_ah_tun_in.sh \ - $(srcdir)/odp_ipsec_run_ah_tun_out.sh \ - $(srcdir)/odp_ipsec_run_esp_in.sh \ - $(srcdir)/odp_ipsec_run_esp_out.sh \ - $(srcdir)/odp_ipsec_run_esp_tun_in.sh \ - $(srcdir)/odp_ipsec_run_esp_tun_out.sh \ - $(srcdir)/odp_ipsec_run_live.sh \ - $(srcdir)/odp_ipsec_run_router.sh \ - $(srcdir)/odp_ipsec_run_simple.sh + $(srcdir)/odp_ipsec_api_run_ah_in.sh \ + $(srcdir)/odp_ipsec_api_run_ah_out.sh \ + $(srcdir)/odp_ipsec_api_run_ah_tun_in.sh \ + $(srcdir)/odp_ipsec_api_run_ah_tun_out.sh \ + $(srcdir)/odp_ipsec_api_run_esp_in.sh \ + $(srcdir)/odp_ipsec_api_run_esp_out.sh \ + $(srcdir)/odp_ipsec_api_run_esp_tun_in.sh \ + $(srcdir)/odp_ipsec_api_run_esp_tun_out.sh \ + $(srcdir)/odp_ipsec_api_run_live.sh \ + $(srcdir)/odp_ipsec_api_run_router.sh \ + $(srcdir)/odp_ipsec_api_run_simple.sh -odp_ipsec_SOURCES = odp_ipsec.c \ +odp_ipsec_api_SOURCES = \ + odp_ipsec.c \ odp_ipsec_sa_db.c \ odp_ipsec_sa_db.h \ odp_ipsec_sp_db.c \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_ah_in.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_in.sh index c5b105f59..becfc8928 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_ah_out.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_out.sh index c8926d5ac..023809a18 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_ah_tun_in.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh index a0d4c4332..40c488f04 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_ah_tun_out.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh index 74a0e3b42..d7118586f 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec_api/odp_ipsec_run_esp_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_esp_in.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_in.sh index 39e171cdf..cdb302ef4 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_out.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_out.sh index 98ab04e52..f1c15ffee 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_tun_in.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh index 7ef3e2d08..5d78479e4 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_tun_out.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh index 98ab04e52..f1c15ffee 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_live.sh b/example/ipsec_api/odp_ipsec_api_run_live.sh similarity index 94% rename from example/ipsec_api/odp_ipsec_run_live.sh rename to example/ipsec_api/odp_ipsec_api_run_live.sh index b506b2af8..9bc0a60f3 100755 --- a/example/ipsec_api/odp_ipsec_run_live.sh +++ b/example/ipsec_api/odp_ipsec_api_run_live.sh @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec -i p7p1,p8p1 \ +sudo odp_ipsec_api -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:both \ diff --git a/example/ipsec_api/odp_ipsec_run_router.sh b/example/ipsec_api/odp_ipsec_api_run_router.sh similarity index 85% rename from example/ipsec_api/odp_ipsec_run_router.sh rename to example/ipsec_api/odp_ipsec_api_run_router.sh index 31b9e7656..982a27e97 100755 --- a/example/ipsec_api/odp_ipsec_run_router.sh +++ b/example/ipsec_api/odp_ipsec_api_run_router.sh @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec -i p7p1,p8p1 \ +sudo odp_ipsec_api -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -c 1 "$@" diff --git a/example/ipsec_api/odp_ipsec_run_simple.sh b/example/ipsec_api/odp_ipsec_api_run_simple.sh similarity index 87% rename from example/ipsec_api/odp_ipsec_run_simple.sh rename to example/ipsec_api/odp_ipsec_api_run_simple.sh index ddda612a8..bdc2777c9 100755 --- a/example/ipsec_api/odp_ipsec_run_simple.sh +++ b/example/ipsec_api/odp_ipsec_api_run_simple.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \ -c 2 "$@"