aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-06-22 12:21:46 +0200
committerJo-Philipp Wich <jo@mein.io>2018-06-22 12:22:50 +0200
commit78abc65347c9bc2cc79ad54f5137adc6ce8da897 (patch)
treee4e74e05ac826ad40b3512059494b33a28148a50
parent55df39e684f8fde90c52212350062440dc6c9754 (diff)
downloadupstream-78abc65347c9bc2cc79ad54f5137adc6ce8da897.tar.gz
upstream-78abc65347c9bc2cc79ad54f5137adc6ce8da897.tar.bz2
upstream-78abc65347c9bc2cc79ad54f5137adc6ce8da897.zip
Revert "LEDE v18.06.0-rc1: revert to branch defaults"
This reverts commit 55df39e684f8fde90c52212350062440dc6c9754. The tree is in an inconsistent state and we need to complete some rebranding. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--feeds.conf.default8
-rw-r--r--include/version.mk6
-rw-r--r--package/base-files/image-config.in2
-rw-r--r--version1
-rw-r--r--version.date1
5 files changed, 10 insertions, 8 deletions
diff --git a/feeds.conf.default b/feeds.conf.default
index 763a26902e..727767b479 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-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
+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
diff --git a/include/version.mk b/include/version.mk
index a1e5608eb7..b92d509c15 100644
--- 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))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06.0-rc1)
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7086-f27e0b6bc4)
VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/18.06-SNAPSHOT)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/releases/18.06.0-rc1)
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 5ee2d3e4e3..43528bd752 100644
--- 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"
- 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..3c121c8ecc
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r7086-f27e0b6bc4
diff --git a/version.date b/version.date
new file mode 100644
index 0000000000..5dd7a5db20
--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
+1529660837