LEDE v17.01.4: revert to branch defaults

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

diff --git a/feeds.conf.default b/feeds.conf.default
index d86737e9ce148a710fdb2d4bbee2243e82c42a2b..6181dc69320e6d22ec50a9d8755a24a451b8ca5c 100644 (file)
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-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
+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 c5dc9a1c66ca59577b6c4640d188b249b448acbe..8a6ab94eaa02a89e2e6c1e6794875c62953547a8 100644 (file)
--- 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.4)
+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),r3560-79f57e422d)
+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.4)
+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 0e1219086b2c92f4e7cc4cce0125ba0187f41860..b60053046a5cfea208d8ac6a719614f06f63841e 100644 (file)
--- 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.4"
+               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 (file)
index 8d5fc75..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-r3560-79f57e422d

diff --git a/version.date b/version.date
deleted file mode 100644 (file)
index 7bc4b45..0000000
--- a/version.date
+++ /dev/null
@@ -1 +0,0 @@
-1508262380