23.05: merge gtw360 image

openlumi · Aug 8, 2024 · 6c1028f · 6c1028f
1 parent 3847660
commit 6c1028f
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 320 deletions.
diff --git a/.github/workflows/build-openwrt.yml b/.github/workflows/build-openwrt.yml
@@ -80,7 +80,6 @@ jobs:
           # - 23.05.2
           # - 23.05.3
           - 23.05.4
-          - 23.05.4-gtw360
           # - snapshot
         include:
         - mode: normal

diff --git a/user/23.05.4-gtw360/config.diff b/user/23.05.4-gtw360/config.diff
diff --git a/user/23.05.4-gtw360/custom.sh b/user/23.05.4-gtw360/custom.sh
diff --git a/user/23.05.4-gtw360/files/.gitkeep b/user/23.05.4-gtw360/files/.gitkeep
diff --git a/user/23.05.4-gtw360/files/files/etc/opkg/customfeeds.conf b/user/23.05.4-gtw360/files/files/etc/opkg/customfeeds.conf
diff --git a/user/23.05.4-gtw360/packages.txt b/user/23.05.4-gtw360/packages.txt
diff --git a/user/23.05.4-gtw360/patches/.gitkeep b/user/23.05.4-gtw360/patches/.gitkeep
diff --git a/user/23.05.4-gtw360/patches/001_zigbee2mqtt_optimize.patch b/user/23.05.4-gtw360/patches/001_zigbee2mqtt_optimize.patch
diff --git a/user/23.05.4-gtw360/pre_custom.sh b/user/23.05.4-gtw360/pre_custom.sh
diff --git a/user/23.05.4-gtw360/settings.ini b/user/23.05.4-gtw360/settings.ini
diff --git a/user/23.05.4/config.diff b/user/23.05.4/config.diff
@@ -3,14 +3,16 @@ CONFIG_TARGET_imx_cortexa7=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_PER_DEVICE_ROOTFS=y
 CONFIG_TARGET_DEVICE_imx_cortexa7_DEVICE_aqara_zhwg11lm=y
-CONFIG_TARGET_DEVICE_PACKAGES_imx_cortexa7_DEVICE_aqara_zhwg11lm="kmod-rtl8189es-ol"
+CONFIG_TARGET_DEVICE_PACKAGES_imx_cortexa7_DEVICE_aqara_zhwg11lm="kmod-rtl8189es-ol jntools luci-app-jntools memtool"
 CONFIG_TARGET_DEVICE_imx_cortexa7_DEVICE_xiaomi_dgnwg05lm=y
-CONFIG_TARGET_DEVICE_PACKAGES_imx_cortexa7_DEVICE_xiaomi_dgnwg05lm="kmod-rtl8723bs-ol rtk_hciattach"
+CONFIG_TARGET_DEVICE_PACKAGES_imx_cortexa7_DEVICE_xiaomi_dgnwg05lm="kmod-rtl8723bs-ol rtk_hciattach jntools luci-app-jntools memtool"
+CONFIG_TARGET_DEVICE_imx_cortexa7_DEVICE_geniatech_gtw360=y
+CONFIG_TARGET_DEVICE_PACKAGES_imx_cortexa7_DEVICE_geniatech_gtw360="kmod-brcmfmac broadcom-43455-fmac broadcom-4345C0-hci"
 CONFIG_TARGET_PER_DEVICE_ROOTFS=y
 CONFIG_PACKAGE_cgi-io=y
 CONFIG_PACKAGE_coreutils=y
 CONFIG_PACKAGE_coreutils-stty=y
-CONFIG_PACKAGE_jntools=y
+CONFIG_PACKAGE_jntools=m
 CONFIG_PACKAGE_kmod-nls-base=y
 CONFIG_PACKAGE_kmod-nls-cp437=y
 CONFIG_PACKAGE_kmod-nls-iso8859-1=y
@@ -45,7 +47,7 @@ CONFIG_PACKAGE_libubus-lua=y
 CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luci=y
 CONFIG_PACKAGE_luci-app-firewall=y
-CONFIG_PACKAGE_luci-app-jntools=y
+CONFIG_PACKAGE_luci-app-jntools=m
 CONFIG_PACKAGE_luci-app-opkg=y
 CONFIG_PACKAGE_luci-base=y
 CONFIG_PACKAGE_luci-lib-base=y
@@ -59,7 +61,7 @@ CONFIG_PACKAGE_luci-mod-system=y
 CONFIG_PACKAGE_luci-proto-ipv6=y
 CONFIG_PACKAGE_luci-proto-ppp=y
 CONFIG_PACKAGE_luci-theme-bootstrap=y
-CONFIG_PACKAGE_memtool=y
+CONFIG_PACKAGE_memtool=m
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-file=y
 CONFIG_PACKAGE_rpcd-mod-iwinfo=y
@@ -155,7 +157,7 @@ CONFIG_PACKAGE_libstdcpp=m
 
 CONFIG_PACKAGE_baresip=m
 CONFIG_PACKAGE_baresip-mod-mqtt=m
-CONFIG_PACKAGE_ble2mqtt=m
+# CONFIG_PACKAGE_ble2mqtt=m # builds in OpenWrt upstream
 CONFIG_PACKAGE_bluez-libs=m
 CONFIG_PACKAGE_bluez-utils=m
 CONFIG_PACKAGE_libudev-zero=m
@@ -177,7 +179,7 @@ CONFIG_PACKAGE_node=m
 CONFIG_PACKAGE_python3-aio-mqtt-mod=m
 CONFIG_PACKAGE_python3-asyncio=m
 CONFIG_PACKAGE_python3-base=m
-CONFIG_PACKAGE_python3-bleak=m
+# CONFIG_PACKAGE_python3-bleak=m # builds in OpenWrt upstream
 CONFIG_PACKAGE_python3-bluepy=m
 CONFIG_PACKAGE_python3-cgi=m
 CONFIG_PACKAGE_python3-cgitb=m