top-level Makefile improvements
auto-execute startup.vpp file if exists
add DPDK_CONFIG=<string> to speficy custom config for autogenerated
startup.conf, e.g. DPDK_CONFIG="no-pci"
add DISABLED_PLUGINS=<comma separated list> option
e.g.
make DISABLED_PLUGINS=dpdk,acl run
or
export DISABLED_PLUGINS=dpdk,acl
make run
@@ -18,7 +18,25 @@ GDB?=gdb
PLATFORM?=vpp
SAMPLE_PLUGIN?=no
-MINIMAL_STARTUP_CONF="unix { interactive cli-listen /run/vpp/cli.sock gid $(shell id -g) }"
+,:=,
+define disable_plugins
+$(if $(1), \
+ "plugins {" \
+ $(patsubst %,"plugin %_plugin.so { disable }",$(subst $(,), ,$(1))) \
+ " }" \
+ ,)
+endef
+
+MINIMAL_STARTUP_CONF=" \
+unix { \
+ interactive \
+ cli-listen /run/vpp/cli.sock \
+ gid $(shell id -g) \
+ $(if $(wildcard startup.vpp),"exec startup.vpp",) \
+} \
+$(if $(DPDK_CONFIG), "dpdk { $(DPDK_CONFIG) }",) \
+$(call disable_plugins,$(DISABLED_PLUGINS)) \
+"
GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
@@ -148,7 +166,12 @@ help:
@echo " GDB=<path> - gdb binary to use for debugging"
@echo " PLATFORM=<name> - target platform. default is vpp"
@echo " TEST=<filter> - apply filter to test set, see test-help"
+ @echo " DPDK_CONFIG=<conf> - add specified dpdk config commands to"
+ @echo " autogenerated startup.conf"
+ @echo " (e.g. \"no-pci\" )"
@echo " SAMPLE_PLUGIN=yes - in addition build/run/debug sample plugin"
+ @echo " DISABLED_PLUGINS=<list> - comma separated list of plugins which"
+ @echo " should not be loaded"
@echo ""
@echo "Current Argument Values:"
@echo " V = $(V)"
@@ -157,7 +180,9 @@ help:
@echo " GDB = $(GDB)"
@echo " PLATFORM = $(PLATFORM)"
@echo " DPDK_VERSION = $(DPDK_VERSION)"
+ @echo " DPDK_CONFIG = $(DPDK_CONFIG)"
@echo " SAMPLE_PLUGIN = $(SAMPLE_PLUGIN)"
+ @echo " DISABLED_PLUGINS = $(DISABLED_PLUGINS)"
$(BR)/.bootstrap.ok:
ifeq ($(findstring y,$(UNATTENDED)),y)
