OpenWrt v18.06.2: revert to branch defaults
authorJo-Philipp Wich <jo@mein.io>
Wed, 30 Jan 2019 12:34:55 +0000 (13:34 +0100)
committerJo-Philipp Wich <jo@mein.io>
Wed, 30 Jan 2019 12:34:55 +0000 (13:34 +0100)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
feeds.conf.default
include/version.mk
package/base-files/image-config.in
version [deleted file]
version.date [deleted file]

index 1f1e7fac164a6f5cb3cd09095e13c0900c092eda..763a26902e5fedbcbbc68a866b384fcf176a1f1e 100644 (file)
@@ -1,4 +1,4 @@
-src-git packages https://git.openwrt.org/feed/packages.git^911bbd6bb4856f1e28ae00af37df62e4fa3529e5
-src-git luci https://git.openwrt.org/project/luci.git^6f6641d97de2c85ee5d87beda92ae8437d1dbdf5
-src-git routing https://git.openwrt.org/feed/routing.git^ea345d16a6e27c2a8fdf67bf543cc36a5f189131
-src-git telephony https://git.openwrt.org/feed/telephony.git^cb939d9677d6e38c428f9f297641d07611edeb04
+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
index 1e8e98390eb83fad5b24eae4e7d261fc40f08572..1c4b01c7e76466c18dd21e06d9c627cd271c9d8a 100644 (file)
@@ -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),18.06.2)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06-SNAPSHOT)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7676-cddd7b4c77)
+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.2)
+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)
index 39fedf64fecf8224711e4abbb0ec7264a91e985c..6c9d631d0419e40310ccbe1f793173058e44fb91 100644 (file)
@@ -183,7 +183,7 @@ if VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository"
-               default "http://downloads.openwrt.org/releases/18.06.2"
+               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:
@@ -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 (file)
index 5811826..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-r7676-cddd7b4c77
diff --git a/version.date b/version.date
deleted file mode 100644 (file)
index 7bf15f5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-1548850862