diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2023-04-09 23:35:24 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2023-04-09 23:35:24 +0100 |
| commit | 1d4db4e4dbc0078cc216753dc959b87ce430f11e (patch) | |
| tree | efa98fd7a38d5d627fd505c68dcfa7cea51d6ec4 | |
| parent | 94adc23fa693d1b129ce1718573dfb12594f20f8 (diff) | |
| download | upstream-1d4db4e4dbc0078cc216753dc959b87ce430f11e.tar.gz upstream-1d4db4e4dbc0078cc216753dc959b87ce430f11e.tar.bz2 upstream-1d4db4e4dbc0078cc216753dc959b87ce430f11e.zip | |
OpenWrt v22.03.4: revert to branch defaults
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -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 39fda39ba5..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^38cb0129739bc71e0bb5a25ef1f6db70b7add04b -src-git-full luci https://git.openwrt.org/project/luci.git^ce20b4a6e0c86313c0c6e9c89eedf8f033f5e637 -src-git-full routing https://git.openwrt.org/feed/routing.git^1cc7676b9f32acc30ec47f15fcb70380d5d6ef01 -src-git-full telephony https://git.openwrt.org/feed/telephony.git^5087c7ecbc4f4e3227bd16c6f4d1efb0d3edf460 +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 ce8a2d20e8..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.4) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r20123-38ccc47687) +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.4) +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 297d39c189..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.4" + 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 10182b9d04..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r20123-38ccc47687 diff --git a/version.date b/version.date deleted file mode 100644 index fb4879c09c..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1681043266 |