diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-08-16 18:36:52 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-08-16 18:36:52 +0200 |
| commit | 4b4a6308e711e6fb614d4886a9887fac040a1d56 (patch) | |
| tree | eb0b9b7f3a29f46a553845626fcfa9b324b31cb8 | |
| parent | 70255e3d624cd393612069aae0a859d1acbbeeae (diff) | |
| download | upstream-4b4a6308e711e6fb614d4886a9887fac040a1d56.tar.gz upstream-4b4a6308e711e6fb614d4886a9887fac040a1d56.tar.bz2 upstream-4b4a6308e711e6fb614d4886a9887fac040a1d56.zip | |
OpenWrt v18.06.1: revert to branch defaults
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | feeds.conf.default | 8 | ||||
| -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, 9 insertions, 11 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 9dddc19532..763a26902e 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://git.openwrt.org/feed/packages.git^35e0b737ab496f5b51e80079b0d8c9b442e223f5 -src-git luci https://git.openwrt.org/project/luci.git^f64b1523447547032d5280fb0bcdde570f2ca913 -src-git routing https://git.openwrt.org/feed/routing.git^1b9d1c419f0ecefda51922a7845ab2183d6acd76 -src-git telephony https://git.openwrt.org/feed/telephony.git^b9d7b321d15a44c5abb9e5d43a4ec78abfd9031b +src-git packages https://git.openwrt.org/feed/packages.git;openwrt-18.06 +src-git luci https://git.openwrt.org/project/luci.git;openwrt-18.06 +src-git routing https://git.openwrt.org/feed/routing.git;openwrt-18.06 +src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-18.06 diff --git a/include/version.mk b/include/version.mk index ffa0fd52b0..5522830742 100644 --- a/include/version.mk +++ b/include/version.mk @@ -25,13 +25,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),18.06.1) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7258-5eb055306f) +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/18.06.1) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/18.06-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 4ea8d55f75..cee8cd54e1 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/18.06.1" + default "http://downloads.openwrt.org/releases/18.06-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: @@ -253,7 +253,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 42dde3feba..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r7258-5eb055306f diff --git a/version.date b/version.date deleted file mode 100644 index 5cf9b5d484..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1534405875 |