Browse Source

Enable the site config to include own package feeds

Jan-Philipp Litza 10 years ago
parent
commit
ca95374ea1
2 changed files with 3 additions and 1 deletions
  1. 1 0
      Makefile
  2. 2 1
      scripts/modules.sh

+ 1 - 0
Makefile

@@ -143,6 +143,7 @@ export GLUON_CONFIGURE := $(GLUONDIR)/scripts/configure.pl
 
 
 feeds: FORCE
+	[ ! -f $(GLUON_SITEDIR)/modules ] || . $(GLUON_SITEDIR)/modules && for feed in $$GLUON_SITE_FEEDS; do echo src-link $$feed ../../packages/$$feed; done > feeds.conf
 	. $(GLUONDIR)/modules && for feed in $$GLUON_FEEDS; do echo src-link $$feed ../../packages/$$feed; done > feeds.conf
 	+$(GLUONMAKE) refresh_feeds V=s$(OPENWRT_VERBOSE)
 

+ 2 - 1
scripts/modules.sh

@@ -1,7 +1,8 @@
 . "$1"/modules
+[ ! -f "$1"/site/modules ] || . "$1"/site/modules
 
 GLUON_MODULES=openwrt
 
-for feed in $GLUON_FEEDS; do
+for feed in $GLUON_SITE_FEEDS $GLUON_FEEDS; do
 	GLUON_MODULES="$GLUON_MODULES packages/$feed"
 done