nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: move DEFAULT_FEEDS definition to a separate file

Browse Source 
modules.sh can't depend on openwrt/feeds.conf.default, otherwise the
initial update will fail.
This commit is contained in:
Matthias Schiffer 2018-07-11 21:47:50 +02:00
parent 9906d69322
commit 63c16c01a0
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
4 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/default_feeds.sh Normal file
View File

@ -0,0 +1 @@
DEFAULT_FEEDS="$(awk '{print $2}' openwrt/feeds.conf.default)"

1
scripts/feeds.sh
View File

@ -3,6 +3,7 @@
set -e set -e
. scripts/modules.sh . scripts/modules.sh
. scripts/default_feeds.sh
rm -rf openwrt/tmp rm -rf openwrt/tmp

1
scripts/modules.sh
View File

@ -2,7 +2,6 @@
[ ! -f "$GLUON_SITEDIR"/modules ] || . "$GLUON_SITEDIR"/modules [ ! -f "$GLUON_SITEDIR"/modules ] || . "$GLUON_SITEDIR"/modules
FEEDS="$(echo $GLUON_FEEDS $GLUON_SITE_FEEDS | tr ' ' '\n')" FEEDS="$(echo $GLUON_FEEDS $GLUON_SITE_FEEDS | tr ' ' '\n')"
DEFAULT_FEEDS="$(awk '{print $2}' openwrt/feeds.conf.default)"
GLUON_MODULES=openwrt GLUON_MODULES=openwrt

1
targets/generic
View File

@ -2,6 +2,7 @@
. scripts/modules.sh . scripts/modules.sh
. scripts/default_feeds.sh
config "CONFIG_GLUON_SITEDIR=\"$GLUON_SITEDIR\"" config "CONFIG_GLUON_SITEDIR=\"$GLUON_SITEDIR\""