ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set plugin path properly when using toplevel makefile to run/debug vpp

Browse Source 
Change-Id: Ib6f7dd9d7e1d9f2f2108a8b89421149e4435d5ec
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2016-07-07 17:56:48 +02:00
committed by Dave Barach
parent 5a49bb9ef5
commit a7775387b1
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -64,6 +64,8 @@ help:
@echo " wipe-release - wipe all products of release build " @echo " wipe-release - wipe all products of release build "
@echo " build - build debug binaries" @echo " build - build debug binaries"
@echo " build-release - build release binaries" @echo " build-release - build release binaries"
@echo " plugins - build debug plugin binaries"
@echo " plugins-release - build release plugin binaries"
@echo " rebuild - wipe and build debug binares" @echo " rebuild - wipe and build debug binares"
@echo " rebuild-release - wipe and build release binares" @echo " rebuild-release - wipe and build release binares"
@echo " run - run debug binary" @echo " run - run debug binary"
@ -75,6 +77,7 @@ help:
@echo " pkg-deb - build DEB packages" @echo " pkg-deb - build DEB packages"
@echo " pkg-rpm - build RPM packages" @echo " pkg-rpm - build RPM packages"
@echo " ctags - (re)generate ctags database" @echo " ctags - (re)generate ctags database"
@echo " gtags - (re)generate gtags database"
@echo " cscope - (re)generate cscope database" @echo " cscope - (re)generate cscope database"
@echo " doxygen - (re)generate documentation" @echo " doxygen - (re)generate documentation"
@echo " wipe-doxygen - wipe all generated documentation" @echo " wipe-doxygen - wipe all generated documentation"
@ -174,13 +177,13 @@ ifeq ("$(wildcard $(STARTUP_CONF))","")
define run define run
@echo "WARNING: STARTUP_CONF not defined or file doesn't exist." @echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
@echo " Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n" @echo " Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
@sudo rm -f /dev/shm/vpe-api /dev/shm/db /dev/shm/global_vm @cd $(STARTUP_DIR) && \
@cd $(STARTUP_DIR) && sudo $(1) $(MINIMAL_STARTUP_CONF) sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(1)/plugins/lib64
endef endef
else else
define run define run
@sudo rm -f /dev/shm/vpe-api /dev/shm/db /dev/shm/global_vm @cd $(STARTUP_DIR) && \
@cd $(STARTUP_DIR) && sudo $(1) -c $(STARTUP_CONF) sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/plugins/lib64
endef endef
endif endif
@ -192,16 +195,16 @@ endif
.FORCE: .FORCE:
run: run:
$(call run, $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp) $(call run, $(BR)/install-$(PLATFORM)_debug-native)
run-release: run-release:
$(call run, $(BR)/install-$(PLATFORM)-native/vpp/bin/vpp) $(call run, $(BR)/install-$(PLATFORM)-native)
debug: debug:
$(call run, $(GDB) $(GDB_ARGS) --args $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp) $(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args)
debug-release: debug-release:
$(call run, $(GDB) $(GDB_ARGS) --args $(BR)/install-$(PLATFORM)-native/vpp/bin/vpp) $(call run, $(BR)/install-$(PLATFORM)-native,$(GDB) $(GDB_ARGS) --args)
build-vat: build-vat:
$(call make,$(PLATFORM)_debug,vpp-api-test-install) $(call make,$(PLATFORM)_debug,vpp-api-test-install)