diff options
| author | Hauke Mehrtens | 2026-02-19 01:16:14 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-02-19 01:16:14 +0000 |
| commit | 9cbdc2056bb0d34e904e7e45f53e26c4700b883d (patch) | |
| tree | b002e856be26540439c16d5216ebd72c8ebdfe50 | |
| parent | b36d5e3da093c770efb9ce1a865427d5d512377d (diff) | |
| download | openwrt-9cbdc2056bb0d34e904e7e45f53e26c4700b883d.tar.gz | |
OpenWrt v25.12.0-rc5: 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 587ea2b520..c28e51d2b2 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,5 +1,5 @@ -src-git packages https://git.openwrt.org/feed/packages.git^f1aecb34330f0c92da61919ca8afc109034f867b -src-git luci https://git.openwrt.org/project/luci.git^355a432ef90e34a56661dd1d998b203ae8a76283 -src-git routing https://git.openwrt.org/feed/routing.git^5a276c7e3a647299f0bbf9cd0ee92800f8ba9cf8 -src-git telephony https://git.openwrt.org/feed/telephony.git^2618106d5846a4a542fdf5809f0d3ed228ce439b -src-git video https://github.com/openwrt/video.git^094bf58da6682f895255a35a84349a79dab4bf95 +src-git packages https://git.openwrt.org/feed/packages.git;openwrt-25.12 +src-git luci https://git.openwrt.org/project/luci.git;openwrt-25.12 +src-git routing https://git.openwrt.org/feed/routing.git;openwrt-25.12 +src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-25.12 +src-git video https://github.com/openwrt/video.git;openwrt-25.12 diff --git a/include/version.mk b/include/version.mk index 1e8821a02c..0f0d8b0312 100644 --- a/include/version.mk +++ b/include/version.mk @@ -27,13 +27,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),25.12.0-rc5) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),25.12-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r32673-482ba7230a) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12.0-rc5) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12-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 8330f4b96a..5c3e157846 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -198,7 +198,7 @@ if VERSIONOPT config VERSION_REPO string prompt "Release repository" - default "https://downloads.openwrt.org/releases/25.12.0-rc5" + default "https://downloads.openwrt.org/releases/25.12-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: @@ -280,7 +280,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 13aa6f4835..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r32673-482ba7230a diff --git a/version.date b/version.date deleted file mode 100644 index 0bd079a82c..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1771363837 |