OpenWrt v21.02.0: adjust config defaults

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/feeds.conf.default b/feeds.conf.default
index 98bf97232de53b711e17502a6ec1811271f5391b..31375dcbabe401dfef27c00ec89ef5dd253192e0 100644 (file)
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -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^65057dcbb5de371503c9159de3d45824bec482e0
+src-git luci https://git.openwrt.org/project/luci.git^3b3c2e5f9f82372df8ff01ac65668be47690dcd5
+src-git routing https://git.openwrt.org/feed/routing.git^c30c9ffc93702365439a7647244a052531f2e957
+src-git telephony https://git.openwrt.org/feed/telephony.git^7f73a9ad19269dcddcb7fc26e03a9823717587bb

diff --git a/include/version.mk b/include/version.mk
index a4b47c8a57782e7aacab12c735c1210aa586683d..55e84372f7ff9be4f3862d0f7ab38110e043e0fd 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))
 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)

 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))

-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r16279-5cc0535800)

 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
 
 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)

 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
 
 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..f0a3412790e9c9c7b6c8ce1ccc15bd22104e92c6 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"
        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"

                help
                        This is the repository address embedded in the image, it defaults
                        to the trunk snapshot repo; the url may contain the following placeholders:
                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"
        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
                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..9721b65
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r16279-5cc0535800

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