Skip to content

Commit 2da512e

Browse files
committedJun 10, 2017
LEDE v17.01.2: adjust config defaults
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
1 parent 65eec8b commit 2da512e

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed
 

‎feeds.conf.default

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
src-git packages https://git.lede-project.org/feed/packages.git;lede-17.01
2-
src-git luci https://git.lede-project.org/project/luci.git;lede-17.01
3-
src-git routing https://git.lede-project.org/feed/routing.git;lede-17.01
4-
src-git telephony https://git.lede-project.org/feed/telephony.git;lede-17.01
1+
src-git packages https://git.lede-project.org/feed/packages.git^dc558eaa296686603c1730c1aab01f3ea69d7831
2+
src-git luci https://git.lede-project.org/project/luci.git^7f6fc1681f7becc514a58082e871f3855d3a123f
3+
src-git routing https://git.lede-project.org/feed/routing.git^dbbad8472288498c17825303d834da3ee5030806
4+
src-git telephony https://git.lede-project.org/feed/telephony.git^1f0fb2538ba6fc306198fe2a9a4b976d63adb304

‎include/version.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
3131
sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
3232

3333
VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
34-
VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),17.01-SNAPSHOT)
34+
VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),17.01.2)
3535

3636
VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE))
37-
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
37+
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r3435-65eec8bd5f)
3838

3939
VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK))
4040
VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE))
4141

4242
VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
43-
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/releases/17.01-SNAPSHOT)
43+
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/releases/17.01.2)
4444

4545
VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
4646
VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE)

‎package/base-files/image-config.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ if VERSIONOPT
190190
config VERSION_REPO
191191
string
192192
prompt "Release repository"
193-
default "http://downloads.lede-project.org/releases/17.01-SNAPSHOT"
193+
default "http://downloads.lede-project.org/releases/17.01.2"
194194
help
195195
This is the repository address embedded in the image, it defaults
196196
to the trunk snapshot repo; the url may contain the following placeholders:
@@ -262,7 +262,7 @@ if VERSIONOPT
262262
config VERSION_CODE_FILENAMES
263263
bool
264264
prompt "Revision code in filenames"
265-
default y
265+
default n
266266
help
267267
Enable this to include the revision identifier or the configured
268268
version code into the firmware image, SDK- and Image Builder archive

‎version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
r3435-65eec8bd5f

‎version.date

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1496955757

0 commit comments

Comments
 (0)
Please sign in to comment.