diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2021-02-16 02:16:25 +0100 |
|---|---|---|
| committer | Alexander Couzens <lynxis@fe80.eu> | 2021-02-16 02:21:33 +0100 |
| commit | 1cd121dd11aadc799b179ebb8600f27621acc84f (patch) | |
| tree | 666aa943576e3df2bbb29a2c7a29dc52cb2687d2 | |
| parent | 46b6ee7ffc457af8aad1a0f7e5936f50041141d8 (diff) | |
| download | upstream-1cd121dd11aadc799b179ebb8600f27621acc84f.tar.gz upstream-1cd121dd11aadc799b179ebb8600f27621acc84f.tar.bz2 upstream-1cd121dd11aadc799b179ebb8600f27621acc84f.zip | |
OpenWrt v21.02: set branch defaults
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
| -rw-r--r-- | feeds.conf.default | 14 | ||||
| -rw-r--r-- | include/version.mk | 4 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 03bfacb620..c30a8fbc23 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,10 +1,6 @@ -src-git packages https://git.openwrt.org/feed/packages.git -src-git luci https://git.openwrt.org/project/luci.git -src-git routing https://git.openwrt.org/feed/routing.git -src-git telephony https://git.openwrt.org/feed/telephony.git -src-git freifunk https://github.com/freifunk/openwrt-packages.git -#src-git video https://github.com/openwrt/video.git -#src-git targets https://github.com/openwrt/targets.git -#src-git management https://github.com/openwrt-management/packages.git -#src-git oldpackages http://git.openwrt.org/packages.git +src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02 +src-git luci https://git.openwrt.org/project/luci.git;openwrt-21.02 +src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02 +src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-21.02 +src-git freifunk https://github.com/freifunk/openwrt-packages.git;openwrt-21.02 #src-link custom /usr/src/openwrt/custom-feed diff --git a/include/version.mk b/include/version.mk index f39e35cd09..a4b47c8a57 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),SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),21.02-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) 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/snapshots) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/21.02-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 b5cd90f615..1f06332b00 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/snapshots" + default "https://downloads.openwrt.org/releases/21.02-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: |