OpenWrt v19.07.7: revert to branch defaults
authorHauke Mehrtens <hauke@hauke-m.de>
Tue, 16 Feb 2021 22:30:33 +0000 (23:30 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Tue, 16 Feb 2021 22:30:33 +0000 (23:30 +0100)
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
feeds.conf.default
include/version.mk
package/base-files/image-config.in
version [deleted file]
version.date [deleted file]

index 841430159ccb0d012f2158a4033e48f21636cb6f..ad32ec8f4e65bb122ea14e8e03a0770def645c7a 100644 (file)
@@ -1,5 +1,5 @@
-src-git packages https://git.openwrt.org/feed/packages.git^90af10d01579425369bd474051b6d3ddaf32a7e3
-src-git luci https://git.openwrt.org/project/luci.git^34e0d656a41befd9720be35c4831c9f136a67c59
-src-git routing https://git.openwrt.org/feed/routing.git^e26b4745209655976b7d124465b1dc53ade632f9
-src-git telephony https://git.openwrt.org/feed/telephony.git^6e019c94d0fa7162548d528bf4ba060a61f8cb59
-src-git freifunk https://github.com/freifunk/openwrt-packages.git^c621a4283870fe062489fe5e26a15deda7ef4ed7
+src-git packages https://git.openwrt.org/feed/packages.git;openwrt-19.07
+src-git luci https://git.openwrt.org/project/luci.git;openwrt-19.07
+src-git routing https://git.openwrt.org/feed/routing.git;openwrt-19.07
+src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-19.07
+src-git freifunk https://github.com/freifunk/openwrt-packages.git;openwrt-19.07
index 7c2d92a833f9e0df2ad41cd715527f667f5a48f8..db0167d811627d9917b683f4453fabbe42619816 100644 (file)
@@ -26,13 +26,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),19.07.7)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),19.07-SNAPSHOT)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r11306-c4a6851c72)
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/19.07.7)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/19.07-SNAPSHOT)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
index 3bed22d6412f762a2aa8b69c7af57d659bdeeffc..560b66dfc91b81f8a9d553c8b07eeb599fb9b6b2 100644 (file)
@@ -183,7 +183,7 @@ if VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository"
-               default "http://downloads.openwrt.org/releases/19.07.7"
+               default "http://downloads.openwrt.org/releases/19.07-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:
@@ -259,7 +259,7 @@ if VERSIONOPT
        config VERSION_CODE_FILENAMES
                bool
                prompt "Revision code in filenames"
-               default n
+               default y
                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
deleted file mode 100644 (file)
index f24f174..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-r11306-c4a6851c72
diff --git a/version.date b/version.date
deleted file mode 100644 (file)
index ef32bb7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-1613402557