Skip to contentSkip to conversation

eal: fix spelling

PATCH Applied [email protected] 3 participants 5 messages Jun 4, 2019 – Jul 31, 2019 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 eal: fix spelling

From: Krzysztof Kanas <[email protected]>

Fixes a753e53d517b ("eal: add device event monitor framework")
Fixes af75078fece3 ("first public release")
---
 lib/librte_eal/common/include/rte_dev.h        | 2 +-
 lib/librte_eal/common/include/rte_interrupts.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
lib/librte_eal/common/include/rte_dev.h +1 -1
index a17023d88bed..89093848a1ad 100644
@@ -349,7 +349,7 @@ rte_dev_iterator_next(struct rte_dev_iterator *it);
  * @b EXPERIMENTAL: this API may change without prior notice
  *
  * It registers the callback for the specific device.
- * Multiple callbacks cal be registered at the same time.
+ * Multiple callbacks can be registered at the same time.
  *
  * @param device_name
  *  The device name, that is the param name of the struct rte_device,
lib/librte_eal/common/include/rte_interrupts.h +1 -1
index 225dae283a25..aa195913b66d 100644
@@ -36,7 +36,7 @@ typedef void (*rte_intr_unregister_callback_fn)(struct rte_intr_handle *intr_han
 
 /**
  * It registers the callback for the specific interrupt. Multiple
- * callbacks cal be registered at the same time.
+ * callbacks can be registered at the same time.
  * @param intr_handle
  *  Pointer to the interrupt handle.
  * @param cb
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 mk: fix printing target name when build completes

From: Krzysztof Kanas <[email protected]>

The configuration for native-linux-* targets is done using symbolic links, e.g
config/defconfig_x86_64-native-linux-gcc
which points to config/defconfig_x86_64-native-linuxapp-gcc.

When configuring mk will output correct target based on RTE_CONFIG_TEMPLATE.

When building mk will use RTE_TARGET variable which is crated out of CONFIG_RTE_EXEC_ENV, and will be different from configuration

Fix by setting CONFIG_RTE_EXEC_ENV to record correct value, also adjust makefile tests for CONFIG_RTE_EXEC_ENV.

Bugzilla ID: 288

Fixes b283164694b6 ("mk: print target when reporting build complete")
---
 config/defconfig_x86_64-native-linuxapp-gcc | 1 +
 drivers/net/softnic/Makefile                | 2 +-
 mk/rte.sdkbuild.mk                          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
config/defconfig_x86_64-native-linuxapp-gcc +1 -0
index db67066a57e3..b1f584427f1d 100644
@@ -4,6 +4,7 @@
 #include "common_linux"
 
 CONFIG_RTE_MACHINE="native"
+CONFIG_RTE_EXEC_ENV="linux"
 
 CONFIG_RTE_ARCH="x86_64"
 CONFIG_RTE_ARCH_X86_64=y
drivers/net/softnic/Makefile +1 -1
index 64885dd86aeb..29a6af7bb75e 100644
@@ -45,7 +45,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c
 #
 SYMLINK-y-include += rte_eth_softnic.h
 
-ifneq ($(CONFIG_RTE_EXEC_ENV),"linuxapp")
+ifneq ($(patsubst "linux%","linux",$(CONFIG_RTE_EXEC_ENV)),"linux")
 $(info Softnic PMD can only operate in a linux environment, \
 please change the definition of the RTE_TARGET environment variable)
 all:
mk/rte.sdkbuild.mk +1 -1
index b512de1ecdf3..8bb0f52bb343 100644
@@ -27,7 +27,7 @@ CLEANDIRS = $(addsuffix _clean,$(ROOTDIRS-y) $(ROOTDIRS-n) $(ROOTDIRS-))
 
 .PHONY: build
 build: $(ROOTDIRS-y)
-	@echo "Build complete [$(RTE_TARGET)]"
+	@echo "Build complete [$(patsubst defconfig_%,%,$(notdir $(RTE_CONFIG_TEMPLATE)))]"
 
 .PHONY: clean
 clean: $(CLEANDIRS)
Signature · 1 line
2.20.1
#2 lore raw

Re: [dpdk-dev] [PATCH] mk: fix printing target name when build completes

04/06/2019 11:21, [email protected]:

config/defconfig_x86_64-native-linuxapp-gcc line 7

Quoted 3 lines
config/defconfig_x86_64-native-linuxapp-gcc +1 -0
+CONFIG_RTE_EXEC_ENV="linux"

Why do you do this change in this file?

I think changing this variable can break backward compatibility.

#3 lore raw

Re: [dpdk-dev] [PATCH] mk: fix printing target name when build completes

Quoted 9 lines · Thomas Monjalon

04/06/2019 11:21, [email protected]:

config/defconfig_x86_64-native-linuxapp-gcc line 7

Quoted 3 lines
config/defconfig_x86_64-native-linuxapp-gcc +1 -0
+CONFIG_RTE_EXEC_ENV="linux"

Why do you do this change in this file?

I think changing this variable can break backward compatibility.

I think it will, which is why I did not change it back in the original set. In terms of incorrect printouts, what actually needs to be done to fix this is to record the original $T value requested when doing the "make config" or "make install T=" command. For the make install case, we can just print $T at the end, but for the case where "make config" and "make" are run separately, some new value would need to be added to the .config file.

Regards,
/Bruce