From 43436e4726337008e972e39d316f22a19d59e0c6 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 11 Jul 2023 12:32:35 +0200 Subject: [PATCH] ucentral-schema: update to latest HEAD 2d702af add swconfig support Signed-off-by: John Crispin --- feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network | 3 +-- feeds/ucentral/ucentral-schema/Makefile | 4 ++-- .../files/etc/uci-defaults/99-ucentral-network | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network b/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network index 13889217a..61019712d 100755 --- a/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network +++ b/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network @@ -117,10 +117,9 @@ qcom_setup_interfaces() ucidef_add_switch_attr "switch1" "reset" "true" ;; edgecore,eap104) - ucidef_set_interface_lan "lan1 lan2 lan3 lan4" ucidef_set_interface_wan "eth0" ucidef_add_switch "switch1" \ - "6@eth1" "1:lan1" "2:lan2" "3:lan3" "4:lan4" + "6@eth1" "1:lan" "2:lan" "3:lan" "4:lan" ;; cybertan,eww631-a1) ucidef_set_interface_wan "eth0" diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index 8dc54c64f..1714e7287 100644 --- a/feeds/ucentral/ucentral-schema/Makefile +++ b/feeds/ucentral/ucentral-schema/Makefile @@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git -PKG_MIRROR_HASH:=fa25d47aafcd8a842ff0637126055beac421db6462e410ce53b4dd97e297d9ea +PKG_MIRROR_HASH:=b8bc09dcc558916c3d145a0cac593f0c3101e5dcd589c3ac293a90a019628fe8 PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2022-05-29 -PKG_SOURCE_VERSION:=2c8fb4aeb60de3335f9f4ee2d454788cea8cd72e +PKG_SOURCE_VERSION:=00d0403a556c8f4e5e3f63521424510cc0d696a8 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause diff --git a/feeds/ucentral/ucentral-schema/files/etc/uci-defaults/99-ucentral-network b/feeds/ucentral/ucentral-schema/files/etc/uci-defaults/99-ucentral-network index b1fd28dbb..1675fd967 100755 --- a/feeds/ucentral/ucentral-schema/files/etc/uci-defaults/99-ucentral-network +++ b/feeds/ucentral/ucentral-schema/files/etc/uci-defaults/99-ucentral-network @@ -10,6 +10,8 @@ config_load network config_foreach section_del interface network config_foreach section_del bridge-vlan network config_foreach section_del device network +config_foreach section_del switch network +config_foreach section_del switch_vlan network config_load dhcp config_foreach section_del dhcp dhcp