diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-11-06 09:08:44 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-11-06 09:08:44 +0100 |
| commit | 112df2ac56f0501d585b8dd414a4e22b38a366f9 (patch) | |
| tree | 884aa62432e6bbb67ee14a3d6165cfea47672a69 | |
| parent | 88bff692a56f29c9af402a633e02eb537d983874 (diff) | |
| download | upstream-112df2ac56f0501d585b8dd414a4e22b38a366f9.tar.gz upstream-112df2ac56f0501d585b8dd414a4e22b38a366f9.tar.bz2 upstream-112df2ac56f0501d585b8dd414a4e22b38a366f9.zip | |
OpenWrt v19.07.0-rc1: 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 c59ab3e516..42c2b0ba3b 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://git.openwrt.org/feed/packages.git^3f3c613ac5bbbd74eac636c3cb1c5cdcf0cbfbe8 -src-git luci https://git.openwrt.org/project/luci.git^c0e73d3f9567f227cbe36ba12af53efbfdd4343d -src-git routing https://git.openwrt.org/feed/routing.git^8d5ee29f088e9dfaa49dc74573edb1919f14dbf4 -src-git telephony https://git.openwrt.org/feed/telephony.git^821bcb7c58a24ea65f022ad2221ba68143533157 +src-git packages https://git.openwrt.org/feed/packages.git;openwrt-19.07 +src-git luci https://git.openwrt.org/project/luci.git;openwrt-19.07 +src-git routing https://git.openwrt.org/feed/routing.git;openwrt-19.07 +src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-19.07 diff --git a/include/version.mk b/include/version.mk index c4f08df578..db0167d811 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),19.07.0-rc1) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),19.07-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r10649-c4fdb377a2) +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/19.07.0-rc1) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/19.07-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 e40490c422..560b66dfc9 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/19.07.0-rc1" + default "http://downloads.openwrt.org/releases/19.07-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 a1340c3515..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r10649-c4fdb377a2 diff --git a/version.date b/version.date deleted file mode 100644 index f39f09546e..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1572996400 |