OpenWrt v21.02.6: adjust config defaults

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/feeds.conf.default b/feeds.conf.default
index f1827a366187398b95c0577a64af1b7dc0c4a530..7b4bcd6128058f68d2cec4f67a0b53bb4278a03b 100644 (file)
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,5 +1,4 @@
-src-git-full packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
-src-git-full luci https://git.openwrt.org/project/luci.git;openwrt-21.02
-src-git-full routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
-src-git-full telephony https://git.openwrt.org/feed/telephony.git;openwrt-21.02
-#src-link custom /usr/src/openwrt/custom-feed
+src-git-full packages https://git.openwrt.org/feed/packages.git^0b7b12d7075637d3ce3c4eb22b74b2f6d3054672
+src-git-full luci https://git.openwrt.org/project/luci.git^e98243ef9eb838cca80cdd6d1bd0cf69a509d103
+src-git-full routing https://git.openwrt.org/feed/routing.git^8071852b4556a02533cacb7a0f6a432df3507302
+src-git-full telephony https://git.openwrt.org/feed/telephony.git^920fbc5c0a2e4badf51bceff42e9a1e3eb693462

diff --git a/include/version.mk b/include/version.mk
index a4b47c8a57782e7aacab12c735c1210aa586683d..bc136b2c274811af60e7decebec2d84a67be9ebb 100644 (file)
--- 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),21.02-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),21.02.6)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r16842-bc99ce5b22)
 
 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.6)
 
 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 1f06332b00444989e33bb38b5953ab0e76983bd7..55913094bcf11268ef7b6520de0a3bc8f12cb9f5 100644 (file)
--- 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/21.02-SNAPSHOT"
+               default "https://downloads.openwrt.org/releases/21.02.6"
                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..d116407
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r16842-bc99ce5b22

diff --git a/version.date b/version.date
new file mode 100644 (file)
index 0000000..22e64c5
--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
+1681043296