diff options
| author |   Pierre Pfister <ppfister@cisco.com> | 2016-05-27 10:30:13 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-06-05 13:56:19 +0000 |
| commit | 3535222f979742d65c28a312d415aa6831f816d6 (patch) | |
| tree | 854820a370dc3a3dd3c05621a41dab048c9dc989 | |
| parent | 431cd2f15087834069f081ac96e09ac538ebed2c (diff) | |
VPP-94: Add build-data directory for plugins and Makefile target
Commit e36af5f3153 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>
| -rw-r--r-- | Makefile | 8 | ||||
| -rwxr-xr-x | build-root/bootstrap.sh | 2 | ||||
| -rw-r--r-- | plugins/build-data/packages/sample-plugin.mk (renamed from build-data/packages/sample-plugin.mk) | 0 |
3 files changed, 8 insertions, 2 deletions
@@ -106,7 +106,7 @@ ifeq ($(OS_ID),ubuntu) fi ; \ exit 0 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 'export PATH=$(BR)/tools/ccache-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 +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) ifeq ("$(wildcard $(STARTUP_CONF))","") define run diff --git a/build-root/bootstrap.sh b/build-root/bootstrap.sh index f83734fd4af..2419b6ae254 100755 --- a/build-root/bootstrap.sh +++ b/build-root/bootstrap.sh @@ -12,7 +12,7 @@ ADD_TO_PATH="$build_root/tools/ccache-bin:$build_root/tools/bin" # Construct build-config.mk cd $build_root -echo SOURCE_PATH = $wsroot > build-config.mk +echo SOURCE_PATH = $wsroot $wsroot/plugins/ > build-config.mk echo echo Saving PATH settings in `pwd`/path_setup echo Source this file later, as needed diff --git a/build-data/packages/sample-plugin.mk b/plugins/build-data/packages/sample-plugin.mk index 047a26f551c..047a26f551c 100644 --- a/build-data/packages/sample-plugin.mk +++ b/plugins/build-data/packages/sample-plugin.mk |