diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-01-19 15:12:19 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-01-19 15:12:19 +0100 |
| commit | b12284a14ce90d77c9b0e77876454e173be5bea6 (patch) | |
| tree | b3482aedb7c2d2534507cb90271c40c05a6be44f | |
| parent | 8055e38794741313f8f4e6059f83c71dc0ab1d1c (diff) | |
| download | upstream-19.07.6.tar.gz upstream-19.07.6.tar.bz2 upstream-19.07.6.zip | |
OpenWrt v19.07.6: adjust config defaultsv19.07.6
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | feeds.conf.default | 10 | ||||
| -rw-r--r-- | include/version.mk | 6 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 4 | ||||
| -rw-r--r-- | version | 1 | ||||
| -rw-r--r-- | version.date | 1 |
5 files changed, 12 insertions, 10 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index ad32ec8f4e..5069765879 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^ce5a4eaea218111350e05ea86de8171344a70ce4 +src-git luci https://git.openwrt.org/project/luci.git^6ba9740b61a3ca89355ae1b08f0456617e0ce3c0 +src-git routing https://git.openwrt.org/feed/routing.git^02b4dbfcb7b8f8b566940847d22d5a6f229d2e66 +src-git telephony https://git.openwrt.org/feed/telephony.git^6e019c94d0fa7162548d528bf4ba060a61f8cb59 +src-git freifunk https://github.com/freifunk/openwrt-packages.git^73454e6fe1bdc902c69ca0079d979fdb94d6fb1f diff --git a/include/version.mk b/include/version.mk index db0167d811..43f045c219 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.6) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r11278-8055e38794) 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.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 560b66dfc9..4fa95ac6d7 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.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 index 0000000000..4732ec03f0 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r11278-8055e38794 diff --git a/version.date b/version.date new file mode 100644 index 0000000000..a4697a10b6 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1611061802 |