diff --git a/Makefile b/Makefile index 2d4bab98..88a437ee 100644 --- a/Makefile +++ b/Makefile @@ -46,10 +46,16 @@ $(eval $(call mkabspath,GLUON_PATCHESDIR)) GLUON_MULTIDOMAIN ?= 0 GLUON_DEBUG ?= 0 +# Can be overridden via environment/command line/... to use the Gluon +# build system for non-Gluon builds +define GLUON_BASE_FEEDS ?= +src-link gluon_base ../../package +endef + GLUON_VARS = \ GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_DEBUG GLUON_DEPRECATED GLUON_DEVICES \ GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR \ - GLUON_SITEDIR GLUON_RELEASE GLUON_BRANCH GLUON_LANGS BOARD SUBTARGET + GLUON_SITEDIR GLUON_RELEASE GLUON_BRANCH GLUON_LANGS GLUON_BASE_FEEDS BOARD SUBTARGET unexport $(GLUON_VARS) GLUON_ENV = $(foreach var,$(GLUON_VARS),$(var)=$(call escape,$($(var)))) diff --git a/scripts/feeds.sh b/scripts/feeds.sh index 7d7d059a..d4b7d6d1 100755 --- a/scripts/feeds.sh +++ b/scripts/feeds.sh @@ -11,7 +11,7 @@ rm -rf openwrt/feeds rm -rf openwrt/package/feeds ( - echo 'src-link gluon_base ../../package' + echo "$GLUON_BASE_FEEDS" for feed in $FEEDS; do echo "src-link $feed ../../packages/$feed" done