diff --git a/feeds.conf.default b/feeds.conf.default index c28e51d2b2..4718ad5564 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,5 +1,5 @@ -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 +src-git packages https://git.openwrt.org/feed/packages.git^f91b06b3faff7ad3c8cbeb1ab39cef680d2f28ed +src-git luci https://git.openwrt.org/project/luci.git^e9ebca7598ce2f754b76267fd66bf2b85e6e4347 +src-git routing https://git.openwrt.org/feed/routing.git^b2097c85bef85251364f59a6b2a3ed1f9f5c0c21 +src-git telephony https://git.openwrt.org/feed/telephony.git^2618106d5846a4a542fdf5809f0d3ed228ce439b +src-git video https://github.com/openwrt/video.git^094bf58da6682f895255a35a84349a79dab4bf95 diff --git a/include/version.mk b/include/version.mk index 0f0d8b0312..40e79ad5d4 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-SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),25.12.4) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r32933-4ccb782af7) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12-SNAPSHOT) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12.4) 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 5c3e157846..7129c4b8f9 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-SNAPSHOT" + default "https://downloads.openwrt.org/releases/25.12.4" 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 y + default n 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 new file mode 100644 index 0000000000..093c5fb941 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r32933-4ccb782af7 diff --git a/version.date b/version.date new file mode 100644 index 0000000000..b085d0b181 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1778712129