[dpdk-stable] patch 'examples/ipsec-secgw: fix build error log' has been queued to LTS release 18.11.2
Kevin Traynor
ktraynor at redhat.com
Tue May 14 16:43:58 CEST 2019
Hi,
FYI, your patch has been queued to LTS release 18.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/20/19. So please
shout if anyone has objections.
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.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/0acafc986ed2f39946068b4b8aec2df10ea4c889
Thanks.
Kevin Traynor
---
>From 0acafc986ed2f39946068b4b8aec2df10ea4c889 Mon Sep 17 00:00:00 2001
From: Marcin Smoczynski <marcinx.smoczynski at intel.com>
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 <marcinx.smoczynski at intel.com>
---
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 02d41e39a..a6933801a 100644
--- a/examples/ipsec-secgw/Makefile
+++ b/examples/ipsec-secgw/Makefile
@@ -53,5 +53,5 @@ else
ifeq ($(RTE_SDK),)
- $(error "Please define RTE_SDK environment variable")
+$(error "Please define RTE_SDK environment variable")
endif
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-05-14 15:39:07.981262965 +0100
+++ 0014-examples-ipsec-secgw-fix-build-error-log.patch 2019-05-14 15:39:07.312558831 +0100
@@ -1 +1 @@
-From 96d8ea839bded055fbbc01bfca44a7df3710e2ef Mon Sep 17 00:00:00 2001
+From 0acafc986ed2f39946068b4b8aec2df10ea4c889 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 96d8ea839bded055fbbc01bfca44a7df3710e2ef ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index ac042e4ce..75f2bcd00 100644
+index 02d41e39a..a6933801a 100644
@@ -22 +23 @@
-@@ -54,5 +54,5 @@ else
+@@ -53,5 +53,5 @@ else
More information about the stable
mailing list