summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-04-17 19:35:25 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-17 19:35:25 +0200
commitd03dc49943db1d02ff89e056a18eefe5e2d51dec (patch)
tree1632eef7d32c000dfd7694235c08fa94f5cb3db9
parent9ce6aa9d8d8a1147dcf03cb509cafb5fa7339a91 (diff)
downloadopenwrt-d03dc49943db1d02ff89e056a18eefe5e2d51dec.tar.gz
openwrt-d03dc49943db1d02ff89e056a18eefe5e2d51dec.tar.bz2
openwrt-d03dc49943db1d02ff89e056a18eefe5e2d51dec.zip
OpenWrt v19.07.10: adjust config defaultsv19.07.10
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--feeds.conf.default10
-rw-r--r--include/version.mk6
-rw-r--r--package/base-files/image-config.in4
-rw-r--r--version1
-rw-r--r--version.date1
5 files changed, 12 insertions, 10 deletions
diff --git a/feeds.conf.default b/feeds.conf.default
index ad32ec8f4e..ca7b3e9f5f 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,5 +1,5 @@
-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
+src-git packages https://git.openwrt.org/feed/packages.git^1c5e4c80f49bfddaee1998636fd8efe915fee7fc
+src-git luci https://git.openwrt.org/project/luci.git^786ebc9c014efed4df0d67b140b2348a58d99f5b
+src-git routing https://git.openwrt.org/feed/routing.git^33254957df8d148631a98c49a5b623f996d8d6fc
+src-git telephony https://git.openwrt.org/feed/telephony.git^c6bff940c0d3e73eac0d8ec62bf1e86f1c3cbefe
+src-git freifunk https://github.com/freifunk/openwrt-packages.git^944ff29d953a0de7e7fcca7b0907f7d7486b7b4c
diff --git a/include/version.mk b/include/version.mk
index db0167d811..ebcd927a3f 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -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-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),19.07.10)
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r11427-9ce6aa9d8d)
VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/19.07-SNAPSHOT)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/19.07.10)
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 560b66dfc9..00cc054acf 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 "http://downloads.openwrt.org/releases/19.07-SNAPSHOT"
+ default "http://downloads.openwrt.org/releases/19.07.10"
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
index 0000000000..819e5bdeaa
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r11427-9ce6aa9d8d
diff --git a/version.date b/version.date
new file mode 100644
index 0000000000..d7de15cb75
--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
+1650114812