diff options
| author | Christian Marangi | 2025-12-10 23:49:28 +0000 |
|---|---|---|
| committer | Christian Marangi | 2025-12-10 23:49:28 +0000 |
| commit | 12316d0280c5b45b95f8a15d3e7536e5b709da5a (patch) | |
| tree | c778a8fabbc08396b32202cb0aa3f6ef8c18a60c | |
| parent | c25265953b9c06fafc6091982468ed0cfc30abb0 (diff) | |
| download | openwrt-12316d0280c5b45b95f8a15d3e7536e5b709da5a.tar.gz | |
OpenWrt v25.12: set branch defaults
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
| -rw-r--r-- | feeds.conf.default | 13 | ||||
| -rw-r--r-- | include/version.mk | 4 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 2 | ||||
| -rw-r--r-- | package/system/openwrt-keyring/Makefile | 2 |
4 files changed, 9 insertions, 12 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 05f5c8c47c..c28e51d2b2 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,8 +1,5 @@ -src-git packages https://git.openwrt.org/feed/packages.git -src-git luci https://git.openwrt.org/project/luci.git -src-git routing https://git.openwrt.org/feed/routing.git -src-git telephony https://git.openwrt.org/feed/telephony.git -src-git video https://github.com/openwrt/video.git -#src-git targets https://github.com/openwrt/targets.git -#src-git oldpackages http://git.openwrt.org/packages.git -#src-link custom /usr/src/openwrt/custom-feed +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 b1e414f189..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),SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),25.12-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) 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/snapshots) +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 67ef4d415a..f1439550b0 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -190,7 +190,7 @@ if VERSIONOPT config VERSION_REPO string prompt "Release repository" - default "https://downloads.openwrt.org/snapshots" + 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: diff --git a/package/system/openwrt-keyring/Makefile b/package/system/openwrt-keyring/Makefile index 37b3840603..9cbc03f0f6 100644 --- a/package/system/openwrt-keyring/Makefile +++ b/package/system/openwrt-keyring/Makefile @@ -33,7 +33,7 @@ Build/Compile= ifneq ($(CONFIG_USE_APK),) define Package/openwrt-keyring/install $(INSTALL_DIR) $(1)/etc/apk/keys/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/apk/openwrt-snapshots.pem $(1)/etc/apk/keys/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/apk/openwrt-25.12.pem $(1)/etc/apk/keys/ endef else define Package/openwrt-keyring/install |