From 1e1e3ef2fb5d482a56975b0b974046064e548b03 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 16 Jan 2017 18:56:07 +0100 Subject: [PATCH] LEDE v17.01: set branch defaults Signed-off-by: Jo-Philipp Wich --- feeds.conf.default | 12 ++++-------- include/version.mk | 4 ++-- package/base-files/image-config.in | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/feeds.conf.default b/feeds.conf.default index e3e9c60cdf..6181dc6932 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,8 +1,4 @@ -src-git packages https://git.lede-project.org/feed/packages.git -src-git luci https://git.lede-project.org/project/luci.git -src-git routing https://git.lede-project.org/feed/routing.git -src-git telephony https://git.lede-project.org/feed/telephony.git -#src-git targets https://github.com/openwrt/targets.git -#src-git management https://github.com/openwrt-management/packages.git -#src-git oldpackages http://git.openwrt.org/packages.git -#src-link custom /usr/src/openwrt/custom-feed +src-git packages https://git.lede-project.org/feed/packages.git;lede-17.01 +src-git luci https://git.lede-project.org/project/luci.git;lede-17.01 +src-git routing https://git.lede-project.org/feed/routing.git;lede-17.01 +src-git telephony https://git.lede-project.org/feed/telephony.git;lede-17.01 diff --git a/include/version.mk b/include/version.mk index 1a0d3c990b..8a6ab94eaa 100644 --- a/include/version.mk +++ b/include/version.mk @@ -31,7 +31,7 @@ qstrip_escape=$(subst ','\'',$(call qstrip,$(1))) sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1)))) VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) -VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),17.01-SNAPSHOT) VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) @@ -40,7 +40,7 @@ VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK)) VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/releases/17.01-SNAPSHOT) VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST)) VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE) diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index b43d7c78cd..0439206bb6 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -190,7 +190,7 @@ if VERSIONOPT config VERSION_REPO string prompt "Release repository" - default "http://downloads.lede-project.org/snapshots" + default "http://downloads.lede-project.org/releases/17.01-SNAPSHOT" help This is the repository address embedded in the image, it defaults to the trunk snapshot repo; the url may contain the following placeholders: -- 2.30.2