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

VPP-94: Add build-data directory for plugins and Makefile target

Browse Source 
Commit e36af5f315 moved sample-plugin a dedicated directory.
The build system could not find sources for sample-plugin-* targets.
This commit adds a dedicated build-data/packages directory for
plugins and moves sample-plugin.mk there.

Change-Id: I9e3ee8858580e86ff6d4f7317300df0a5e239a01
Signed-off-by: Pierre Pfister <ppfister@cisco.com>
This commit is contained in:
Pierre Pfister
2016-05-27 10:30:13 +01:00
committed by Dave Barach
parent 431cd2f150
commit 3535222f97
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -106,7 +106,7 @@ ifeq ($(OS_ID),ubuntu)
fi ; \ fi ; \
exit 0 exit 0
endif endif
@echo "SOURCE_PATH = $(WS_ROOT)" > $(BR)/build-config.mk @echo "SOURCE_PATH = $(WS_ROOT) $(WS_ROOT)/plugins"> $(BR)/build-config.mk
@echo "#!/bin/bash\n" > $(BR)/path_setup @echo "#!/bin/bash\n" > $(BR)/path_setup
@echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup @echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup
@echo 'export PATH=$(BR)/tools/bin:$$PATH' >> $(BR)/path_setup @echo 'export PATH=$(BR)/tools/bin:$$PATH' >> $(BR)/path_setup
@ -162,6 +162,12 @@ wipe-release: $(BR)/.bootstrap.ok
rebuild-release: wipe-release build-release rebuild-release: wipe-release build-release
plugins: $(BR)/.bootstrap.ok
$(call make,$(PLATFORM)_debug,sample-plugin-install)
plugins-release: $(BR)/.bootstrap.ok
$(call make,$(PLATFORM),sample-plugin-install)
STARTUP_DIR ?= $(PWD) STARTUP_DIR ?= $(PWD)
ifeq ("$(wildcard $(STARTUP_CONF))","") ifeq ("$(wildcard $(STARTUP_CONF))","")
define run define run

2
build-root/bootstrap.sh
View File

@ -12,7 +12,7 @@ ADD_TO_PATH="$build_root/tools/ccache-bin:$build_root/tools/bin"
# Construct build-config.mk # Construct build-config.mk
cd $build_root cd $build_root
echo SOURCE_PATH = $wsroot > build-config.mk echo SOURCE_PATH = $wsroot $wsroot/plugins/ > build-config.mk
echo echo
echo Saving PATH settings in `pwd`/path_setup echo Saving PATH settings in `pwd`/path_setup
echo Source this file later, as needed echo Source this file later, as needed

0
build-data/packages/sample-plugin.mk → plugins/build-data/packages/sample-plugin.mk
View File