diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-11-08 20:32:24 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-11-08 20:32:24 +0100 |
| commit | 5e4533cdd4b132959bf24dbfd546466a1fabb232 (patch) | |
| tree | 6ba5d7f206ea71bd1a2349810d46026f85f96c15 | |
| parent | 9d401013fc61b0ca51cd557b9922052b2c3cce26 (diff) | |
| download | upstream-5e4533cdd4b132959bf24dbfd546466a1fabb232.tar.gz upstream-5e4533cdd4b132959bf24dbfd546466a1fabb232.tar.bz2 upstream-5e4533cdd4b132959bf24dbfd546466a1fabb232.zip | |
OpenWrt v18.06.5: adjust config defaultsv18.06.5
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, 11 insertions, 9 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 763a26902e..4c92252701 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^340d5ce71ee60c1d699e7e0ead9422bed6f8519f +src-git luci https://git.openwrt.org/project/luci.git^bc17ef673f734ea8e7e696ba5735588da9111dcd +src-git routing https://git.openwrt.org/feed/routing.git^c52779c05a4cf838c736327d8b042ee59f782331 +src-git telephony https://git.openwrt.org/feed/telephony.git^06a5323734038c3866f507787256581dba3d8522 diff --git a/include/version.mk b/include/version.mk index 1c4b01c7e7..b19a047796 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-SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06.5) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7897-9d401013fc) 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.openwrt.org/releases/18.06.5) 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 6c9d631d04..335fb1a298 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-SNAPSHOT" + default "http://downloads.openwrt.org/releases/18.06.5" 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 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..d980c85850 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r7897-9d401013fc diff --git a/version.date b/version.date new file mode 100644 index 0000000000..1601877f27 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1572963138 |