diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-06 23:01:47 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-06 23:01:47 +0200 |
| commit | 0345c613bae718fcbdc2d1103a00749ee140d1da (patch) | |
| tree | dfaef96c28e88ebcc015013bd01563626a09c63b | |
| parent | bfd070e7fa5ad715fb1a8f8449ab5d7750c59338 (diff) | |
| download | upstream-0345c613bae718fcbdc2d1103a00749ee140d1da.tar.gz upstream-0345c613bae718fcbdc2d1103a00749ee140d1da.tar.bz2 upstream-0345c613bae718fcbdc2d1103a00749ee140d1da.zip | |
OpenWrt v22.03.0-rc5: adjust config defaultsv22.03.0-rc5
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 f20f9db1e4..e357208dc8 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git-full packages https://git.openwrt.org/feed/packages.git;openwrt-22.03 -src-git-full luci https://git.openwrt.org/project/luci.git;openwrt-22.03 -src-git-full routing https://git.openwrt.org/feed/routing.git;openwrt-22.03 -src-git-full telephony https://git.openwrt.org/feed/telephony.git;openwrt-22.03 +src-git-full packages https://git.openwrt.org/feed/packages.git^a686f7975a37cfd44bb33b24610a6950da450139 +src-git-full luci https://git.openwrt.org/project/luci.git^ee5576f5e3f3623f75cb84fd9182756f41c97610 +src-git-full routing https://git.openwrt.org/feed/routing.git^1ccc4e435175e6ba5ac60e626e1e95eb25c5757b +src-git-full telephony https://git.openwrt.org/feed/telephony.git^1d2031a5c82816483c51bca15649e2957fbe2bc2 diff --git a/include/version.mk b/include/version.mk index ca6a15bdbf..635ef4d547 100644 --- a/include/version.mk +++ b/include/version.mk @@ -23,13 +23,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),22.03-SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03.0-rc5) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19523-bfd070e7fa) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03-SNAPSHOT) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03.0-rc5) 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 f7f1d7b30a..e6111459f4 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 "https://downloads.openwrt.org/releases/22.03-SNAPSHOT" + default "https://downloads.openwrt.org/releases/22.03.0-rc5" 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..3a4b8a56e5 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r19523-bfd070e7fa diff --git a/version.date b/version.date new file mode 100644 index 0000000000..5032dba0ff --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1657134579 |