OpenWrt v22.03.0: revert to branch defaults
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
17bd6b0477
commit
510f0628c7
|
@ -1,4 +1,4 @@
|
||||||
src-git-full packages https://git.openwrt.org/feed/packages.git^426ccd2e0cf56394017d32b864cd66a570852706
|
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^487e58a0a61f8d2396893bd9fa6695269b1fd1d3
|
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^8872359011eee64981804f7ed42d5d6b54add6d8
|
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^1d2031a5c82816483c51bca15649e2957fbe2bc2
|
src-git-full telephony https://git.openwrt.org/feed/telephony.git;openwrt-22.03
|
||||||
|
|
|
@ -23,13 +23,13 @@ PKG_CONFIG_DEPENDS += \
|
||||||
sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
|
sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
|
||||||
|
|
||||||
VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
|
VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
|
||||||
VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03.0)
|
VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03-SNAPSHOT)
|
||||||
|
|
||||||
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
|
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
|
||||||
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19685-512e76967f)
|
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
|
||||||
|
|
||||||
VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
|
VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
|
||||||
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03.0)
|
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03-SNAPSHOT)
|
||||||
|
|
||||||
VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
|
VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
|
||||||
VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
|
VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
|
||||||
|
|
|
@ -183,7 +183,7 @@ if VERSIONOPT
|
||||||
config VERSION_REPO
|
config VERSION_REPO
|
||||||
string
|
string
|
||||||
prompt "Release repository"
|
prompt "Release repository"
|
||||||
default "https://downloads.openwrt.org/releases/22.03.0"
|
default "https://downloads.openwrt.org/releases/22.03-SNAPSHOT"
|
||||||
help
|
help
|
||||||
This is the repository address embedded in the image, it defaults
|
This is the repository address embedded in the image, it defaults
|
||||||
to the trunk snapshot repo; the url may contain the following placeholders:
|
to the trunk snapshot repo; the url may contain the following placeholders:
|
||||||
|
@ -259,7 +259,7 @@ if VERSIONOPT
|
||||||
config VERSION_CODE_FILENAMES
|
config VERSION_CODE_FILENAMES
|
||||||
bool
|
bool
|
||||||
prompt "Revision code in filenames"
|
prompt "Revision code in filenames"
|
||||||
default n
|
default y
|
||||||
help
|
help
|
||||||
Enable this to include the revision identifier or the configured
|
Enable this to include the revision identifier or the configured
|
||||||
version code into the firmware image, SDK- and Image Builder archive
|
version code into the firmware image, SDK- and Image Builder archive
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
1662173734
|
|
Loading…
Reference in New Issue