diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-11-30 09:43:27 +0300 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-11-30 09:44:29 +0300 |
| commit | ddfdd2dafff4981dbd467b8b0526664d5d2cc502 (patch) | |
| tree | 6671fbfdfb77f679a8f23ec59bdbe18959624d69 /shared | |
| parent | f174cdb61ad66067905e7a74b04fc4c47f19fd8d (diff) | |
functions.sh: improve handling of base feed
Also use non-shallow feed clones.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Diffstat (limited to 'shared')
| -rwxr-xr-x | shared/functions.sh | 8 | ||||
| -rw-r--r-- | shared/relman.cfg.example | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/shared/functions.sh b/shared/functions.sh index 92ae17f..b724b08 100755 --- a/shared/functions.sh +++ b/shared/functions.sh @@ -191,12 +191,10 @@ install_sdk_feeds() { cd "$CACHE_DIR/sdk/$target" if [ ! -s "feeds.conf" ]; then - if ! grep -sq " base " "feeds.conf.default"; then - sed -e '/oldpackages/ { p; s!oldpackages!base!; s!packages.git!openwrt.git!; s!^#!! }' \ - feeds.conf.default > feeds.conf - else - cp feeds.conf.default feeds.conf + if ! grep -sq " base " "feeds.conf.default" && [ -n "$RELEASE_FEED" ]; then + echo "src-git-full base $RELEASE_FEED" > feeds.conf fi + sed -e 's#^src-git #src-git-full #g' feeds.conf.default >> feeds.conf fi ./scripts/feeds update >/dev/null diff --git a/shared/relman.cfg.example b/shared/relman.cfg.example index abf8ecd..623b555 100644 --- a/shared/relman.cfg.example +++ b/shared/relman.cfg.example @@ -4,6 +4,7 @@ # Common release properties release_tag = CC 15.05-rc3 release_name = Chaos Calmer 15.05 Release Candicate 3 +release_feed = http://git.openwrt.org/15.05/openwrt.git release_url = openwrt@downloads.openwrt.org:chaos_calmer/15.05-rc3 # release_url = https://downloads.openwrt.org/chaos_calmer/15.05-rc3 # release_url = file:///CC/sync/chaos_calmer/15.05-rc3 |