From 6f83a708c8f1df14da9a24609d32bd7263d1798b Mon Sep 17 00:00:00 2001 From: Sander Vanheule Date: Wed, 24 Jan 2024 11:20:08 +0100 Subject: [PATCH] base-files: move uci_set_poe() to uci-defaults.sh PoE devices in the realtek target have the possibility to add PSE info to the board description via 02_network. Make this available for all targets, by moving the uci_set_poe() function to the globally available uci-default.sh script. Signed-off-by: Sander Vanheule --- .../base-files/files/lib/functions/uci-defaults.sh | 11 +++++++++++ .../linux/realtek/base-files/etc/board.d/02_network | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh index a75bd116525b..b89cc8e9e309 100644 --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -654,6 +654,17 @@ ucidef_set_ntpserver() { json_select .. } +ucidef_set_poe() { + json_select_object poe + json_add_string "budget" "$1" + json_select_array ports + for port in $2; do + json_add_string "" "$port" + done + json_select .. + json_select .. +} + ucidef_add_wlan() { local path="$1"; shift diff --git a/target/linux/realtek/base-files/etc/board.d/02_network b/target/linux/realtek/base-files/etc/board.d/02_network index 1c1e4e9cd223..db1d99f4ec31 100644 --- a/target/linux/realtek/base-files/etc/board.d/02_network +++ b/target/linux/realtek/base-files/etc/board.d/02_network @@ -3,17 +3,6 @@ . /lib/functions/uci-defaults.sh . /lib/functions/system.sh -ucidef_set_poe() { - json_select_object poe - json_add_string "budget" "$1" - json_select_array ports - for port in $2; do - json_add_string "" "$port" - done - json_select .. - json_select .. -} - _filter_port_list_ordered() { local ports="$1" local excluded="$2" -- 2.30.2