diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-11-30 19:40:45 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-11-30 19:40:45 +0100 |
| commit | 628e9969288a605565793358bf7468276b8774e6 (patch) | |
| tree | f63877fb13a7884a68792a544a014c4bd33c4e33 | |
| parent | db8345d8e43f0cc8ac8cf53fbab4037bfe33cfa3 (diff) | |
| download | upstream-628e9969288a605565793358bf7468276b8774e6.tar.gz upstream-628e9969288a605565793358bf7468276b8774e6.tar.bz2 upstream-628e9969288a605565793358bf7468276b8774e6.zip | |
OpenWrt v19.07.0-rc2: adjust config defaultsv19.07.0-rc2
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, 11 insertions, 9 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 42c2b0ba3b..cb1876927a 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -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 +src-git packages https://git.openwrt.org/feed/packages.git^00803ffc91e80b16e9c1603ff32106d42e255923 +src-git luci https://git.openwrt.org/project/luci.git^039ef1f4deba725d3591b159bbc9569885d68131 +src-git routing https://git.openwrt.org/feed/routing.git^8d5ee29f088e9dfaa49dc74573edb1919f14dbf4 +src-git telephony https://git.openwrt.org/feed/telephony.git^44d82fa226dc36a53043fdffdb9688d34a16a18c diff --git a/include/version.mk b/include/version.mk index db0167d811..54f6db8b3d 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-SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),19.07.0-rc2) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r10775-db8345d8e4) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/19.07-SNAPSHOT) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/19.07.0-rc2) 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 560b66dfc9..a3ca7dc070 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-SNAPSHOT" + default "http://downloads.openwrt.org/releases/19.07.0-rc2" 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..c536fad469 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r10775-db8345d8e4 diff --git a/version.date b/version.date new file mode 100644 index 0000000000..fe69184a1c --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1575129153 |