diff options
| author | Paul Spooren <mail@aparcar.org> | 2022-05-21 18:36:24 +0200 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2022-05-21 18:36:24 +0200 |
| commit | fca0069247e785c9b2086745da408c1787051f79 (patch) | |
| tree | 6bed41fc2c5931542d1e7ecce7274bd55f46a6bb | |
| parent | 4f6f9caf1f054d9a52f50ecb766fb3aa9de8d429 (diff) | |
| download | upstream-fca0069247e785c9b2086745da408c1787051f79.tar.gz upstream-fca0069247e785c9b2086745da408c1787051f79.tar.bz2 upstream-fca0069247e785c9b2086745da408c1787051f79.zip | |
OpenWrt v22.03.0-rc2: revert to branch defaults
Signed-off-by: Paul Spooren <mail@aparcar.org>
| -rw-r--r-- | feeds.conf.default | 8 | ||||
| -rw-r--r-- | include/version.mk | 6 | ||||
| -rw-r--r-- | version | 1 | ||||
| -rw-r--r-- | version.date | 1 |
4 files changed, 7 insertions, 9 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 841a6da90a..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^b708cf5a17a1498b02c3ca4fd66f99aba3773c9c -src-git-full luci https://git.openwrt.org/project/luci.git^d8ecf48f20da632af86def0f18093861c522914b -src-git-full routing https://git.openwrt.org/feed/routing.git^f6d2b09643dfdc3b3916cb116ebc3f45a058fae6 -src-git-full telephony https://git.openwrt.org/feed/telephony.git^4c148548df2aae3c036a5e309ff0474dbb1f48ac +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 34fd7bb6f6..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.0-rc2) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19374-34b6abf5a8) +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.0-rc2) +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/version b/version deleted file mode 100644 index 45bcab782f..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r19374-34b6abf5a8 diff --git a/version.date b/version.date deleted file mode 100644 index 439ca52c2b..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1653140740 |