Merge branch 'real_value' into 'devel'

tr143: add upload with speed_test in airoha See merge request feed/iopsys!1991
tr143: add upload with speed_test in airoha
2025-12-09 23:34:51 +01:00 · 2025-12-09 12:16:58 +05:30 · 2025-12-09 12:16:55 +05:30 · 2025-12-08 21:58:50 +05:30
5 changed files with 17 additions and 15 deletions
--- a/parental-control/Makefile
+++ b/parental-control/Makefile
@ -91,8 +91,8 @@ ifeq ($(CONFIG_PARENTAL_CONTROL_URLFILTERING),y)
 	$(INSTALL_DATA) ./files/etc/parentalcontrol/urlbundle_override.json $(1)/etc/parentalcontrol/
 else
 	$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/urlbundle_override.json $(1) parentalcontrol
-	$(INSTALL_DATA) ./files/etc/uci-defaults/50-parental_control_disable_urlfilter $(1)/etc/uci-defaults/
 endif
+	$(INSTALL_DATA) ./files/etc/uci-defaults/50-parental_control_disable_urlfilter $(1)/etc/uci-defaults/
 endef

 $(eval $(call BuildPackage,parental-control))
--- a/parental-control/files/etc/uci-defaults/50-parental_control_disable_urlfilter
+++ b/parental-control/files/etc/uci-defaults/50-parental_control_disable_urlfilter
@ -5,10 +5,3 @@
 [ ! -f "/etc/config/parentalcontrol" ] && exit 0

 uci -q set parentalcontrol.globals.urlfilter='0'
-
-_delete_urlbundle() {
-	uci_remove parentalcontrol "${1}"
-}
-
-config_load "parentalcontrol"
-config_foreach _delete_urlbundle urlbundle
--- a/tr143/Makefile
+++ b/tr143/Makefile
@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=tr143
-PKG_VERSION:=1.1.12
+PKG_VERSION:=1.1.13

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/tr143d.git
-PKG_SOURCE_VERSION:=c0149efd8e5cd5d908988148281b6caabeac615e
+PKG_SOURCE_VERSION:=be8ee7b6c52817914f66875d36061f2f62b80af8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@ -41,14 +41,15 @@ define Package/tr143/install

 ifeq ($(CONFIG_TARGET_SUBTARGET),"an7581")
 	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/airoha/scripts/download $(1)
+	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/airoha/scripts/upload $(1)
 	$(INSTALL_DATA) ./files/an7581/etc/uci-defaults/* $(1)/etc/uci-defaults/
 else
 	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/scripts/download $(1)
+	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/scripts/upload $(1)
 	$(INSTALL_DATA) ./files/other/etc/uci-defaults/* $(1)/etc/uci-defaults/
 endif

 	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/scripts/traceroute $(1)
-	$(BBFDM_INSTALL_SCRIPT) $(PKG_BUILD_DIR)/scripts/upload $(1)
 	$(BBFDM_INSTALL_SCRIPT) -d $(PKG_BUILD_DIR)/scripts/bbf_diag/ipping $(1)
 	$(BBFDM_INSTALL_SCRIPT) -d $(PKG_BUILD_DIR)/scripts/bbf_diag/serverselection $(1)
 	$(BBFDM_INSTALL_SCRIPT) -d $(PKG_BUILD_DIR)/scripts/bbf_diag/udpecho $(1)
--- a/tr143/files/an7581/etc/uci-defaults/20_tr143_enforce_vendor_defaults
+++ b/tr143/files/an7581/etc/uci-defaults/20_tr143_enforce_vendor_defaults
@ -1,6 +1,6 @@
 #!/bin/sh

-set_tr143_download_defaults() {
+set_tr143_diagnostic_defaults() {
 	if [ ! -f /etc/bbfdm/dmmap/dmmap_diagnostics ]; then
 		touch /etc/bbfdm/dmmap/dmmap_diagnostics
 	fi
@ -9,7 +9,11 @@ set_tr143_download_defaults() {
 	uci -q -c /etc/bbfdm/dmmap set dmmap_diagnostics.download.DefaultNumberOfConnections='4'
 	uci -q -c /etc/bbfdm/dmmap set dmmap_diagnostics.download.DownloadDiagnosticMaxConnections='8'

+	uci -q -c /etc/bbfdm/dmmap set dmmap_diagnostics.upload='upload'
+	uci -q -c /etc/bbfdm/dmmap set dmmap_diagnostics.upload.DefaultNumberOfConnections='1'
+	uci -q -c /etc/bbfdm/dmmap set dmmap_diagnostics.upload.UploadDiagnosticMaxConnections='8'
+
 	uci -q -c /etc/bbfdm/dmmap commit dmmap_diagnostics
 }

-set_tr143_download_defaults
+set_tr143_diagnostic_defaults
--- a/tr143/files/other/etc/uci-defaults/30_tr143_enforce_defaults
+++ b/tr143/files/other/etc/uci-defaults/30_tr143_enforce_defaults
@ -1,6 +1,6 @@
 #!/bin/sh

-set_tr143_download_defaults() {
+set_tr143_diagnostic_defaults() {
 	if [ ! -f /etc/bbfdm/dmmap/dmmap_diagnostics ]; then
 		touch /etc/bbfdm/dmmap/dmmap_diagnostics
 	fi
@ -9,7 +9,11 @@ set_tr143_download_defaults() {
 	uci -q -c /etc/bbfdm/dmmap set dmmap_diagnostics.download.DefaultNumberOfConnections='1'
 	uci -q -c /etc/bbfdm/dmmap set dmmap_diagnostics.download.DownloadDiagnosticMaxConnections='1'

+	uci -q -c /etc/bbfdm/dmmap set dmmap_diagnostics.upload='upload'
+	uci -q -c /etc/bbfdm/dmmap set dmmap_diagnostics.upload.DefaultNumberOfConnections='1'
+	uci -q -c /etc/bbfdm/dmmap set dmmap_diagnostics.upload.UploadDiagnosticMaxConnections='1'
+
 	uci -q -c /etc/bbfdm/dmmap commit dmmap_diagnostics
 }

-set_tr143_download_defaults
+set_tr143_diagnostic_defaults
Author	SHA1	Message	Date
Suvendhu Hansa	57f2943de2	Merge branch 'real_value' into 'devel' tr143: add upload with speed_test in airoha See merge request feed/iopsys!1991	2025-12-09 12:16:58 +05:30
Suvendhu Hansa	09378d192d	tr143: add upload with speed_test in airoha	2025-12-09 12:16:55 +05:30
Vivek Kumar Dutta	82183e9e3b	parental-control: disable urlfilter by default	2025-12-08 21:58:50 +05:30