diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-17 19:35:44 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-17 19:35:44 +0200 |
| commit | f6e22f0956a1d6ad28d007f80fc9cf4dec51d462 (patch) | |
| tree | 4cfd9ffb4c3daf74995f408b8342092cfb90d45a | |
| parent | d03dc49943db1d02ff89e056a18eefe5e2d51dec (diff) | |
| download | openwrt-f6e22f0956a1d6ad28d007f80fc9cf4dec51d462.tar.gz openwrt-f6e22f0956a1d6ad28d007f80fc9cf4dec51d462.tar.bz2 openwrt-f6e22f0956a1d6ad28d007f80fc9cf4dec51d462.zip | |
OpenWrt v19.07.10: revert to branch defaults
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, 10 insertions, 12 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index ca7b3e9f5f..ad32ec8f4e 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,5 +1,5 @@ -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 +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 diff --git a/include/version.mk b/include/version.mk index ebcd927a3f..db0167d811 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.10) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),19.07-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r11427-9ce6aa9d8d) +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.10) +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) diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 00cc054acf..560b66dfc9 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.10" + 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 index 819e5bdeaa..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r11427-9ce6aa9d8d diff --git a/version.date b/version.date deleted file mode 100644 index d7de15cb75..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1650114812 |