diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-01-03 22:03:42 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-01-03 22:03:42 +0100 |
| commit | b08e1e978cea62024d10e0a0124eea5ce9e33891 (patch) | |
| tree | 7506e3a2a85928f6d405e6df92391c616070d2bb | |
| parent | 221fbfa2d854ccb6cd003c065ec308fbc0651b11 (diff) | |
| download | upstream-b08e1e978cea62024d10e0a0124eea5ce9e33891.tar.gz upstream-b08e1e978cea62024d10e0a0124eea5ce9e33891.tar.bz2 upstream-b08e1e978cea62024d10e0a0124eea5ce9e33891.zip | |
OpenWrt v22.03.3: revert to branch defaults
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, 9 insertions, 11 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 2816583881..f20f9db1e4 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git-full packages https://git.openwrt.org/feed/packages.git^2048c5bbf6c482e45b080eef4c1c531936f7f41b -src-git-full luci https://git.openwrt.org/project/luci.git^396f4048bd1f4cae7cb6f085d360081d81ad2d9a -src-git-full routing https://git.openwrt.org/feed/routing.git^1a87333f268bcf0a11e3a665a357cb0d4ec2d680 -src-git-full telephony https://git.openwrt.org/feed/telephony.git^49abbb97e113ce7a35fe632acf6a8fff48dba5ec +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 diff --git a/include/version.mk b/include/version.mk index 9604265c25..ca6a15bdbf 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.3) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r20028-43d71ad93e) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03.3) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03-SNAPSHOT) 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 50d14fad5a..f7f1d7b30a 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.3" + default "https://downloads.openwrt.org/releases/22.03-SNAPSHOT" 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 n + default y 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 deleted file mode 100644 index 76abda2ec7..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r20028-43d71ad93e diff --git a/version.date b/version.date deleted file mode 100644 index 0439d4ffaa..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1672705461 |