diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-01-30 13:34:55 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-01-30 13:34:55 +0100 |
| commit | ac1ce256715e9db5ab97d80896d0433b894056b7 (patch) | |
| tree | de7afff4548dfa9534d796b43415793eac4ba8db | |
| parent | a02809f61bf9fda0387d37bd05d0bcfe8397e25d (diff) | |
| download | upstream-ac1ce256715e9db5ab97d80896d0433b894056b7.tar.gz upstream-ac1ce256715e9db5ab97d80896d0433b894056b7.tar.bz2 upstream-ac1ce256715e9db5ab97d80896d0433b894056b7.zip | |
OpenWrt v18.06.2: revert to branch defaults
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -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 1f1e7fac16..763a26902e 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://git.openwrt.org/feed/packages.git^911bbd6bb4856f1e28ae00af37df62e4fa3529e5 -src-git luci https://git.openwrt.org/project/luci.git^6f6641d97de2c85ee5d87beda92ae8437d1dbdf5 -src-git routing https://git.openwrt.org/feed/routing.git^ea345d16a6e27c2a8fdf67bf543cc36a5f189131 -src-git telephony https://git.openwrt.org/feed/telephony.git^cb939d9677d6e38c428f9f297641d07611edeb04 +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 1e8e98390e..1c4b01c7e7 100644 --- a/include/version.mk +++ b/include/version.mk @@ -26,13 +26,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.2) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7676-cddd7b4c77) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/18.06.2) +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) diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 39fedf64fe..6c9d631d04 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -183,7 +183,7 @@ if VERSIONOPT config VERSION_REPO string prompt "Release repository" - default "http://downloads.openwrt.org/releases/18.06.2" + default "http://downloads.openwrt.org/releases/18.06-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: @@ -259,7 +259,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 5811826faa..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r7676-cddd7b4c77 diff --git a/version.date b/version.date deleted file mode 100644 index 7bf15f5b2a..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1548850862 |