ath9k: fix another tx locking issue

[openwrt.git] / package / comgt / Makefile

diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index 61c123a..f2a6966 100644 (file)
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -17,6 +17,10 @@ PKG_MD5SUM:=db2452680c3d953631299e331daf49ef
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
 
+PKG_CONFIG_DEPENDS:=CONFIG_USE_NETIFD
+COMGT_VARIANT:=$(if $(CONFIG_USE_NETIFD),netifd,old)
+FILES_DIR:=./files-$(COMGT_VARIANT)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/comgt
@@ -41,28 +45,40 @@ define Build/Compile
                comgt
 endef
 
+define Package/comgt/install/netifd
+       $(INSTALL_DIR) $(1)/lib/netifd/proto
+       $(INSTALL_BIN) $(FILES_DIR)/3g.sh $(1)/lib/netifd/proto/3g.sh
+endef
+
+define Package/comgt/install/old
+       $(INSTALL_DIR) $(1)/etc/ppp
+       $(INSTALL_BIN) $(FILES_DIR)/3g.connect $(1)/etc/ppp/3g.connect
+       $(INSTALL_DIR) $(1)/lib/network
+       $(INSTALL_BIN) $(FILES_DIR)/3g.sh $(1)/lib/network/3g.sh
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/button
+       $(INSTALL_DATA) $(FILES_DIR)/3g.button $(1)/etc/hotplug.d/button/05-3g
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+       $(INSTALL_DATA) $(FILES_DIR)/3g.iface $(1)/etc/hotplug.d/iface/05-3g
+endef
+
 define Package/comgt/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/comgt $(1)/usr/bin/
        ln -s comgt $(1)/usr/bin/gcom
-       $(INSTALL_DIR) $(1)/etc/ppp
-       $(INSTALL_BIN) ./files/3g.connect $(1)/etc/ppp/3g.connect
        $(INSTALL_DIR) $(1)/etc/chatscripts
        $(INSTALL_DATA) ./files/3g.chat $(1)/etc/chatscripts/3g.chat
        $(INSTALL_DATA) ./files/evdo.chat $(1)/etc/chatscripts/evdo.chat
-       $(INSTALL_DIR) $(1)/lib/network
-       $(INSTALL_BIN) ./files/3g.sh $(1)/lib/network/3g.sh
-       $(INSTALL_DIR) $(1)/etc/hotplug.d/button
-       $(INSTALL_DATA) ./files/3g.button $(1)/etc/hotplug.d/button/05-3g
-       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-       $(INSTALL_DATA) ./files/3g.iface $(1)/etc/hotplug.d/iface/05-3g
-       $(INSTALL_DIR) $(1)/etc/hotplug.d/tty
-       $(INSTALL_DATA) ./files/3g.usb $(1)/etc/hotplug.d/tty/30-3g
        $(INSTALL_DIR) $(1)/etc/gcom
        $(INSTALL_DATA) ./files/setpin.gcom $(1)/etc/gcom/setpin.gcom
        $(INSTALL_DATA) ./files/setmode.gcom $(1)/etc/gcom/setmode.gcom
        $(INSTALL_DATA) ./files/getcardinfo.gcom $(1)/etc/gcom/getcardinfo.gcom
        $(INSTALL_DATA) ./files/getstrength.gcom $(1)/etc/gcom/getstrength.gcom
+       $(INSTALL_DATA) ./files/getcarrier.gcom $(1)/etc/gcom/getcarrier.gcom
+       $(INSTALL_DATA) ./files/getcnum.gcom $(1)/etc/gcom/getcnum.gcom
+       $(INSTALL_DATA) ./files/getimsi.gcom $(1)/etc/gcom/getimsi.gcom
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/tty
+       $(INSTALL_DATA) $(FILES_DIR)/3g.usb $(1)/etc/hotplug.d/tty/30-3g
+       $(Package/comgt/install/$(COMGT_VARIANT))
 endef
 
 $(eval $(call BuildPackage,comgt))