diff options
| author |   Damjan Marion <damarion@cisco.com> | 2017-04-19 14:09:07 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-04-20 11:30:28 +0000 |
| commit | 686c1c8454803e48d45428a720f129f24dc981f7 (patch) | |
| tree | a5a7b959c029467afb949ccb252b5310921fecf4 /build-root/Makefile | |
| parent | f1ff5ff1049fd2750823273a3a92779e5fd6e1a5 (diff) | |
Extend ebuild to specify "configure" subdir, enable verify for sample-plugin
Change-Id: I2056e5d19bc3713e7a13e015dabf3b2431800973
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'build-root/Makefile')
| -rw-r--r-- | build-root/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build-root/Makefile b/build-root/Makefile index 8b83990e22f..f2f77804ad4 100644 --- a/build-root/Makefile +++ b/build-root/Makefile @@ -579,7 +579,7 @@ image_extra_dependencies = $($(PLATFORM)_image_extra_dependencies) ### dbarach configure_package_gnu = \ - s=$(call find_source_fn,$(PACKAGE_SOURCE)) ; \ + s=$(call find_source_fn,$(PACKAGE_SOURCE))$(PACKAGE_SUBDIR) ; \ if [ ! -f $$s/configure ] ; then \ autoreconf -i -f $$s ; \ fi ; \ @@ -635,7 +635,8 @@ configure_check_timestamp = \ mkdir -p $(PACKAGE_INSTALL_DIR) ; \ conf="$(TIMESTAMP_DIR)/$(CONFIGURE_TIMESTAMP)" ; \ dirs="$(call package_mk_fn,$(PACKAGE)) \ - $(wildcard $(call find_source_fn,$(PACKAGE_SOURCE))/configure) \ + $(wildcard $(call find_source_fn, \ + $(PACKAGE_SOURCE))$(PACKAGE_SUBDIR)/configure) \ $(MU_BUILD_ROOT_DIR)/config.site" ; \ if [[ $(call find_newer_fn, $${conf}, $${dirs}, $?) ]]; then \ $(configure_package) ; \ @@ -747,6 +748,7 @@ GIT = git # Multiple packages may use a single source tree. # For example, gcc-bootstrap package shares gcc source. PACKAGE_SOURCE = $(if $($(PACKAGE)_source),$($(PACKAGE)_source),$(PACKAGE)) +PACKAGE_SUBDIR = $(if $($(PACKAGE)_configure_subdir),/$($(PACKAGE)_configure_subdir),) # Use git to download source if directory is not found find_source_for_package = \ |