Revert "LEDE v18.06.0-rc1: adjust config defaults"

This reverts commit 97b1765a45499ecc56db44f79453d3c6040bb5e7.
The tree is in an inconsistent state and we need to complete some rebranding.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/feeds.conf.default b/feeds.conf.default
index 727767b479e461be002a3ec2e190f362f4323f90..763a26902e5fedbcbbc68a866b384fcf176a1f1e 100644 (file)
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-src-git packages https://git.openwrt.org/feed/packages.git^d83dc7cfb81680eff063acb7343eb9d6b0c9a6ab
-src-git luci https://git.openwrt.org/project/luci.git^c379f00e86a5fc5d05a8e967c5c5daa035a72359
-src-git routing https://git.openwrt.org/feed/routing.git^1b9d1c419f0ecefda51922a7845ab2183d6acd76
-src-git telephony https://git.openwrt.org/feed/telephony.git^1195dafe98bca2d3a41383eb2723d0104d7f9046
+src-git packages https://git.openwrt.org/feed/packages.git;openwrt-18.06
+src-git luci https://git.openwrt.org/project/luci.git;openwrt-18.06
+src-git routing https://git.openwrt.org/feed/routing.git;openwrt-18.06
+src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-18.06

diff --git a/include/version.mk b/include/version.mk
index b92d509c15a459ded0d10eaf381d2f58a1b54b83..a1e5608eb7ae10c2b558f37ef1161c9653a1d36d 100644 (file)
--- a/include/version.mk
+++ b/include/version.mk
@@ -25,13 +25,13 @@ PKG_CONFIG_DEPENDS += \
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))

-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06.0-rc1)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06-SNAPSHOT)

 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))

-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7086-f27e0b6bc4)
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))

 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))

-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/releases/18.06.0-rc1)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/18.06-SNAPSHOT)

 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)

diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 43528bd752cce9cb4da9a646684b0be3a7fd7fd4..5ee2d3e4e320d337a0fb0f46ae4649ae847cd6c2 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -253,7 +253,7 @@ if VERSIONOPT
        config VERSION_CODE_FILENAMES
                bool
                prompt "Revision code in filenames"
        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
                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 3c121c8..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-r7086-f27e0b6bc4

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