From patchwork Wed Jan 3 00:59:55 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: 123239 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9592977qgn; Tue, 2 Jan 2018 17:01:51 -0800 (PST) X-Google-Smtp-Source: ACJfBotB1Ttj7T2tTmm3IwEaYuPGr/jMlX52KyFgZ1J68Ab4WxW1fsl1uZLtUeuvVmbJL8qk0oGi X-Received: by 10.55.179.131 with SMTP id c125mr6720028qkf.76.1514941311781; Tue, 02 Jan 2018 17:01:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941311; cv=none; d=google.com; s=arc-20160816; b=yKHvSPyiNVOoPDi/FgzOmP/rOOcnkacgCrxOur7dSGnfYOO9rUMbI5E5KQntHUUpnq iggHQ+35n+UES7DqwUzkFoMN1J+Mny+awHq6Kc4xc+DCbj6qMRpRGrKPY3351jms6fIf Izr2s2620VUf+B4mAKz4vOLZrFJgkXVFzXx0AXjGXbo+FJf3dT/RA5X3gkYoS+h4ChRJ CxJ319uOX6IgIX2PFYGgx94I9TwwaGN1+vvpzWyjw8OH2suJ77t16s1w75alobqadL/R A0vMAT4zd247ffYJlOOCGX+BflRQiGE4NQAzpompsKLWRHdhZtRpUgWijNNdnJoSJzm7 Ox+g== 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=FXztWbaEbpxj6tH50RMT3rWcsNIgRTJ4uLErTairhSY=; b=ZmzgYwpof38VpBplEmjp+PEW94+lOpMLR68C4Cb2daTzl5yHSaHclm25jjvF4IW2Qm 7vaAksP20oHJp57Q0NQ+vQ3OqsDSfKAlH0bl1t+Y+pscfQbBKKfWbYRYNdDuIQE1afPd tIM1f5tjWCVI7VyNZA8I67PmJ3WDxJzE2y0mgRW2gf479+JPjaVbVPOEK2YbxUs/dJgB fyVeiNy8RNvKxyQc4Yq8kh1o4WFO/NV/nrDd61Mo4qayBMoQRok78+iaSh97MoVjbRkn bjryiSd2N2a23O4O9xgGKimB+W1f4F/KuYFjMz0zpo4G2nY6GJ6Zy91G22X/CNFD8X/U rEiw== 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 e38si1825085qkh.319.2018.01.02.17.01.51; Tue, 02 Jan 2018 17:01:51 -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 42C8C60953; Wed, 3 Jan 2018 01:01:51 +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 7A3A160846; Wed, 3 Jan 2018 01:01:02 +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 EA0FE6084F; Wed, 3 Jan 2018 01:00:53 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id E67236071D for ; Wed, 3 Jan 2018 01:00:23 +0000 (UTC) Received: from mxback6j.mail.yandex.net (mxback6j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10f]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 3D1DE6A82324 for ; Wed, 3 Jan 2018 04:00:22 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback6j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id JAGBzfrXIe-0MqKYELY; Wed, 03 Jan 2018 04:00:22 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-0FteILCx; Wed, 03 Jan 2018 04:00:15 +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: Wed, 3 Jan 2018 03:59:55 +0300 Message-Id: <1514941208-27772-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 00:59:56 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: 123240 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9593849qgn; Tue, 2 Jan 2018 17:02:53 -0800 (PST) X-Google-Smtp-Source: ACJfBovcywgaCvanTlQKdco16aLCRAci+vstU4RRw0ucOOjSvDN2FNqjOq2ChvsQVTk69oE4zH6n X-Received: by 10.237.62.240 with SMTP id o45mr63136754qtf.141.1514941373354; Tue, 02 Jan 2018 17:02:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941373; cv=none; d=google.com; s=arc-20160816; b=vHR6uxhNudm+It0UWOnI2ntqlS1/O6nQCYqEKJcwA44pSy4wLMR3UpH4AqfLopahex zgPiPbeYPbN3iU6r31ahX8INzM/ThREhlPBcJK/A8u5QTvxzCctRAuA8M6nEFgIRMa+6 j8juTKQuyCzJ+ozC0ceRV3TRb9tUNjh3A69yd+dO1m1cOvWqMA6ArRo8EMCmD/yKVbDs RiKLGl6prdTFKP8sXVTKjXB9Biy/1B31cWz59b+dsu/r3s2OcQOlYFcI9Di307rEjxrS uv/WsBrpCkyq5mobSfqcpBqTqLop3TJCeHN0i9Ne82wIgmEK0Cbb/rSjspPPqLAzgZXF HtEg== 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=3rVOt3t5R61NJgPlR6y7b6VPvGEv1A7V0NPjjLlVJck=; b=drRdHTfuCKe0k9jnBL7mroC8m1aDBBv8K5qpHEEYxk4BlnxVEEugGOKrTUsfRCsoey 3ezzAk61mOysthItcM9jiaBMRrhRblSpv4VAInKs5eBkm39vJ/iLsX52sXwZobWHL35i 3Q9UvtYeUAkdZ6iBf2Iv0bUy3wfHWgDi+6kpp3BkyqWgFG0/0SloH1BW7Wp0b3NIZyY0 iyL3R/+diQ64k54MHax5na5FuPIwVM+N6WAYkmGMYviZg1YIzyjS725GLHXiRAK+Pd7s BVGeGKcpaoCQw1pMhfBUQ4i/f3pYanP2Uy4JlCFdAh7X3MzbJaQSayxIeHBPd26Xmqby X9UQ== 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 a69si1612934qkh.222.2018.01.02.17.02.53; Tue, 02 Jan 2018 17:02:53 -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 106B96087F; Wed, 3 Jan 2018 01:02:53 +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 B3CCB608D9; Wed, 3 Jan 2018 01:01:10 +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 596576084F; Wed, 3 Jan 2018 01:00:54 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 07CC760846 for ; Wed, 3 Jan 2018 01:00:30 +0000 (UTC) Received: from mxback8g.mail.yandex.net (mxback8g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:169]) by forward103p.mail.yandex.net (Yandex) with ESMTP id C05992182151 for ; Wed, 3 Jan 2018 04:00:28 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback8g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 6R4wUZo7FU-0StaB1ds; Wed, 03 Jan 2018 04:00:28 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-0MtqLnrE; Wed, 03 Jan 2018 04: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: Wed, 3 Jan 2018 03:59:56 +0300 Message-Id: <1514941208-27772-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 00:59:57 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: 123241 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9594665qgn; Tue, 2 Jan 2018 17:03:52 -0800 (PST) X-Google-Smtp-Source: ACJfBosQPFtHdiryIthnQUWENhTKDKSZeN/hJaBHwdHAX9MXUt4N9nsne9KH33COTMzLcgN7+e8r X-Received: by 10.200.27.200 with SMTP id m8mr60297693qtk.102.1514941431967; Tue, 02 Jan 2018 17:03:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941431; cv=none; d=google.com; s=arc-20160816; b=E6GGy8JAMlTJIaJepNeokNhaPDbaxy7CfFluo3ITfJYoAv6jmrRxXxOFAjj//h0eNQ 4hWnMV3ZN4wKy965mg2eMaGN8BXwCsKr/XZNhvK4/OTVk7l8OgImWan4gy7vV5cgmKTo iAS8lf3K2T9sAnW/KVYkISrx03qVMDLqtuvJBcf26gJZ2+aIZlx0E6ggpAWucDIV5HF8 uZmyeN7OBJvCXLmY0c7Qse0ns4aLpbRtRUUspSxBp/J91AujcCSKv7DMBPi3FHMg6bsv FGp/miubu4DUJV2YgD8/e/f+hBcMRo3YGSp2NrI5QUPZZfJBxaJRMtRxzfVE6i4mDNeR +jLQ== 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=Str4KvGom4T5dVn8QP9EnHso5kFNmBwnwAHmVLZXklM=; b=tTYPvynEx4HV/+xbfF/H5n8g03tbgZmNRLXkBJ2dihXJi09aa7suvxYvxmz3ILHObD YjAlYHr7c7bBgg5fXZYVlxLY5hmBISLU9KmPa3QL7S9DvPmh3RpDQbrcZ2/riz/wvDnk 41G9KGkc1FltqcuLo7iaCly+KhbMY3Nj0ul1HWneIszYK6qDk5kXTAeQWKTT3T4/4wF+ h1lRTKre+sEcyxzURCYK2VEp1ZsJCLC9Dd9iy1ZBOaH23wPok9J2/MNz4WD+duFpiEOh mJ60cpe2CWo2Gl0pyK8efg3hRHae6TIrZmiL8Vivet20rRXvEuMkYObq/5AhvNql9zot NUJA== 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 p71si271457qke.31.2018.01.02.17.03.51; Tue, 02 Jan 2018 17:03:51 -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 9F7E0608E8; Wed, 3 Jan 2018 01:03:51 +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 18A81608FA; Wed, 3 Jan 2018 01:01:15 +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 DB5D86084A; Wed, 3 Jan 2018 01:00:54 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 2B2E0608E8 for ; Wed, 3 Jan 2018 01:00:37 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 5E17C5A0291C for ; Wed, 3 Jan 2018 04:00:35 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 9PtpPvDchE-0ZXal7j8; Wed, 03 Jan 2018 04:00:35 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-0StG2mOb; Wed, 03 Jan 2018 04:00:28 +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: Wed, 3 Jan 2018 03:59:57 +0300 Message-Id: <1514941208-27772-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 00:59:58 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: 123238 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9592297qgn; Tue, 2 Jan 2018 17:01:04 -0800 (PST) X-Google-Smtp-Source: ACJfBouzdx9Zkry9B0A7xbTiG0ld77d3nMZWFAJ5/SNaZ0MYOgX8u08jEn7JJ1cdWjijN7UamKQa X-Received: by 10.55.8.11 with SMTP id 11mr58353009qki.314.1514941264624; Tue, 02 Jan 2018 17:01:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941264; cv=none; d=google.com; s=arc-20160816; b=wC9fLH9SJgXbnHs2luBMzVUVkgNdtN4lViXYtvgpqXeX+4a1lbFbdCr6PeJr0+x6XF 0Adr5ZgWS30pbOcbdJaKyqSCdc7MRnWYhqSYG8ARq6d+hGA6/4bgm76j6+xqNn95bPmk b2wq4Qanlpwz9Ovkcjw9NlXqd0cOwKPy94krMbXyT+wNS0SZaZSfrR52aMLJGGWbcV4e cd3bwoEuj7/ZnAJn4BFG9JWyEofsSmmjQN+uXOkOz8S81e0YFvcejbZHROhYO92XxSKc HaKBfKfm0ceTB/xDQLpecOI9qlzC0d1yGdDa95/QBZyO8lZe5d7wR/aAAxWGdMUkXn04 dAyA== 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=gqHFYDj7wja05MJXiuyNX0F5z18GCPP+Hy59mGh9jsY=; b=jFMegZlkeY11Qj8r52mytebgDIpFhifWa2RSJIZs5x5SPsYDlHlcc61HLj4IdAajvi poJjVIQiL8+DqSNKg47Y8yKu8wiLTozRkAd3IFmDInMaqIN9p/h7h+cPatR3FWhP/Ff+ bBqOCIlKpUVkw0tY7KtJmtMOkygWqRshjeWpWJOeiqe0edqpbZfytChAfRVx7JoKRNE7 mt7k8MdubIiJiq+bGYkzdnO6Z+oc1iAV442TFZURVTOqpoacwsMmwqZtrC4PX4nD2c6g 8cmiHV+z9kjBDg4BkEXgf0CApP2f/8E6UMLeC2txn8UnbpaHzF5Yiu77dcG1YbaFANkT KWYQ== 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 j184si12028473qkc.57.2018.01.02.17.01.04; Tue, 02 Jan 2018 17:01: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 4DF7C6087F; Wed, 3 Jan 2018 01:01:04 +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 3922B607BA; Wed, 3 Jan 2018 01:00:59 +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 D6CF66087F; Wed, 3 Jan 2018 01:00:53 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 4788B6084F for ; Wed, 3 Jan 2018 01:00:43 +0000 (UTC) Received: from mxback7j.mail.yandex.net (mxback7j.mail.yandex.net [IPv6:2a02:6b8:0:1619::110]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 071811802E9C for ; Wed, 3 Jan 2018 04:00:42 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback7j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id SzMIRNIK1a-0f9mV88X; Wed, 03 Jan 2018 04:00:41 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-0Zt4SmbS; Wed, 03 Jan 2018 04:00:35 +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: Wed, 3 Jan 2018 03:59:58 +0300 Message-Id: <1514941208-27772-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 00:59:59 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: 123242 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9595497qgn; Tue, 2 Jan 2018 17:04:56 -0800 (PST) X-Google-Smtp-Source: ACJfBouyJ2E4UZxy9RIP8UDzJjgg9zxVQK3SoLtmHTXuSEUPIFbykF9wXhtE59wbHcl1Qc1IauaK X-Received: by 10.237.63.184 with SMTP id s53mr64989405qth.89.1514941496233; Tue, 02 Jan 2018 17:04:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941496; cv=none; d=google.com; s=arc-20160816; b=BJSwFK6twD+DCXaWt1DQuolLvlJ2Uc90Z1hvdly36eLeXy3GdFeMmcDpiE1Zyr26AU AxNG7dueIwOMPOAezzXVb59Eixka4JShB7Kqy4JunR4xqAHDewCPfSpnoXbq7ItnsgVf 8yFrUG+VEi3azpMzTT1fac+ZinDGO+E9CB5cDN8X1oZ0+FsK8J60atigUz2gB/zk7S2l SSQEh64ilzic34yUoTcfAbHAXpRs9VSTje7voWMpnJPxPp2WCRGwiFGd3ExVimjrufq+ Zv9Xn2JuttbADO4NShS88JZ18lowlF9qgdLrZynXyDm4PBYp3nYChF2CcRx2w4RearW0 xG2w== 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=z1Q39jc4Vnu57b6ZSlQ/RwHHRs5gYBrdAevg52r19OU=; b=sqVabnHy64zY9L+WzaS2lPTNCcl4N4oJ959CE1OIpOwzTpNlPQndx5O/3UyLe07lvk zyTvOqjFwlRTJEkaTg6M2rg2baXenqO2pqKYiO+X3zTHoT9m90e6fRaogqUbWh08kamE 3+1/FrDEcKK9HVjqp8zhK6ffyWlmKTkXTabP89sVcWnbTGvWox5hY9d+OMS1d4/EiQcI XVsPAXSCMIhrc/9u4SJ2jVuNlTqgZ2kIyTTO0b2863Ldnvptd1pc0sv9IoRApOT4xIcm o0AglIqt4Gmgo/7HRhnOb5URPtQzxRavjPiP52Y07rRoXevVRgkQmx4Ae+TgsV9UM7B9 2+oQ== 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 n3si3416859qte.426.2018.01.02.17.04.55; Tue, 02 Jan 2018 17:04: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 D2B4A6096B; Wed, 3 Jan 2018 01:04: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 B5B846084F; Wed, 3 Jan 2018 01:02:53 +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 D5C496096B; Wed, 3 Jan 2018 01: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 43D14607BA for ; Wed, 3 Jan 2018 01:01:08 +0000 (UTC) Received: from mxback3g.mail.yandex.net (mxback3g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:164]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 62672182148 for ; Wed, 3 Jan 2018 04:01:05 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback3g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id hTsV3pdG93-15b4Xwmv; Wed, 03 Jan 2018 04:01:05 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-0gt4CiGq; Wed, 03 Jan 2018 04:00:42 +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: Wed, 3 Jan 2018 03:59:59 +0300 Message-Id: <1514941208-27772-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 01:00:00 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: 123243 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9596480qgn; Tue, 2 Jan 2018 17:05:59 -0800 (PST) X-Google-Smtp-Source: ACJfBoufBO0GMhFxRccQ2OaK8O29mUVRh//qt0Jd0TrDXqEYZ1k8d/fgteNCUwE5fxeZK9+xsC42 X-Received: by 10.55.168.215 with SMTP id r206mr65550557qke.268.1514941559153; Tue, 02 Jan 2018 17:05:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941559; cv=none; d=google.com; s=arc-20160816; b=Q/1ze5FxIO5Mn72i/1hJa/4Ez8n63C0nIpqevcWWe1KWIiRuf3sWNOBYzZXlsY03QS uNDYhjA45GmiRI+kQtRYnMcgw05WKgrp1S9iG0ZUO7qY8ZE92Xu6XyIa6C8AHvk1+N/I smOZuS58zZ+89DTKDajPnqp2839U5IltIQwutxRXyCY0TxsLmP7ud6qY6+ZJvtxJnwOj dJBuPS5t/Btd64cpqWkIUSHB5dQQzXdnJCFi4LtS+XT/G8nn9mv1MYZsZdcl0UKU9cTC 2hS2Mvi2OkeilnxCl5/pQOSLSdjIV6QhoxRSRHM0xVWILKPc9+wiPYsstESo9FF49h91 E7tg== 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=bzwpJH3pj+QYaClOzp3zcs5b5qwYEYZrYUrZanfYGzM=; b=mpQ/8VY6m5mg1BIK2WH/XcJ+gtgDgUsGb0LBWFqzESp4Ow4Rp6p5z7cliGbSlBDa6S j6z/pEvmmwp6JEte8DkUfm+PMRpSIs54esT9wtBH/sOXOzHJJgZ9KNfYtCRwBXzQvc4Y vMZMwMN/zwZfSubWNWyu6Rq0cwNoFR+F9A9mwjuSQ6NRPnYisS2cMu8AfcjpWdsHS1rv k03DYYiJSBOGaNVbxbsl7rCoAUHect8Ika7kpyv1dDogJrrInPevT2E6klbSC7jh1OxZ te5FgIYCrjMZJBF6G/thkSksmTOjLPB/lGuoQhRNe3smjOuz0lETbAdeEOQApdehLIJw ROTA== 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 94si8250307qtb.241.2018.01.02.17.05.58; Tue, 02 Jan 2018 17:05:59 -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 CF11A60B0E; Wed, 3 Jan 2018 01:05:58 +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 901C6608F7; Wed, 3 Jan 2018 01:04:23 +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 3D85D60961; Wed, 3 Jan 2018 01:04:16 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 4A86A607FE for ; Wed, 3 Jan 2018 01:01:21 +0000 (UTC) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 03EBE5102D38 for ; Wed, 3 Jan 2018 04:01:18 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id MxMYJCPleK-1Bm87OiA; Wed, 03 Jan 2018 04:01:11 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-15t4t5s9; Wed, 03 Jan 2018 04:01:05 +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: Wed, 3 Jan 2018 04:00:00 +0300 Message-Id: <1514941208-27772-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 01:00:01 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: 123244 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9597332qgn; Tue, 2 Jan 2018 17:06:58 -0800 (PST) X-Google-Smtp-Source: ACJfBotovM31UHPKKkHBFS2bDIhW8pjyYVQguw85H1UkZRLbGOfPJYCV9CfEKLOhD2s/INaWgGxm X-Received: by 10.55.115.194 with SMTP id o185mr16245762qkc.171.1514941617982; Tue, 02 Jan 2018 17:06:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941617; cv=none; d=google.com; s=arc-20160816; b=dXxCUSH5AXNxaRh7JHtVlEpOufD/B9QndJYdjrgPZ/GmeIadBemF60JacctFsHJFyD YiTiOEwyHXOkLazT26GrSGLope5wPdTP61QU/rYCasdDoSjLTJQPaBddxFPH6Z8t9CBX wLiMxOwlaSO3aG4hxB0INPRQ3MZicjRhQNl6NOmWNJ/ZFkaxbxNuLDfGIG1k01wxt7UQ +aiT1NtRlAkdyvbchBYQZMOZV5r6lAsxERFoxTGiDf0FnMBE/Xgb3ZYGFXCzkXnXyK0R sQkwX+O+OBWHhNODjcJ+t5oWr0cj14MLa0KQYhaxF/h+DGpaERG6am2p0CPrOVRzk+e2 Dz0A== 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=R2beRHiZeggrfAdTqLpeU4CGwrPdEpFh4voaIZQh3E0=; b=ab1752yjV2mhXvNfYvCuLp0HH0Zen8y165W7nWB2YCSjyGGGTgQF2yX5vYHLLLC2eI Kp8p5Gfwu9Dz/30gBHPEG/OEUm80z+aA2Qx/G4REOEQCn7XfT+0GxvipEUVF0GJqJEQJ 1sCWRsQoFYreIptsdckauuYiaUoRpRRfu1SOs+EBKkCknrEUSr3v4Sqfcz6Qh+PCeO1F vR1Qso0yPEsQYuBa9DGByUIH9GfCz5hzXLqFB2rXq8wLl7N4N7MqLoPrTe24kdZyDKRl 7aLzzNwG8ihoteTExk43qdnKw77aBPSlcOFIjUINgYdeffnsNkL4za8HazFFDf7DHz/n LlXg== 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 l185si4177510qkf.153.2018.01.02.17.06.57; Tue, 02 Jan 2018 17:06:57 -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 9C8AA6152C; Wed, 3 Jan 2018 01:06:57 +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 20C3C60846; Wed, 3 Jan 2018 01:04: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 AE16B608E2; Wed, 3 Jan 2018 01:04:33 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id 1C931608E2 for ; Wed, 3 Jan 2018 01:01:43 +0000 (UTC) Received: from mxback4j.mail.yandex.net (mxback4j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10d]) by forward104o.mail.yandex.net (Yandex) with ESMTP id C31E4701EE3 for ; Wed, 3 Jan 2018 04:01:41 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback4j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id dvGFGiKaEx-1fZufWTl; Wed, 03 Jan 2018 04:01:41 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-1ItqhU17; Wed, 03 Jan 2018 04:01:18 +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: Wed, 3 Jan 2018 04:00:01 +0300 Message-Id: <1514941208-27772-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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..1887b0431 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_LT="" + DPDK_LIBS="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" +], [dnl + ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + DPDK_LIBS_LT="`echo $DPDK_LIBS | sed -e 's/^/-Wc,/' -e 's/ /,/g'`" + DPDK_LIBS_LT="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS_LT $DPDK_LIBS" + DPDK_LIBS="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" +]) +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 Wed Jan 3 01:00:02 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: 123245 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9598550qgn; Tue, 2 Jan 2018 17:08:28 -0800 (PST) X-Google-Smtp-Source: ACJfBosTzJ/DPu46xruSmRnaQkihbHu4k/ZLmkflsMLEu22ZLJPF7tyCKnj4WYDKFM0zT/sZY+/E X-Received: by 10.55.217.85 with SMTP id u82mr62090334qki.113.1514941708207; Tue, 02 Jan 2018 17:08:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941708; cv=none; d=google.com; s=arc-20160816; b=EEC6csw5+28cM6rT1JuNCcu2fPQbUbI/309qmsURCF9tnP+tqrejnGTkWyz9o8fuZg 6iMfkHzMOsWsiVbhMrGL90VQJSdBkWoF+br22X8e21dorSeyd3eb2DU9Z+hMV+WKu/Yd hve0aOZOym/YcXPphhHyfAQvCu3BPVDPDDFhNRVlXc/Ktr6L/Utc12+Szik+fhxjiDVJ ay5y/A8dWa+qfhb0Wm8wZSgAiZTg4/iImooGnuCTk8EtBvhcLEgV5LyowRD6gs5wXidd zQu0/PAtqr+clSvPiNzgyVehVXrgLjp+kYBsrpAIDfNGPoFaw9DW4pXs67cpkxc+aWmB Rugg== 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=5nwuUf5W/jBh29mlwUbMW7VMuVC5QwvgvWaAHcTG68w=; b=BDxzvgoIKZ2SANcHT5rTL9iFqn5/iqRnkePOAvgRkB6GeSE+DTNRjJhGuK9O0bJUUB SwXJp5VQ5kW26Nm2hL59LFfINfZKsnqsdLjXCi4ii16EPqQh7/ILC8XARFOBFN8cODMm b2wYxX48pcxe8OtmFj+MMDQF2QKDHxlRBUdRR0q+0poyLxpMelRskaF4N2QnQ179iJbs af4+s905/rbDgDbk5v9MW8ZljFdA9E+vNYEntTBf/bcpqqObNpwnzq7EJmO+DK1AovAh DtI0hgplvXz5o7wT/mJ7lAEkiT3xj+eQKVdda7eYAT1rGWNfhbEO5cdeZ22Ra5i1bniR NNWw== 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 r65si2363024qkb.229.2018.01.02.17.08.27; Tue, 02 Jan 2018 17:08:28 -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 E04E0616B9; Wed, 3 Jan 2018 01:08: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=-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 5CE8160903; Wed, 3 Jan 2018 01:04: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 A8A5A608E2; Wed, 3 Jan 2018 01:04:41 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 922456071D for ; Wed, 3 Jan 2018 01:01:49 +0000 (UTC) Received: from mxback11g.mail.yandex.net (mxback11g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:90]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 432CF1342340 for ; Wed, 3 Jan 2018 04:01:48 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback11g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id mM7LuGkpQA-1mZS4bU9; Wed, 03 Jan 2018 04:01:48 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-1ftqSan9; Wed, 03 Jan 2018 04:01:41 +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: Wed, 3 Jan 2018 04:00:02 +0300 Message-Id: <1514941208-27772-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 01:00:03 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: 123246 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9599289qgn; Tue, 2 Jan 2018 17:09:20 -0800 (PST) X-Google-Smtp-Source: ACJfBotpdHo1lF09IvIfgDIDKe/efL+3OksQf6lKVbWBjulTBgUQpsgtmiuWg8qwlz6AG9DD1h5/ X-Received: by 10.55.131.196 with SMTP id f187mr58339708qkd.222.1514941760754; Tue, 02 Jan 2018 17:09:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941760; cv=none; d=google.com; s=arc-20160816; b=rwDjBivNeVlk1HL63DKhjEtwS66LW9/Lyj//xo3OzXPmP2t85rWWPupe1zKbcktJfG 8WcV/EJU0S7csKQssz3Ysa3Sz1IskmDE4xtH/IevYHI1JlTZj0sHzVOSJxvuhzfYiyPc +tlc1iy1odKc0xhN4jzD3/i8TLEoNU+UbpP3ZYYgMjPCLZnNoOuJM1fPMJq7V4Zd1tyq rUqucYnxBrDINT4y7Ntul7MB4U6qqsowMNg3i3M0YulRhXUGKNXcPnHyCY8BOk+5Z0dS 7BYqbJ+jX1ICWf8FRYdpXdpv745geMzO5+rAJ4WS9QSxyW+V0QKvn77ohGR+XeKUxdhC /TTw== 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=+LsTNPhUQpMABrDY8r0MPv2YDzdQrDa57OGP0gp8AXM=; b=TQa7I7GeXRa+hFuXxgtiJtBzvIJHAWQeEImIzMrBDl2PV38FeF3kKSlRMxN60STxO2 NDoJJYlXAhIxIkiLU0uxfWipsNqPGAJq1EL1wWEohL3SrycOBxNob+jOhu37d1TpNQ+7 F/NoKOGbIYKnK5PnFHPQftT20NzKAwwKtd4iigohJhwHvmgSrOfFNVQbKdYt4Ts8BpSs y1zI/UG+kHyImgZaQ52ydSERO5lei/NWEG5fgsOHxJLMESBvaAgFsvl5+ntuoBFTtFIR ibWZF5eoSWov4hZtETkNZwTwmC2YdpSHBvo9EyFS4spJ42n5afFmP32inKX6A+bifUyD Mhhg== 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 h9si2662259qti.441.2018.01.02.17.09.20; Tue, 02 Jan 2018 17:09:20 -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 6ABB46087F; Wed, 3 Jan 2018 01:09:20 +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 A20896096B; Wed, 3 Jan 2018 01:04:56 +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 17A0D60903; Wed, 3 Jan 2018 01:04:49 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 3611560948 for ; Wed, 3 Jan 2018 01:02:14 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward106o.mail.yandex.net (Yandex) with ESMTP id B0BC87811D3 for ; Wed, 3 Jan 2018 04:02:12 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id OZjVzMLKw2-2CX0065s; Wed, 03 Jan 2018 04:02:12 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-1mt41xd2; Wed, 03 Jan 2018 04:01: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: Wed, 3 Jan 2018 04:00:03 +0300 Message-Id: <1514941208-27772-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ .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 Wed Jan 3 01:00:04 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: 123247 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9600415qgn; Tue, 2 Jan 2018 17:10:46 -0800 (PST) X-Google-Smtp-Source: ACJfBotMXzLBFCieGKXGxm1c0SVd2J8OqtyDu5paL5Shi1q05dkmlzZawGkfOXI8DLCxZFnS90JC X-Received: by 10.55.27.156 with SMTP id m28mr37988078qkh.331.1514941846846; Tue, 02 Jan 2018 17:10:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941846; cv=none; d=google.com; s=arc-20160816; b=F7wAqiA33eXyfBQH323G2qWXj+a9g22/MQ6ClOzfn2Xc1BhmEeKIwTHh0m1WSeyhdp twTN9NP+JYX0X4TwyCGvEjbrQNY/0/eOCPlm9scH+7rrnMyT2IZui/RHTt0ZKiOkttNj Pt07LmQHKjGmjVFZ1eCV+l42iKyS11B4DOJ1rU7R4JZIT+pra9m/JThNIl1mf1YVLffM +ceaOrvW1fKFjZ/pXGxGtVnm6fBYtJjHbVRMFCf7E+ZiPMNWQeZjQ37xglDl3EiMt4qt 1oo9m5+1jdCwfQ6xOgPfuFB+XYkd5ad/3r8+eScP/UAYUSc46QpJgfoSDyUk7569U85d TKhQ== 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=ww0ATEbLc1tfpPKqlP2lLX+/IxZ/hSREFQyDCMeBGc0=; b=uuxpQT70ywYBfQnBRl+8n2dRzFylEhVEDFak2F6Lq4WBNbk3iUZpXxhcAVEptXhefI LsB8nJ0f1L7Ye/mc5eg0T9dtzR0KzsNx+ZN1HIFIr0F9A0bnkteen28l0GoMu/TwIPV8 RIYVRCzBD2nSMFmwROmB4bc6TbG9a/KwQx+MWiZ9ZwUja6NfvyzWe6Cnp6QT+B+t0lj5 gdSehG3K9XNwugl0tGcrGpumxB1fPNEx6cUL8eAEdnHcceNgRkVqHpVJYg7RvB4CFnaa 4/pl6Jrd+l3BIylmnIRcc5rv+y9I9lFCtDwuJZkjP62qqi/16rWxNE5JqlcNH7H5pMK8 Ur7Q== 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 m190si4627297qkb.363.2018.01.02.17.10.46; Tue, 02 Jan 2018 17:10:46 -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 84CFB609AA; Wed, 3 Jan 2018 01:10:46 +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 87B50608B4; Wed, 3 Jan 2018 01:05: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 BA1646095D; Wed, 3 Jan 2018 01:05: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 52BC96095D for ; Wed, 3 Jan 2018 01:02:20 +0000 (UTC) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 44E62782A5B for ; Wed, 3 Jan 2018 04:02:19 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback8j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id gEazxyphbR-2Jii3S9f; Wed, 03 Jan 2018 04:02:19 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-2CtSx3Rb; Wed, 03 Jan 2018 04:02:12 +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: Wed, 3 Jan 2018 04:00:04 +0300 Message-Id: <1514941208-27772-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 01:00:05 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: 123248 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9601254qgn; Tue, 2 Jan 2018 17:11:53 -0800 (PST) X-Google-Smtp-Source: ACJfBovU1RxPd3bmzxSdoJSGc61nnUufij2LEldeKOidH4aLK6g7koC4b2q3iR7GvnDkJagPqH/i X-Received: by 10.237.59.184 with SMTP id r53mr44982773qte.306.1514941913186; Tue, 02 Jan 2018 17:11:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941913; cv=none; d=google.com; s=arc-20160816; b=eu2yNXaixDbF6fvpsldgvlAQoyNez25hXuMA2eDGQP+z2nQ4VEJVLhvgVL1ytYpaaS BDSZ55ccqr7hrhXjOle6Yde6COWu9GWXTOris6nQ37rJj5CtIZhW4ztbV05U6vOBt+y2 0M+OVUskt4G+QbMpXP6bKGXWNLsxApcQwlKUu+ZGfFKdvpqOTr2gIqSWI8F9Lv5u0kaB 5lvSdXNLvj67C5h4ym6sT/cuBrKlghzSQP0VLmQ5TpNG3N0/jLzpf4DuXRYxKewfmvOx 4frk9sRF/onN9o7YDDET5TDfdkYlQzYby2EZdt9TENQhY2kIeSax2Oh9p1CS+XTugnc5 5LOw== 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=vf5afX+g8iYzVdfQEl7vEZTz/l/g+WJSknYk5xhrR0w=; b=XeSaGYEbkQW29TVJUYzYk0H3VLcF53gwC7tOOw1NDUJXPzd/ce7wiwkdc8j60+1ch9 zwHtltPB3WieicNxCn6vOBPZqKVB4+i4i56uMEWpv2xwHAI2XwWSYXxztEKdaUphNNW+ pilZwxE5SwvqQbhJq7FqcrZrpHojq/sULuC0jz/34zB9dE5XMtK6ivK9ev9dM+Atdt78 8QPGwhmVz6JE8JPj66FrYDRYF7NsKeMrX+ANoqp1kJjQQHLzcShTjhkK/GIdjvRA9vy4 esdwCJloIf0oQMDtVXJveb1rZvHI+x27tRWpBKZpdfap7Ov6yDNnhTJOcFY6UsZwZ/BV BHvQ== 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 h52si3279825qte.369.2018.01.02.17.11.52; Tue, 02 Jan 2018 17:11:53 -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 D4291609AA; Wed, 3 Jan 2018 01:11:52 +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 B6F2A60A6E; Wed, 3 Jan 2018 01:05:58 +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 9B5946087F; Wed, 3 Jan 2018 01:05:47 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id 159D36088B for ; Wed, 3 Jan 2018 01:02:27 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward103j.mail.yandex.net (Yandex) with ESMTP id B309634C2C1C for ; Wed, 3 Jan 2018 04:02:25 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ZBUQHmFRYy-2PSaDKF5; Wed, 03 Jan 2018 04:02:25 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-2JtSG0Zb; Wed, 03 Jan 2018 04:02:19 +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: Wed, 3 Jan 2018 04:00:05 +0300 Message-Id: <1514941208-27772-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 01: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: 123250 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9602303qgn; Tue, 2 Jan 2018 17:13:22 -0800 (PST) X-Google-Smtp-Source: ACJfBosOlKHWMr5d4odZcb62S8WVFssmWzMJQvT7ok7dS3qa/C9Ws5Pv9+MBrzb00GkcCYo/0aGV X-Received: by 10.200.46.167 with SMTP id h36mr65707049qta.267.1514942002250; Tue, 02 Jan 2018 17:13:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514942002; cv=none; d=google.com; s=arc-20160816; b=DQ7+rUjybHggJVfmkWqskURO3TPMGEECs0/H8gt5DX3/hIlQGqOIpulTAVoUXGi2Ho eEIjzZS+lok6RvIEl2n5Q2THu9wQ/rlkbjfvYu7g952VE/zV2BFYP6I8i/1JcEa4GKZe DzWyJ9VqIQBa1id8soEpK0kSveEWQcIgdQIeoudREU5s8obkeBMYxZZvtJWxDLc+Rs5c XMioIXXk+tiBFgWLNIsz7HAdsXLJd5oWJ28yGtsZdEbhxiN3JcIlPxUVAzOs0mZuHpIG v5uxpHH4Kye9X/Lfah6LrxqtxqsXQvnb9zTAUpjDbgyn72hjrYK7pMACQOk636m/cJxo fIFA== 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=KuB18kRRYpFCr/r3zPTgZRuPzarE4tU6gge7AzwKawk=; b=aqyQ1loxQr0kmLcsntlcKz47D5RUaKP5ihqJBIhSCibIvfFZ+wFAxTyVKyXamMUv1d E9YtKLaMObMenL0Qqp2OYVzDOrZqPZi4SMfn1DuZ+KihC+z0iqGQRA7kOHwdrtCtIckZ fmxUxy11jwSu4Gjvj2vGCZWnFaZsS+3XXSimcyhAT52xdLNIfkGc00vYK1XyVJ6WTscK i772Hltrh9Z1AseN3CGt3sN5Auq2kdg5daal0jry+rHViBRs1H3tCHsWLleI2lAUwNOb PBI9od2algAfXy0zsGkZ2dayyXZ7bQlwRQwpMOooNFFCQGWvJpgs7NM6QBSYGdDwmugL OfWQ== 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 m61si9930320qtd.394.2018.01.02.17.13.22; Tue, 02 Jan 2018 17:13:22 -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 F090560B0E; Wed, 3 Jan 2018 01:13:21 +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,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 4A6AF614E3; Wed, 3 Jan 2018 01:06:10 +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 7016B60953; Wed, 3 Jan 2018 01:05:52 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 79CE060958 for ; Wed, 3 Jan 2018 01:02:33 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward106p.mail.yandex.net (Yandex) with ESMTP id 2D1E72D82397 for ; Wed, 3 Jan 2018 04:02:32 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id swhWhemnLl-2WV0gH2L; Wed, 03 Jan 2018 04:02:32 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-2PtS8RCE; Wed, 03 Jan 2018 04:02:25 +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: Wed, 3 Jan 2018 04:00:06 +0300 Message-Id: <1514941208-27772-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 01: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: 123249 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9601716qgn; Tue, 2 Jan 2018 17:12:33 -0800 (PST) X-Google-Smtp-Source: ACJfBosGfNYUyssS3VEiC68AfQnxohOYKLolhT8hICc6+IUBJ6KC9zXeXI1ykVTw3MSabZtoKIUb X-Received: by 10.237.63.184 with SMTP id s53mr65015339qth.89.1514941953669; Tue, 02 Jan 2018 17:12:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514941953; cv=none; d=google.com; s=arc-20160816; b=lh6DPs8wia3OIw7qC9xyhvUFzE2LLKHUKw54zGI5V/bGt1W1HQ1wxK7H+2b0DQ/9eM 7AIsCJGAocbadLcHJhRI3Gv4ouXZJQbNpxI5SIbMeJG5ph37X1ll8J/eVSsaL2jas5uw +d9iyFsXvf5WG69jDBoIuIZu1HLgCa4B1XqYRj1Q8zl222jZ7wVwiRyG5m1E1GhQfy32 /g/KN1Db563m6Sd4IxVpJy2f+kF1KRZ/owx6z5MITSHI68aHGnm+OBB2Z4kZHQsqFn+A YJ/C35aVRkTHheizK2sgCKZGR4DFjWr2XkRG08Szyib2fDZ7cv3M2qBMbuYHZ2ZHYBtY btyQ== 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=IgIBnb8xu0Zdu3YaeDzfx5gm36czjBWbwysXy6Kusts=; b=Ps2afUSsDzyCVd7i10Y0DH97afzLVRAh+NGFmjLKPnoFwfyeWVIU/UOl72iytDkbJb doW9qnKGjAeZdX1rF0YduoIao5ScO7YSp5z7YkRKLP/jeEJLoMFhsCI5RNT49xE8vJtT Q2yAJzhvzch5h044vxXMj/Xr5e4aPftJDcRQj6wWl4IG6YwmSlmGUmbiSjo8HdS6ffzT yqqtGJaNzaRQ9lLAux1mIyMZXrwGKaBv1dO+IIt2T4B3t9YcOgHu2h0jPTjLbmt2MiJF iZ6hWFdXlDEVGlajuZSIOBqdwJxCIgX019vX7tKNW9eimhQ01L9Ev6lqYOgLaHW3H4HP 7CGQ== 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 c6si1166224qtb.368.2018.01.02.17.12.33; Tue, 02 Jan 2018 17:12:33 -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 60FAF6095E; Wed, 3 Jan 2018 01:12:33 +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 1791460C56; Wed, 3 Jan 2018 01:06:05 +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 6B66460956; Wed, 3 Jan 2018 01:05:51 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id A3D9660956 for ; Wed, 3 Jan 2018 01:02:39 +0000 (UTC) Received: from mxback8g.mail.yandex.net (mxback8g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:169]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 9AB1D51013C3 for ; Wed, 3 Jan 2018 04:02:38 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback8g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id uw5uYUI3bp-2ctCxjuc; Wed, 03 Jan 2018 04:02:38 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-2WteTsYm; Wed, 03 Jan 2018 04:02:32 +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: Wed, 3 Jan 2018 04:00:07 +0300 Message-Id: <1514941208-27772-14-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 Wed Jan 3 01: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: 123251 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9603166qgn; Tue, 2 Jan 2018 17:14:25 -0800 (PST) X-Google-Smtp-Source: ACJfBoub0DTqkn6oNARAhV9YoRNrTvz8UyA6VtZl2T6w31QGDWScc3jHlEQ//lTQMykCLDUQDSrC X-Received: by 10.55.153.197 with SMTP id b188mr37036544qke.36.1514942065877; Tue, 02 Jan 2018 17:14:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514942065; cv=none; d=google.com; s=arc-20160816; b=h1R34ZjQCP50CGeJS/62vBk/HfbA6/YEp5FMcB2y1SZNJ/rUq42lTQsvAD8ecA67gV VXo/6mZSN33yNNOfhoiCsUuyOZV4onnGFfY9viI/YLgMrzdw8M9NXDK8yyl+eFGKcHJp GaI6/RsoopA/LYdU/chdyZh7s/mv5uMKdikOqO4QUsXF/ESJKkpFZiKE9ecWaFe+UZzE hy6LlxoxPsVBLULMSFbQCNc5OvXXc9EQhWQ8fMK/gSTYmtooNHzZSMXjR6JhsDRbH7dK 2TvafIGszNm00mmLTaf4km8vtVJQ1WK/qDvaOYviwQ+xiB5RV8+oSPOGF4La9Zu3Bxfv nwow== 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=jhgSoj/FqJXwYKu0RoVHwFEw6Xo0b2aZJQ5PyqprGbc=; b=bi126pdHYQXKgcMwkf+6S4OLViYgdxyhe43GpfJJkOeXNZx5aRpknS/10fSm/HqjpT C2g/OhZvjILjcp3YTAoCijswy8/j42supNcE19/lsyuTq7rAD2Z9AvFXU+0Vb05cyAxL Gt9N7CtcnO+LQD8DhcWoiTOABd+QOdQyQ14cPZs6pqa0fVUcF26UW1zfLAClZJAyW0j7 dqoGEa4iXzFWbGynEeoJ/K7yL2xGASR/P4sHP1FYFAOiO60uLyHX8ocYGGmQRE+6BhYt p3bVcJ3lLZevGo/i1LXUK5K9Z+W6HtcdfXiEUGUPiFsBgZdUZuB1wIBdECI8poU31SZr OUBA== 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 d42si6149548qta.46.2018.01.02.17.14.25; Tue, 02 Jan 2018 17:14: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 683F460BF4; Wed, 3 Jan 2018 01:14: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 7C50D6151D; Wed, 3 Jan 2018 01:06:27 +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 25E8D60907; Wed, 3 Jan 2018 01:06:11 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 7524860907 for ; Wed, 3 Jan 2018 01:03:26 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 1F67712424FE for ; Wed, 3 Jan 2018 04:03:25 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id kIixiHwW4h-2jXuNADs; Wed, 03 Jan 2018 04:02:45 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RCuoSjuFoy-2ctefP0T; Wed, 03 Jan 2018 04:02:38 +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: Wed, 3 Jan 2018 04:00:08 +0300 Message-Id: <1514941208-27772-15-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> References: <1514941208-27772-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v7 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: d0774cfbe328bb3678434b9903bf0f8abb25611b **/ 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 "$@"