Skip to content

Commit 6e127fd

Browse files
Move CI over to OpenWrt 25.12.4 (#40)
* Move CI over to OpenWrt 25.12.4 * Fix base path handling in overlay.mk * Keep PKG_SOURCE_MIRROR enabled to avoid a download.mk bug * Update README
1 parent 55abbb7 commit 6e127fd

8 files changed

Lines changed: 7 additions & 9 deletions

File tree

.containers/matter-openwrt-build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG OPENWRT_VERSION=24.10.5
1+
ARG OPENWRT_VERSION=25.12.4
22
FROM ghcr.io/openwrt/sdk:x86-generic-${OPENWRT_VERSION}
33
LABEL org.opencontainers.image.description="Pre-warmed OpenWrt SDK"
44

.github/workflows/build-packages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Build
1818
uses: addnab/docker-run-action@v3
1919
with:
20-
image: ghcr.io/project-chip/matter-openwrt-build:24.10.5
20+
image: ghcr.io/project-chip/matter-openwrt-build:25.12.4
2121
options: --volume ${{ github.workspace }}:/workspace
2222
shell: bash
2323
run: |

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Matter is a unified, open-source application-layer connectivity standard built t
1111
This repository is intended to be included as a package feed in an OpenWrt buildroot, and familiarity with the configuration and use of the OpenWrt build system is assumed in the following instructions. Please refer to the [OpenWrt Developer Guide](https://openwrt.org/docs/guide-developer/start) for general guidance on building an OpenWrt system.
1212

1313
Note that this repository is aimed primarily at Matter implementers and OpenWrt integrators, and provides source packages only.
14-
The general policy for the packages in this feed is to target the latest stable release of OpenWrt, currently this is the **24.10.x** line of releases.
14+
The general policy for the packages in this feed is to target the latest stable release of OpenWrt, currently this is the **25.12.x** line of releases.
1515

1616
### Adding the feed
1717

devel/gn/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ include $(TOPDIR)/rules.mk
1717
PKG_NAME:=gn
1818
PKG_SOURCE_URL:=https://gn.googlesource.com/gn
1919
PKG_SOURCE_PROTO:=git-with-metadata
20-
PKG_SOURCE_MIRROR:=0 # don't try OpenWrt mirror
2120

2221
PKG_SOURCE_DATE:=2025-03-21
2322
PKG_SOURCE_VERSION:=6e8e0d6d4a151ab2ed9b4a35366e630c55888444

include/overlay.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023 Project CHIP Authors
1+
# Copyright (c) 2023-2026 Project CHIP Authors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -48,6 +48,8 @@ define BuildPackageOverlay/Build
4848
rm -rf $$(OVERLAY_DIR)
4949
endef
5050

51+
# Base packages should be directly in feeds/base, but before OpenWrt 25 that path can
52+
# point to the root of a core repo working copy, requiring an additional package/ suffix.
5153
overlay_base=$(or $(call overlay_find_core,$(1)),$(error Unable to locate core package '$(1)' (missing base feed?)))
52-
overlay_find_core=$(firstword $(foreach p,package/$(1) feeds/base/package/$(1),$(if $(wildcard $(TOPDIR)/$(p)/Makefile),$(p))))
54+
overlay_find_core=$(firstword $(foreach p,feeds/base/$(1) feeds/base/package/$(1),$(if $(wildcard $(TOPDIR)/$(p)/Makefile),$(p))))
5355
overlay_hash=$(shell find $(1) -type f -not -name '.*' | sort | mkhash md5)

service/matter-netman/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ PKG_NAME:=matter-netman
1818
PKG_RELEASE:=1
1919
PKG_SOURCE_URL:=https://github.com/project-chip/connectedhomeip.git
2020
PKG_SOURCE_PROTO:=git
21-
PKG_SOURCE_MIRROR:=0 # don't try OpenWrt mirror
2221
PKG_SOURCE_SUBMODULES:=\
2322
third_party/pigweed/repo \
2423
third_party/jsoncpp/repo \

third_party/openthread-br/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ PKG_NAME:=openthread-br
3232
PKG_RELEASE:=2
3333
PKG_SOURCE_URL:=https://github.com/openthread/ot-br-posix.git
3434
PKG_SOURCE_PROTO:=git-with-metadata
35-
PKG_SOURCE_MIRROR:=0 # don't try OpenWrt mirror
3635

3736
PKG_SOURCE_DATE:=2025-10-29
3837
PKG_SOURCE_VERSION:=07fc9adf2afd6f697a92c54db922f575c7bcd28f

third_party/openthread-rcp-nrf528xx/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ PKG_NAME:=openthread-rcp-nrf528xx
1818
PKG_RELEASE:=1
1919
PKG_SOURCE_URL:=https://github.com/openthread/ot-nrf528xx.git
2020
PKG_SOURCE_PROTO:=git-with-metadata
21-
PKG_SOURCE_MIRROR:=0 # don't try OpenWrt mirror
2221

2322
# Note: The commit picked for this package should be aligned with that of the
2423
# openthread-br package so that the underlying OpenThread version matches.

0 commit comments

Comments
 (0)