diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-06-21 14:26:23 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-06-21 14:26:23 +0200 |
| commit | 467adaf6c5c3dd73be74397b0d3d9bee56a72d83 (patch) | |
| tree | d1a7d76bcf75b5abf434479d95adc44695070d1f | |
| parent | 4382d4ce19a95aa0d2ebd098c6b54feced21e7f9 (diff) | |
| download | upstream-467adaf6c5c3dd73be74397b0d3d9bee56a72d83.tar.gz upstream-467adaf6c5c3dd73be74397b0d3d9bee56a72d83.tar.bz2 upstream-467adaf6c5c3dd73be74397b0d3d9bee56a72d83.zip | |
OpenWrt v18.06.3: 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 50c21df8ad..763a26902e 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://git.openwrt.org/feed/packages.git^7879bbdb4ba35888c096a85367f98efbc617ebec -src-git luci https://git.openwrt.org/project/luci.git^4d6d8bc5b0d7ee71c7b29b12e7e0c2e1e86cb268 -src-git routing https://git.openwrt.org/feed/routing.git^7589804a56baac804421b492c93004c28a627abb -src-git telephony https://git.openwrt.org/feed/telephony.git^16bad9e04dcff392e9a92eea005127c06dfebd9c +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 234d21174d..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.3) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7798-97ae9e0ccb) +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.3) +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 7a6ffe191b..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.3" + 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 cdd4e2ecf1..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r7798-97ae9e0ccb diff --git a/version.date b/version.date deleted file mode 100644 index 6c84b3084f..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1561119445 |