diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-01-06 22:41:02 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-01-06 22:41:02 +0100 |
| commit | eb156345419953a382cda233bffa4291f5cb78d8 (patch) | |
| tree | ebbc39595f48b7b70a2dc278576dd41bfc3978f0 | |
| parent | aca39acedf98aa7e40119692f6b94681096becd2 (diff) | |
| download | upstream-eb156345419953a382cda233bffa4291f5cb78d8.tar.gz upstream-eb156345419953a382cda233bffa4291f5cb78d8.tar.bz2 upstream-eb156345419953a382cda233bffa4291f5cb78d8.zip | |
OpenWrt v19.07.0: revert to branch defaults
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -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 eaf5570e6b..42c2b0ba3b 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://git.openwrt.org/feed/packages.git^d974cd36735353204fac679cb9febd6c9814c326 -src-git luci https://git.openwrt.org/project/luci.git^35aa5270592f7e837c42aa097f8fbb06faa4017d -src-git routing https://git.openwrt.org/feed/routing.git^c82ce8d095a87df32bbd3a89e3cf113721d3ae82 -src-git telephony https://git.openwrt.org/feed/telephony.git^6f95d6ab3f359ee2ce81c20522700937424d1591 +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 1d0fd996d6..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) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),19.07-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r10860-a3ffeb413b) +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) +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 7eb396fc6f..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" + 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 dc0309aaaa..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r10860-a3ffeb413b diff --git a/version.date b/version.date deleted file mode 100644 index b468e9cffa..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1578329229 |