patch 'net/softnic: fix include of log library' has been queued to stable release 23.11.1

Xueming Li xuemingl at nvidia.com
Tue Mar 5 10:47:30 CET 2024


Hi,

FYI, your patch has been queued to stable release 23.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/31/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=de543e342adb07a4d94fcf1714c1d8f1a2145dc6

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From de543e342adb07a4d94fcf1714c1d8f1a2145dc6 Mon Sep 17 00:00:00 2001
From: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
Date: Tue, 13 Feb 2024 17:38:09 +0000
Subject: [PATCH] net/softnic: fix include of log library
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 96893df75bf50a82cabd8debe3492d564a5d13d5 ]

When rte_log.h was moved to a new directory, the include path was not
updated for the generated C code produced by the pipeline library,
which results in build failure for this code.

Fixes: 09ce41310930 ("log: separate logging functions out of EAL")

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
Tested-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 drivers/net/softnic/rte_eth_softnic_cli.c | 2 ++
 examples/pipeline/cli.c                   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c
index 085523fe03..95e705c553 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -337,6 +337,7 @@ cmd_softnic_pipeline_libbuild(struct pmd_internals *softnic __rte_unused,
 		 "-I %s/lib/eal/include "
 		 "-I %s/lib/eal/x86/include "
 		 "-I %s/lib/eal/include/generic "
+		 "-I %s/lib/log "
 		 "-I %s/lib/meter "
 		 "-I %s/lib/port "
 		 "-I %s/lib/table "
@@ -361,6 +362,7 @@ cmd_softnic_pipeline_libbuild(struct pmd_internals *softnic __rte_unused,
 		 install_dir,
 		 install_dir,
 		 install_dir,
+		 install_dir,
 		 log_file,
 		 obj_file,
 		 lib_file,
diff --git a/examples/pipeline/cli.c b/examples/pipeline/cli.c
index 2ae6cc579f..afb143c01f 100644
--- a/examples/pipeline/cli.c
+++ b/examples/pipeline/cli.c
@@ -714,6 +714,7 @@ cmd_pipeline_libbuild(char **tokens,
 		 "-I %s/lib/eal/include "
 		 "-I %s/lib/eal/x86/include "
 		 "-I %s/lib/eal/include/generic "
+		 "-I %s/lib/log "
 		 "-I %s/lib/meter "
 		 "-I %s/lib/port "
 		 "-I %s/lib/table "
@@ -738,6 +739,7 @@ cmd_pipeline_libbuild(char **tokens,
 		 install_dir,
 		 install_dir,
 		 install_dir,
+		 install_dir,
 		 log_file,
 		 obj_file,
 		 lib_file,
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-05 17:39:34.256033409 +0800
+++ 0109-net-softnic-fix-include-of-log-library.patch	2024-03-05 17:39:30.903566497 +0800
@@ -1 +1 @@
-From 96893df75bf50a82cabd8debe3492d564a5d13d5 Mon Sep 17 00:00:00 2001
+From de543e342adb07a4d94fcf1714c1d8f1a2145dc6 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 96893df75bf50a82cabd8debe3492d564a5d13d5 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -41 +43 @@
-index c1efea3c1a..015717cb39 100644
+index 2ae6cc579f..afb143c01f 100644
@@ -44 +46 @@
-@@ -707,6 +707,7 @@ cmd_pipeline_libbuild(char **tokens,
+@@ -714,6 +714,7 @@ cmd_pipeline_libbuild(char **tokens,
@@ -52 +54 @@
-@@ -731,6 +732,7 @@ cmd_pipeline_libbuild(char **tokens,
+@@ -738,6 +739,7 @@ cmd_pipeline_libbuild(char **tokens,


More information about the stable mailing list