summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2017-02-07 09:36:21 +0100
committerJo-Philipp Wich <jo@mein.io>2017-02-07 09:36:21 +0100
commit28b7d7f1dac725157c19236b8899e1c97f19cee9 (patch)
tree6d5f8eeb3f547a0cfe5d63873ac38d11f1f19069
parent42f3c1fe1ca051dec2ef828b4a412ed73e29acae (diff)
downloadmtk-20170518-28b7d7f1dac725157c19236b8899e1c97f19cee9.zip
mtk-20170518-28b7d7f1dac725157c19236b8899e1c97f19cee9.tar.gz
mtk-20170518-28b7d7f1dac725157c19236b8899e1c97f19cee9.tar.bz2
LEDE v17.01.0-rc2: adjust config defaultsv17.01.0-rc2
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--feeds.conf.default8
-rw-r--r--include/version.mk6
-rw-r--r--package/base-files/image-config.in2
-rw-r--r--version1
-rw-r--r--version.date1
5 files changed, 10 insertions, 8 deletions
diff --git a/feeds.conf.default b/feeds.conf.default
index 6181dc6..7fd0fff 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^06198d9c8c1ba061a0a5d566545a5c0bbce2b0a4
+src-git luci https://git.lede-project.org/project/luci.git^e306ee6c93c1ef600012f47e40dd75020d4ab555
+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 8a6ab94..208a82f 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-rc2)
VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r3131-42f3c1f)
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-rc2)
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 0439206..f58a3ef 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-rc2"
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 0000000..9b3529e
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r3131-42f3c1f
diff --git a/version.date b/version.date
new file mode 100644
index 0000000..45cb604
--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
+1486456367