OpenWrt v21.02.0-rc1: adjust config defaults v21.02.0-rc1
authorHauke Mehrtens <hauke@hauke-m.de>
Mon, 19 Apr 2021 19:10:14 +0000 (21:10 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Mon, 19 Apr 2021 19:10:14 +0000 (21:10 +0200)
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
feeds.conf.default
include/version.mk
package/base-files/image-config.in
version [new file with mode: 0644]
version.date [new file with mode: 0644]

index 98bf97232de53b711e17502a6ec1811271f5391b..afb9b2e6dc79fb9128ecb4bb571ba4b2bf384cd8 100644 (file)
@@ -1,5 +1,4 @@
-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-link custom /usr/src/openwrt/custom-feed
+src-git packages https://git.openwrt.org/feed/packages.git^4ceeb8fc90ed2c2e650ddddc855e7ed1df071c22
+src-git luci https://git.openwrt.org/project/luci.git^7d913b997601d533cca187cfc1b3057c3c98effc
+src-git routing https://git.openwrt.org/feed/routing.git^5b4d4c7fb6a97cac68c7d8b156fd0ab27bab4dcc
+src-git telephony https://git.openwrt.org/feed/telephony.git^178822957123b821407e1216e9e7314161512ac6
index a4b47c8a57782e7aacab12c735c1210aa586683d..4ca8de266702af765207432005a2d9bd11a4e1e1 100644 (file)
@@ -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),21.02-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),21.02.0-rc1)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r16046-59980f7aaf)
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/21.02-SNAPSHOT)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/21.02.0-rc1)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
index 1f06332b00444989e33bb38b5953ab0e76983bd7..49d2075d161df51dce6a8edfa3f5b44ef633b876 100644 (file)
@@ -183,7 +183,7 @@ if VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository"
-               default "https://downloads.openwrt.org/releases/21.02-SNAPSHOT"
+               default "https://downloads.openwrt.org/releases/21.02.0-rc1"
                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 y
+               default n
                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
new file mode 100644 (file)
index 0000000..e070ccd
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r16046-59980f7aaf
diff --git a/version.date b/version.date
new file mode 100644 (file)
index 0000000..1dbfc03
--- /dev/null
@@ -0,0 +1 @@
+1618740417