Merge branch 'v2021.1.x' into v2021.1.x-tecff

modules

@@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing gluon'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-19.07
-OPENWRT_COMMIT=ecbbb373edf7be017e546be2443e6c422cb9c220
+OPENWRT_COMMIT=83b0e20711ee4a927634b3c2a018c93527e84a2b
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-19.07

package/gluon-mesh-vpn-fastd/src/respondd.c

@@ -65,7 +65,7 @@ static struct json_object * get_fastd_version(void) {
 	}
 
 	const char *version = line;
-	if (strncmp(version, "fastd ", 6) == 0)
+	if (version && strncmp(version, "fastd ", 6) == 0)
 		version += 6;
 
 	struct json_object *ret = gluonutil_wrap_string(version);

patches/openwrt/0026-ath79-Joy-IT-OR750i-fix-UART.patch

@@ -0,0 +1,21 @@
+From: Nico Boehr <[email protected]>
+Date: Sat, 7 May 2022 08:39:05 +0200
+Subject: ath79: Joy-IT OR750i: fix UART
+
+The serial console defaults to disabled in the DTSI files, explicitly
+enable it for the Joy-IT OR750i, so we can get a console in linux.
+
+Signed-off-by: Nico Boehr <[email protected]>
+
+diff --git a/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts b/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts
+index 60fa922878355ebdaf7d2983fe926efdf8b97207..042348d82c479c097f534f0bf2bb383ace55e02d 100644
+--- a/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts
++++ b/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts
+@@ -121,3 +121,7 @@
+
+ 	mtd-cal-data = <&art 0x1000>;
+ };
++
++&uart {
++       status = "okay";
++};