From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C8742A046B for ; Tue, 23 Jul 2019 03:04:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B8E081BFFC; Tue, 23 Jul 2019 03:04:31 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 455B71BFF6 for ; Tue, 23 Jul 2019 03:04:30 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:04:28 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11HgY026580; Tue, 23 Jul 2019 04:04:27 +0300 From: Yongseok Koh To: Marcin Smoczynski Cc: dpdk stable Date: Mon, 22 Jul 2019 18:01:15 -0700 Message-Id: <20190723010115.6446-108-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/ipsec-secgw: fix build error log' has been queued to LTS release 17.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Yongseok --- >From fcc745ad852d5d511d58319953b5c7dfc887c049 Mon Sep 17 00:00:00 2001 From: Marcin Smoczynski Date: Wed, 8 May 2019 15:09:56 +0200 Subject: [PATCH] examples/ipsec-secgw: fix build error log [ upstream commit 96d8ea839bded055fbbc01bfca44a7df3710e2ef ] Fix invalid indentation - extra whitespace before error directive which is causing syntax error when no pkgconfig file for the DPDK is found and RTE_SDK is not specified. Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application") Signed-off-by: Marcin Smoczynski --- examples/ipsec-secgw/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index 9fd33cb7f2..233a47abfd 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -30,7 +30,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ifeq ($(RTE_SDK),) - $(error "Please define RTE_SDK environment variable") +$(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:12.285062386 -0700 +++ 0108-examples-ipsec-secgw-fix-build-error-log.patch 2019-07-22 17:55:06.558477000 -0700 @@ -1,14 +1,15 @@ -From 96d8ea839bded055fbbc01bfca44a7df3710e2ef Mon Sep 17 00:00:00 2001 +From fcc745ad852d5d511d58319953b5c7dfc887c049 Mon Sep 17 00:00:00 2001 From: Marcin Smoczynski Date: Wed, 8 May 2019 15:09:56 +0200 Subject: [PATCH] examples/ipsec-secgw: fix build error log +[ upstream commit 96d8ea839bded055fbbc01bfca44a7df3710e2ef ] + Fix invalid indentation - extra whitespace before error directive which is causing syntax error when no pkgconfig file for the DPDK is found and RTE_SDK is not specified. Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application") -Cc: stable@dpdk.org Signed-off-by: Marcin Smoczynski --- @@ -16,18 +17,18 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile -index ac042e4ce6..75f2bcd00b 100644 +index 9fd33cb7f2..233a47abfd 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile -@@ -53,7 +53,7 @@ clean: - else +@@ -30,7 +30,7 @@ + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ifeq ($(RTE_SDK),) - $(error "Please define RTE_SDK environment variable") +$(error "Please define RTE_SDK environment variable") endif - # Default target, detect a build directory, by looking for a path with a .config + # Default target, can be overridden by command line or environment -- 2.21.0