From 20f23ca93b0a7cb64386704a43bfb9c39764b00f Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Tue, 4 Jul 2023 23:09:22 +0800
Subject: [PATCH] package/wwan: update dependes

---
 package/wwan/app/fibocom-dial/Makefile        | 19 ++++++++-------
 .../wwan/app/luci-app-gobinetmodem/Makefile   |  9 +++----
 package/wwan/app/luci-app-usbmodem/Makefile   | 11 ++++-----
 package/wwan/app/quectel_cm_5G/Makefile       | 24 +++++++++----------
 .../wwan/app/quectel_cm_5G/files/rmnet.script |  1 +
 package/wwan/app/quectel_cm_5G/files/rmnet.sh |  1 +
 .../app/quectel_cm_5G/files/rmnet6.script     |  3 ++-
 .../wwan/app/quectel_cm_5G/files/rmnet6.sh    |  1 +
 8 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/package/wwan/app/fibocom-dial/Makefile b/package/wwan/app/fibocom-dial/Makefile
index 99a77886e..f925db634 100755
--- a/package/wwan/app/fibocom-dial/Makefile
+++ b/package/wwan/app/fibocom-dial/Makefile
@@ -6,20 +6,21 @@ PKG_RELEASE:=1
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fibocom-dial
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=Fibocom Dial
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Fibocom Dial
 endef
 
-define Package/fibocom-dial/description
-	Fibocom Dial (Prints a snarky message)
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
 define Package/fibocom-dial/install
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fibocom-dial $(1)/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fibo_qmimsg_server $(1)/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/multi-pdn-manager $(1)/bin/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fibocom-dial $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fibo_qmimsg_server $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/multi-pdn-manager $(1)/usr/bin
 endef
 
 $(eval $(call BuildPackage,fibocom-dial))
diff --git a/package/wwan/app/luci-app-gobinetmodem/Makefile b/package/wwan/app/luci-app-gobinetmodem/Makefile
index 08676a32e..634cff7d0 100644
--- a/package/wwan/app/luci-app-gobinetmodem/Makefile
+++ b/package/wwan/app/luci-app-gobinetmodem/Makefile
@@ -8,12 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Modem Server
-LUCI_DEPENDS:=+luci-compat +kmod-usb-net  +kmod-usb-net-cdc-ether +kmod-usb-acm \
-		+kmod-usb-net-qmi-wwan  +kmod-usb-net-rndis +kmod-usb-serial-qualcomm \
-		+kmod-usb-net-sierrawireless +kmod-usb-ohci +kmod-usb-serial \
-		+kmod-usb-serial-option \
-		+kmod-usb2 +kmod-usb3 \
-		+quectel-CM-5G +kmod-gobinet
+LUCI_DEPENDS:=+luci-compat +quectel-CM-5G +kmod-gobinet \
+	+kmod-usb-net-cdc-ether +kmod-usb-net-qmi-wwan \
+	+kmod-usb-net-rndis +kmod-usb-serial-option
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/package/wwan/app/luci-app-usbmodem/Makefile b/package/wwan/app/luci-app-usbmodem/Makefile
index 2214f0cf1..447ca3c2c 100644
--- a/package/wwan/app/luci-app-usbmodem/Makefile
+++ b/package/wwan/app/luci-app-usbmodem/Makefile
@@ -8,12 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Modem Server
-LUCI_DEPENDS:=+luci-compat +kmod-usb-net  +kmod-usb-net-cdc-ether +kmod-usb-acm \
-		+kmod-usb-net-qmi-wwan  +kmod-usb-net-rndis +kmod-usb-serial-qualcomm \
-		+kmod-usb-net-sierrawireless +kmod-usb-ohci +kmod-usb-serial \
-		+kmod-usb-serial-option +kmod-usb-wdm \
-		+kmod-usb2 +kmod-usb3 \
-		+quectel-CM-5G +kmod-qmi_wwan_q +kmod-usb-net-cdc-mbim
+LUCI_DEPENDS:=+luci-compat +quectel-CM-5G +kmod-usb-acm \
+	+kmod-usb-net-cdc-ether +kmod-usb-net-cdc-mbim \
+	+kmod-usb-net-qmi-wwan +kmod-usb-net-rndis \
+	+kmod-usb-serial-option +kmod-usb-wdm \
+	+kmod-qmi_wwan_f +kmod-qmi_wwan_q
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/package/wwan/app/quectel_cm_5G/Makefile b/package/wwan/app/quectel_cm_5G/Makefile
index 06aafdc3f..5eff117ab 100644
--- a/package/wwan/app/quectel_cm_5G/Makefile
+++ b/package/wwan/app/quectel_cm_5G/Makefile
@@ -1,39 +1,39 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:= quectel-CM-5G
-PKG_RELEASE:=2
-PKG_VERSION:=1.0
+PKG_VERSION:=1.6.4
+PKG_RELEASE:=1
 
