[source] LEDE v17.01.3: revert to branch defaults
LEDE Commits
lede-commits at lists.infradead.org
Tue Oct 3 05:19:34 PDT 2017
stintel pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/ee32de4426daa3599fd9a3ffc0da8225aa016679
commit ee32de4426daa3599fd9a3ffc0da8225aa016679
Author: Stijn Tintel <stijn at linux-ipv6.be>
AuthorDate: Tue Oct 3 15:10:55 2017 +0300
LEDE v17.01.3: revert to branch defaults
Signed-off-by: Stijn Tintel <stijn at linux-ipv6.be>
---
feeds.conf.default | 8 ++++----
include/version.mk | 6 +++---
package/base-files/image-config.in | 4 ++--
version | 1 -
version.date | 1 -
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/feeds.conf.default b/feeds.conf.default
index 001ad62..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^21b2e3eb761ea79bf3a8d2b6368435887960f5c2
-src-git luci https://git.lede-project.org/project/luci.git^079f65a628a4c4179578c043d2905efea93bb167
-src-git routing https://git.lede-project.org/feed/routing.git^d11075cd40a88602bf4ba2b275f72100ddcb4767
-src-git telephony https://git.lede-project.org/feed/telephony.git^ac6415e61f147a6892fd2785337aec93ddc68fa9
+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 9e4c52f..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.3)
+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),r3533-d0bf257c46)
+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.3)
+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 395575c..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.3"
+ 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 d6ed47d..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-r3533-d0bf257c46
diff --git a/version.date b/version.date
deleted file mode 100644
index e9d72b9..0000000
--- a/version.date
+++ /dev/null
@@ -1 +0,0 @@
-1507028607
More information about the lede-commits
mailing list