diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2017-06-10 13:08:07 +0200 |
|---|---|---|
| committer | Alexander Couzens <lynxis@fe80.eu> | 2017-06-10 13:08:07 +0200 |
| commit | a6b5ddfd9b87962365b0bcdfa14f179ed404af43 (patch) | |
| tree | af45fc85c41aaed72d1ac88aeb63a48194ffd6c3 | |
| parent | 2da512ecf4631cd7812283f0931cf6bbf842a313 (diff) | |
| download | mtk-20170518-a6b5ddfd9b87962365b0bcdfa14f179ed404af43.zip mtk-20170518-a6b5ddfd9b87962365b0bcdfa14f179ed404af43.tar.gz mtk-20170518-a6b5ddfd9b87962365b0bcdfa14f179ed404af43.tar.bz2 | |
LEDE v17.01.2: revert to branch defaults
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
| -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, 9 insertions, 11 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 969b8df..6181dc6 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://git.lede-project.org/feed/packages.git^dc558eaa296686603c1730c1aab01f3ea69d7831 -src-git luci https://git.lede-project.org/project/luci.git^7f6fc1681f7becc514a58082e871f3855d3a123f -src-git routing https://git.lede-project.org/feed/routing.git^dbbad8472288498c17825303d834da3ee5030806 -src-git telephony https://git.lede-project.org/feed/telephony.git^1f0fb2538ba6fc306198fe2a9a4b976d63adb304 +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 bec3332..8a6ab94 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.2) +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),r3435-65eec8bd5f) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) 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.2) +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 392c3b9..b600530 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.2" + 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: @@ -262,7 +262,7 @@ if VERSIONOPT config VERSION_CODE_FILENAMES bool prompt "Revision code in filenames" - default n + default y 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 deleted file mode 100644 index 643fb56..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r3435-65eec8bd5f diff --git a/version.date b/version.date deleted file mode 100644 index d3e1aa2..0000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1496955757 |