From ac733df99c78f54b4cf9a8710f70a506f73e66fc Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 20 Feb 2017 19:00:22 +0100 Subject: [PATCH] LEDE v17.01.0: adjust config defaults Signed-off-by: Jo-Philipp Wich --- feeds.conf.default | 8 ++++---- include/version.mk | 6 +++--- package/base-files/image-config.in | 2 +- version | 1 + version.date | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 version create mode 100644 version.date diff --git a/feeds.conf.default b/feeds.conf.default index 6181dc6932..7e8a2ee0c0 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -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 +src-git packages https://git.lede-project.org/feed/packages.git^ed90827282851ad93294e370860320f1af428bb2 +src-git luci https://git.lede-project.org/project/luci.git^a100738163585ae1edc24d832ca9bef1f34beef0 +src-git routing https://git.lede-project.org/feed/routing.git^dd36dd47bbd75defcb3c517cafe7a19ee425f0af +src-git telephony https://git.lede-project.org/feed/telephony.git^1f0fb2538ba6fc306198fe2a9a4b976d63adb304 diff --git a/include/version.mk b/include/version.mk index 8a6ab94eaa..cc25c3a440 100644 --- a/include/version.mk +++ b/include/version.mk @@ -31,16 +31,16 @@ 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),17.01-SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),17.01.0) VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r3205-59508e3) 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/releases/17.01-SNAPSHOT) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/releases/17.01.0) 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 b60053046a..bc550f3c4f 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/releases/17.01-SNAPSHOT" + default "http://downloads.lede-project.org/releases/17.01.0" help This is the repository address embedded in the image, it defaults to the trunk snapshot repo; the url may contain the following placeholders: diff --git a/version b/version new file mode 100644 index 0000000000..430ee3dec9 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r3205-59508e3 diff --git a/version.date b/version.date new file mode 100644 index 0000000000..8deda2d6d8 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1487610824 -- 2.30.2