diff --git a/scripts/default_feeds.sh b/scripts/default_feeds.sh new file mode 100644 index 0000000000000000000000000000000000000000..c1871730bda25a1f5399a6f36721e1bb8a19a52b --- /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 b5857eb723dfe242c359b3210a98b5e8c05b6ef9..7d7d059a5d29724a28f2e99d5401902b65d83cdd 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 dcb1bd440e5c3f06cb31acf2d94346e8a20ea2b6..4df7e58019f7ee136b73fe6d5f43dfc16cee94db 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 21ef077588b10a127df0d0153cb71021a9027e5b..8f0bc0cc89aedb6065db2497b33d12e8b142d2aa 100644 --- a/targets/generic +++ b/targets/generic @@ -2,6 +2,7 @@ . scripts/modules.sh +. scripts/default_feeds.sh config "CONFIG_GLUON_SITEDIR=\"$GLUON_SITEDIR\""