diff --git a/service/matter-netman/Makefile b/service/matter-netman/Makefile index e8af89c..d6bf610 100644 --- a/service/matter-netman/Makefile +++ b/service/matter-netman/Makefile @@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=matter-netman PKG_RELEASE:=2 -PKG_SOURCE_URL:=https://github.com/project-chip/connectedhomeip.git +PKG_SOURCE_URL:=ssh://git@code.cablelabs.com:7999/csa-matter/mirrors/connectedhomeip-staging.git PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBMODULES:=\ third_party/pigweed/repo \ @@ -25,9 +25,9 @@ PKG_SOURCE_SUBMODULES:=\ third_party/nlio/repo # Hash can be regenerated with make package/matter-netman/check FIXUP=1 -PKG_SOURCE_DATE:=2026-06-13 -PKG_SOURCE_VERSION:=b39eff6ed09e92344c3c6cc9a5a1b495a469bbfd -PKG_MIRROR_HASH:=cc87d6df5cc945309bea4c810ba90081fa59dfaaa1daedf9fa199d17e3f313f8 +PKG_SOURCE_DATE:=2026-07-13 +PKG_SOURCE_VERSION:=940263c02d3e9778a194d6c3d810796b5d378ac7 +PKG_MIRROR_HASH:=784d18a457e690a20cb9cd41332e3d60b05892d8baccd2623d118ca67910bb17 # Use local source dir for development # USE_SOURCE_DIR:=$(HOME)/workspace/connectedhomeip @@ -49,7 +49,7 @@ define Package/matter-netman/default CATEGORY:=Network TITLE:=Matter Network Infrastructure Manager Daemon URL:=https://github.com/project-chip/connectedhomeip - DEPENDS:=+libstdcpp +libatomic +libubus +libubox +jsonfilter + DEPENDS:=+libstdcpp +libatomic +libubus +libubox +jsonfilter +rpcd USERID:=matter:matter endef @@ -149,11 +149,12 @@ define Build/Compile endef define Package/matter-netman/default/install - $(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/share/matter $(1)/etc/init.d $(1)/usr/share/acl.d + $(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/share/matter $(1)/etc/init.d $(1)/usr/share/acl.d $(1)/etc/config $(INSTALL_BIN) $(OUT_DIR)/matter-network-manager-app $(1)/usr/sbin $(INSTALL_DATA) ./files/bootstrap.sh $(1)/usr/share/matter/ $(INSTALL_DATA) ./files/matter_acl.json $(1)/usr/share/acl.d $(INSTALL_BIN) ./files/matter.init $(1)/etc/init.d/matter + $(INSTALL_DATA) ./files/matter.config $(1)/etc/config/matter endef Package/matter-netman-mbedtls/install=$(Package/matter-netman/default/install) diff --git a/service/matter-netman/files/bootstrap.sh b/service/matter-netman/files/bootstrap.sh index e2acdb4..e64bbfe 100644 --- a/service/matter-netman/files/bootstrap.sh +++ b/service/matter-netman/files/bootstrap.sh @@ -54,7 +54,7 @@ matter_bootstrap() { # create /etc/matter and /etc/matter/data if needed if ! [ -d /etc/matter/data ]; then if ! [ -d /etc/matter ]; then - mkdir -m 0750 /etc/matter + mkdir -m 0770 /etc/matter chgrp matter /etc/matter fi mkdir -m 0700 /etc/matter/data @@ -72,9 +72,9 @@ matter_bootstrap() { # migration: /etc/matter used to be owned by matter if ! [ -O /etc/matter ]; then - chmod 0400 /etc/matter/chip_factory.ini + chmod 0600 /etc/matter/chip_factory.ini chown matter:matter /etc/matter/chip_factory.ini - chmod 0750 /etc/matter + chmod 0770 /etc/matter chown root:matter /etc/matter fi diff --git a/service/matter-netman/files/matter.config b/service/matter-netman/files/matter.config new file mode 100644 index 0000000..3505bba --- /dev/null +++ b/service/matter-netman/files/matter.config @@ -0,0 +1,4 @@ + +config struct 'values' + option wifi_iface 'default_radio0' + diff --git a/service/matter-netman/files/matter_acl.json b/service/matter-netman/files/matter_acl.json index 83d40c8..45e56cc 100644 --- a/service/matter-netman/files/matter_acl.json +++ b/service/matter-netman/files/matter_acl.json @@ -1,10 +1,22 @@ { - "user": "matter", - "access": { - "otbr": { - "methods": ["*"] - } - }, - "subscribe": [ "otbr" ], - "listen": [ "ubus.object.*" ] + "user": "matter", + "access": { + "otbr": { + "methods": ["*"] + }, + "uci": { + "methods": [ + "get", + "set", + "commit" + ] + }, + "service": { + "methods": [ + "list" + ] + } + }, + "subscribe": [ "otbr", "uci", "service" ], + "listen": [ "ubus.object.*", "uci", "network.interface" ] }