diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-15 14:45:57 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-15 14:45:57 +0200 |
| commit | ea845f76ea2406a4c70d96141d6386b81bba5431 (patch) | |
| tree | 99dcb7fc45352bde549f24c74094d5c377526285 | |
| parent | 9a599fee939e8d4276d6ee72aa549756f205988a (diff) | |
| download | upstream-ea845f76ea2406a4c70d96141d6386b81bba5431.tar.gz upstream-ea845f76ea2406a4c70d96141d6386b81bba5431.tar.bz2 upstream-ea845f76ea2406a4c70d96141d6386b81bba5431.zip | |
OpenWrt v22.03.2: adjust config defaultsv22.03.2
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..1de500be4a 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^dba8a0102e5965cad58a871335002e9c964b6719 +src-git-full luci https://git.openwrt.org/project/luci.git^96ec0cd3ccfe954f13fd5a337efdd70374dde03f +src-git-full routing https://git.openwrt.org/feed/routing.git^85028704f688a6768d3f10d5d3c10a799a121e0d +src-git-full telephony https://git.openwrt.org/feed/telephony.git^1d2031a5c82816483c51bca15649e2957fbe2bc2 diff --git a/include/version.mk b/include/version.mk index ca6a15bdbf..3802c71306 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.2) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19803-9a599fee93) 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.2) 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..0ef4236623 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.2" 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..c07843d65e --- /dev/null +++ b/version @@ -0,0 +1 @@ +r19803-9a599fee93 diff --git a/version.date b/version.date new file mode 100644 index 0000000000..6279309d29 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1665787481 |