diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-08-01 18:45:59 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-08-01 18:45:59 +0200 |
| commit | 31f2f76cd5d7745e28fae3797d79b746360461f5 (patch) | |
| tree | a97887015feec41de89144da4817fe58be390be9 | |
| parent | ef56c858482d85db6d6394a0786173e6002253d9 (diff) | |
| download | upstream-31f2f76cd5d7745e28fae3797d79b746360461f5.tar.gz upstream-31f2f76cd5d7745e28fae3797d79b746360461f5.tar.bz2 upstream-31f2f76cd5d7745e28fae3797d79b746360461f5.zip | |
OpenWrt v19.07.8: adjust config defaultsv19.07.8
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..43f224a649 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^c6ae1c6a0fced32c171e228e3425a9b655585011 +src-git luci https://git.openwrt.org/project/luci.git^7b931da4779c68f5aef5908286c2ae5283d2dece +src-git routing https://git.openwrt.org/feed/routing.git^101632e153b41238bc19dfd96ba2d23339dbcb76 +src-git telephony https://git.openwrt.org/feed/telephony.git^affee75beff7ed8445f6bc84deff13465c331027 +src-git freifunk https://github.com/freifunk/openwrt-packages.git^c621a4283870fe062489fe5e26a15deda7ef4ed7 diff --git a/include/version.mk b/include/version.mk index db0167d811..238316173f 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.8) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r11364-ef56c85848) 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.8) 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..ac5dfb4953 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.8" 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..43827c2902 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r11364-ef56c85848 diff --git a/version.date b/version.date new file mode 100644 index 0000000000..f45c4dd432 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1627588228 |