Merge pull request #1002 from Telecominfraproject/main

4.2.1 merge
Revert "profiles/edgecore_eap111.yml: use the sdk kernel for v4.2"
2026-03-20 03:39:54 +00:00 · 2026-02-05 13:29:08 -05:00 · 2026-02-05 16:57:15 +01:00 · 2026-02-05 08:35:41 +01:00 · 2026-01-30 09:40:12 +01:00 · 2025-12-12 18:42:38 -05:00
3 changed files with 7 additions and 4 deletions
--- a/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
+++ b/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
@@ -400,7 +400,7 @@ function expiry_handler() {
 	if (!stat)
 		return;

-	let ret = system(`openssl x509 -checkend ${timeouts.expiry_threshold} -noout -in /certificates/operational.pem`);
+	let ret = system(`openssl x509 -checkend ${timeouts.expiry_threshold} -noout -in /etc/ucentral/operational.pem`);
 	if (!ret) {
 		ulog(LOG_INFO, 'checked certificate expiry - all ok\n');
 		return;
--- a/feeds/ucentral/ratelimit/Makefile
+++ b/feeds/ucentral/ratelimit/Makefile
@@ -29,6 +29,9 @@ Build/Compile = $(Build/Compile/Default)

 define Package/ratelimit/install
 	$(CP) ./files/* $(1)
+ifeq ($(CONFIG_TARGET_mediatek),y)
+	$(SED) 's|qdisc replace dev $$$${iface} parent 1:$$$${id} handle $$$${id}: fq_codel flows 128 limit 800 quantum 300 noecn|qdisc add dev $$$${iface} parent 1:$$$${id} sfq perturb 10 limit 2000 quantum 1514|' $(1)/usr/bin/ratelimit
+endif
 endef

 $(eval $(call BuildPackage,ratelimit))
--- a/profiles/edgecore_eap111.yml
+++ b/profiles/edgecore_eap111.yml
@@ -1,12 +1,12 @@
 ---
 profile: edgecore_eap111
 target: mediatek
-subtarget: mt7981
+subtarget: filogic
 description: Build image for the EdgeCore EAP111
-image: bin/targets/mediatek/mt7981/openwrt-mediatek-mt7981-edgecore_eap111-squashfs-sysupgrade.bin
+image: bin/targets/mediatek/filogic/openwrt-mediatek-filogic-edgecore_eap111-squashfs-sysupgrade.bin
 feeds:
  - name: mediatek
-    path: ../../feeds/mediatek-sdk
+    path: ../../feeds/mediatek
 packages:
  - mediatek
 include:
Author	SHA1	Message	Date
jaspreetsachdev	a01b9ac0f4	Merge pull request #1002 from Telecominfraproject/main 4.2.1 merge	2026-02-05 13:29:08 -05:00
John Crispin	d7b578c58d	Revert "profiles/edgecore_eap111.yml: use the sdk kernel for v4.2" This reverts commit `20f5fa0284`. Signed-off-by: John Crispin <john@phrozen.org>	2026-02-05 16:57:15 +01:00
Arif Alam	bab5db5bf5	cloud_discovery: check operational cert in /etc/ucentral to determine reenroll Signed-off-by: Arif Alam <arif.alam@netexperience.com>	2026-02-05 08:35:41 +01:00
John Crispin	be9783e7db	ratelimit: use sfq leaf qdisc on mediatek targets fq_codel is not available on mediatek platforms. Replace it with sfq during package install when CONFIG_TARGET_mediatek is set. Fixes: WIFI-15285 Signed-off-by: John Crispin <john@phrozen.org>	2026-01-30 09:40:12 +01:00
jaspreetsachdev	a00dbfa6e4	Merge pull request #985 from Telecominfraproject/main merge for 4.2.0 RC2	2025-12-12 18:42:38 -05:00