[dpdk-stable] patch 'examples/ipsec-secgw: fix build error log' has been queued to LTS release 17.11.7
Yongseok Koh
yskoh at mellanox.com
Tue Jul 23 03:01:15 CEST 2019
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 <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 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 <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")
-Cc: stable at dpdk.org
Signed-off-by: Marcin Smoczynski <marcinx.smoczynski at intel.com>
---
@@ -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
More information about the stable
mailing list