diff --git a/scripts/default_feeds.sh b/scripts/default_feeds.sh new file mode 100644 index 00000000..c1871730 --- /dev/null +++ b/scripts/default_feeds.sh @@ -0,0 +1 @@ +DEFAULT_FEEDS="$(awk '{print $2}' openwrt/feeds.conf.default)" diff --git a/scripts/feeds.sh b/scripts/feeds.sh index b5857eb7..7d7d059a 100755 --- a/scripts/feeds.sh +++ b/scripts/feeds.sh @@ -3,6 +3,7 @@ set -e . scripts/modules.sh +. scripts/default_feeds.sh rm -rf openwrt/tmp diff --git a/scripts/modules.sh b/scripts/modules.sh index dcb1bd44..4df7e580 100644 --- a/scripts/modules.sh +++ b/scripts/modules.sh @@ -2,7 +2,6 @@ [ ! -f "$GLUON_SITEDIR"/modules ] || . "$GLUON_SITEDIR"/modules FEEDS="$(echo $GLUON_FEEDS $GLUON_SITE_FEEDS | tr ' ' '\n')" -DEFAULT_FEEDS="$(awk '{print $2}' openwrt/feeds.conf.default)" GLUON_MODULES=openwrt diff --git a/targets/generic b/targets/generic index 21ef0775..8f0bc0cc 100644 --- a/targets/generic +++ b/targets/generic @@ -2,6 +2,7 @@ . scripts/modules.sh +. scripts/default_feeds.sh config "CONFIG_GLUON_SITEDIR=\"$GLUON_SITEDIR\""