diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2017-10-18 11:54:32 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-10-18 11:54:32 +0300 |
| commit | 444add156f2a6d92fc15005c5ade2208a978966c (patch) | |
| tree | cb72d798d649d4e348ce89095450946b5f8fff53 | |
| parent | 79f57e422d229bb21837f588f40259835893837b (diff) | |
| download | upstream-444add156f2a6d92fc15005c5ade2208a978966c.tar.gz upstream-444add156f2a6d92fc15005c5ade2208a978966c.tar.bz2 upstream-444add156f2a6d92fc15005c5ade2208a978966c.zip | |
LEDE v17.01.4: adjust config defaultsv17.01.4
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
| -rw-r--r-- | feeds.conf.default | 8 | ||||
| -rw-r--r-- | include/version.mk | 6 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 4 | ||||
| -rw-r--r-- | version | 1 | ||||
| -rw-r--r-- | version.date | 1 |
5 files changed, 11 insertions, 9 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 6181dc6932..d86737e9ce 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^cd5c448758f30868770b9ebf8b656c1a4211a240 +src-git luci https://git.lede-project.org/project/luci.git^d3f0685d63c1291359dc5dd089c82fa1e150e0c6 +src-git routing https://git.lede-project.org/feed/routing.git^d11075cd40a88602bf4ba2b275f72100ddcb4767 +src-git telephony https://git.lede-project.org/feed/telephony.git^ac6415e61f147a6892fd2785337aec93ddc68fa9 diff --git a/include/version.mk b/include/version.mk index 8a6ab94eaa..c5dc9a1c66 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.4) VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r3560-79f57e422d) 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.4) 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..0e1219086b 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.4" help This is the repository address embedded in the image, it defaults to the trunk snapshot repo; the url may contain the following placeholders: @@ -262,7 +262,7 @@ if VERSIONOPT config VERSION_CODE_FILENAMES bool prompt "Revision code in filenames" - default y + default n help Enable this to include the revision identifier or the configured version code into the firmware image, SDK- and Image Builder archive diff --git a/version b/version new file mode 100644 index 0000000000..8d5fc7563f --- /dev/null +++ b/version @@ -0,0 +1 @@ +r3560-79f57e422d diff --git a/version.date b/version.date new file mode 100644 index 0000000000..7bc4b45178 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1508262380 |