-include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/quectel-CM-5G
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=quectel-CM-5G app building test
+  TITLE:=quectel-CM-5G app
 endef
 
-define Package/quectel-CM-5G/description
-	quectel-CM-5G app building test
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
 define Build/Compile
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
-		SUBDIRS="$(PKG_BUILD_DIR)" \
-		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+		M="$(PKG_BUILD_DIR)" \
 		CC="$(TARGET_CC)"
 endef
 
 define Package/quectel-CM-5G/install
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/lib/netifd/proto $(1)/lib/netifd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/quectel-CM $(1)/usr/bin/quectel-CM
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/lib/netifd/proto
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/quectel-CM $(1)/usr/bin
+	$(INSTALL_BIN) ./files/rmnet_init.sh $(1)/lib/netifd
+	$(INSTALL_BIN) ./files/rmnet.script $(1)/lib/netifd
 	$(INSTALL_BIN) ./files/rmnet.sh $(1)/lib/netifd/proto
 	$(INSTALL_BIN) ./files/rmnet6.sh $(1)/lib/netifd/proto
 	$(INSTALL_BIN) ./files/rmnet6.script $(1)/lib/netifd
-	$(INSTALL_BIN) ./files/rmnet.script $(1)/lib/netifd
-	$(INSTALL_BIN) ./files/rmnet_init.sh $(1)/usr/bin
 endef
 
 $(eval $(call BuildPackage,quectel-CM-5G))
diff --git a/package/wwan/app/quectel_cm_5G/files/rmnet.script b/package/wwan/app/quectel_cm_5G/files/rmnet.script
index 93d2cf05b..5bafb9071 100644
--- a/package/wwan/app/quectel_cm_5G/files/rmnet.script
+++ b/package/wwan/app/quectel_cm_5G/files/rmnet.script
@@ -10,6 +10,7 @@
 . /lib/functions.sh
 . /lib/functions/network.sh
 . /lib/netifd/netifd-proto.sh
+
 setup_interface() {
 	INTERFACE=$1
 	CONFIG=/tmp/rmnet_$2_ipv4config
diff --git a/package/wwan/app/quectel_cm_5G/files/rmnet.sh b/package/wwan/app/quectel_cm_5G/files/rmnet.sh
index f783561e8..101ee60fd 100644
--- a/package/wwan/app/quectel_cm_5G/files/rmnet.sh
+++ b/package/wwan/app/quectel_cm_5G/files/rmnet.sh
@@ -6,6 +6,7 @@
 . /lib/functions.sh
 . /lib/functions/network.sh
 . ../netifd-proto.sh
+
 init_proto "$@"
 
 proto_rmnet_setup() {
diff --git a/package/wwan/app/quectel_cm_5G/files/rmnet6.script b/package/wwan/app/quectel_cm_5G/files/rmnet6.script
index d252c2c37..bbe05b2c9 100644
--- a/package/wwan/app/quectel_cm_5G/files/rmnet6.script
+++ b/package/wwan/app/quectel_cm_5G/files/rmnet6.script
@@ -10,6 +10,7 @@
 . /lib/functions.sh
 . /lib/functions/network.sh
 . /lib/netifd/netifd-proto.sh
+
 setup_interface() {
 	INTERFACE=$1
 	CONFIG=/tmp/rmnet_$2_ipv6config
@@ -45,7 +46,7 @@ setup_interface() {
 	done
 
 	#proto_add_data
-	[ -n "$ZONE" ]     && json_add_string zone "$ZONE"
+	[ -n "$ZONE" ] && json_add_string zone "$ZONE"
 	proto_close_data
 
 	proto_send_update "$INTERFACE"
diff --git a/package/wwan/app/quectel_cm_5G/files/rmnet6.sh b/package/wwan/app/quectel_cm_5G/files/rmnet6.sh
index 94a9598b4..57a549564 100644
--- a/package/wwan/app/quectel_cm_5G/files/rmnet6.sh
+++ b/package/wwan/app/quectel_cm_5G/files/rmnet6.sh
@@ -6,6 +6,7 @@
 . /lib/functions.sh
 . /lib/functions/network.sh
 . ../netifd-proto.sh
+
 init_proto "$@"
 
 proto_rmnet6_setup() {