[dpdk-stable] patch 'bus/pci: remove useless link dependency on ethdev' has been queued to LTS release 17.11.10

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Dec 19 15:33:23 CET 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/21/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.

Thanks.

Luca Boccassi

---
>From 8a9c8c090d5c96245e9bd1e38ef20fae8faa0c01 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell at intel.com>
Date: Fri, 11 Oct 2019 13:56:07 -0700
Subject: [PATCH] bus/pci: remove useless link dependency on ethdev

[ upstream commit c345c7d1acf43b4d30e1ecdd5a8cd3402234a6aa ]

The makefile in drivers/bus/pci specified rte_ethdev as a dependency for
the library. However there are no actual symbols from librte_ethdev used
in librte_bus_pci.

Including librte_ethdev as a dependency only becomes a problem in some
niche cases like when attempting to build the rte_bus_pci library as a
shared object without building the rte_ethdev library.

I specifically ran into this when trying to build the DPDK included as
an SPDK submodule on a FreeBSD machine. I figure that since there are no
real dependencies between the two, we should enable building
librte_bus_pci without librte_ethdev.

Fixes: c752998b5e2e ("pci: introduce library and driver")

Signed-off-by: Seth Howell <seth.howell at intel.com>
Acked-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
---
 drivers/bus/pci/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile
index f3df1c4ce4..37663deb08 100644
--- a/drivers/bus/pci/Makefile
+++ b/drivers/bus/pci/Makefile
@@ -50,7 +50,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
 CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(SYSTEM)app/eal
 
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_pci
+LDLIBS += -lrte_pci
 
 include $(RTE_SDK)/drivers/bus/pci/$(SYSTEM)/Makefile
 SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) := $(addprefix $(SYSTEM)/,$(SRCS))
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:28.548292637 +0000
+++ 0056-bus-pci-remove-useless-link-dependency-on-ethdev.patch	2019-12-19 14:32:26.089297508 +0000
@@ -1,8 +1,10 @@
-From c345c7d1acf43b4d30e1ecdd5a8cd3402234a6aa Mon Sep 17 00:00:00 2001
+From 8a9c8c090d5c96245e9bd1e38ef20fae8faa0c01 Mon Sep 17 00:00:00 2001
 From: Seth Howell <seth.howell at intel.com>
 Date: Fri, 11 Oct 2019 13:56:07 -0700
 Subject: [PATCH] bus/pci: remove useless link dependency on ethdev
 
+[ upstream commit c345c7d1acf43b4d30e1ecdd5a8cd3402234a6aa ]
+
 The makefile in drivers/bus/pci specified rte_ethdev as a dependency for
 the library. However there are no actual symbols from librte_ethdev used
 in librte_bus_pci.
@@ -17,7 +19,6 @@
 librte_bus_pci without librte_ethdev.
 
 Fixes: c752998b5e2e ("pci: introduce library and driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Seth Howell <seth.howell at intel.com>
 Acked-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
@@ -26,15 +27,15 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile
-index 68c1f3fde4..45d12427a1 100644
+index f3df1c4ce4..37663deb08 100644
 --- a/drivers/bus/pci/Makefile
 +++ b/drivers/bus/pci/Makefile
-@@ -25,7 +25,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
- CFLAGS += -DALLOW_EXPERIMENTAL_API
+@@ -50,7 +50,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
+ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(SYSTEM)app/eal
  
  LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
--LDLIBS += -lrte_ethdev -lrte_pci -lrte_kvargs
-+LDLIBS += -lrte_pci -lrte_kvargs
+-LDLIBS += -lrte_ethdev -lrte_pci
++LDLIBS += -lrte_pci
  
  include $(RTE_SDK)/drivers/bus/pci/$(SYSTEM)/Makefile
  SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) := $(addprefix $(SYSTEM)/,$(SRCS))


More information about the stable mailing list