diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-04-27 23:05:23 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-04-27 23:05:23 +0200 |
| commit | 863f769b75beb17b1965786f473b700e0ba0f879 (patch) | |
| tree | 55ff53d34863407a467406617d40092fe28305a8 | |
| parent | 5f15225c1e8942c183b573cd34f91d578f83fa57 (diff) | |
| download | upstream-863f769b75beb17b1965786f473b700e0ba0f879.tar.gz upstream-863f769b75beb17b1965786f473b700e0ba0f879.tar.bz2 upstream-863f769b75beb17b1965786f473b700e0ba0f879.zip | |
OpenWrt v22.03.5: adjust config defaultsv22.03.5
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..7b836d03b4 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^d057936acbefd76b033e7c365baa68b48ccb9166 +src-git-full luci https://git.openwrt.org/project/luci.git^0b38d70fbd47b0c702d5001de623213eb301a6fe +src-git-full routing https://git.openwrt.org/feed/routing.git^1cc7676b9f32acc30ec47f15fcb70380d5d6ef01 +src-git-full telephony https://git.openwrt.org/feed/telephony.git^36d9f2f962bd0aba2eef674eb265819609ea99ed diff --git a/include/version.mk b/include/version.mk index ca6a15bdbf..a8b9a23136 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.5) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r20134-5f15225c1e) 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.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 f7f1d7b30a..74b534db55 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.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..a0847790cf --- /dev/null +++ b/version @@ -0,0 +1 @@ +r20134-5f15225c1e diff --git a/version.date b/version.date new file mode 100644 index 0000000000..6628447d78 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1682627295 |