telephony: use PKG_HASH instead of PKG_MD5SUM

[feed/telephony.git] / libs / dahdi-tools / Makefile

diff --git a/libs/dahdi-tools/Makefile b/libs/dahdi-tools/Makefile
index 8c86b1ab3d97226fd71a6a16f664c34d537ea1b3..05fef5421cef5f0c9b18cb4eb938a365c4c59e00 100644 (file)
--- a/libs/dahdi-tools/Makefile
+++ b/libs/dahdi-tools/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dahdi-tools
-PKG_VERSION:=2.10.0.1
-PKG_RELEASE:=1
+PKG_VERSION:=2.11.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/
-PKG_MD5SUM:=224c5b86195249d5ce462ca316332087
+PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases
+PKG_HASH:=53ffeb333f3e44b0c88e5b17475cdbf87d3f652eb81a6422de76250c061e2909
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -30,8 +30,8 @@ endef
 
 define Package/dahdi-cfg
   $(call Package/dahdi-cfg/Default)
-  DEPENDS+=+libpthread
-  TITLE:=DAHDI tools dahdi_cfg and dahdi_scan
+  DEPENDS+=+libpthread +dahdi-tools-libtonezone
+  TITLE:=DAHDI tools dahdi_cfg, dahdi_scan and fxotune
 endef
 
 define Package/dahdi-monitor
@@ -39,11 +39,6 @@ define Package/dahdi-monitor
   TITLE:=DAHDI tools dahdi_monitor, dahdi_speed and dahdi_test
 endef
 
-define Package/dahdi-tool
-  $(call Package/dahdi-cfg/Default)
-  TITLE:=DAHDI tools dahdi_tool
-endef
-
 define Package/dahdi-tools-libtonezone
   $(call Package/dahdi-cfg/Default)
   SECTION:=libs
@@ -54,13 +49,6 @@ endef
 TARGET_CFLAGS += $(FPIC)
 EXTRA_CFLAGS:= $(TARGET_CPPFLAGS)
 
-CONFIGURE_ARGS+= \
-       --with-dahdi="$(STAGING_DIR)/usr" \
-       --without-newt \
-       --without-usb \
-       --without-selinux \
-       --without-ppp
-
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
@@ -72,13 +60,13 @@ define Build/Compile
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
                DAHDI_INCLUDE="$(STAGING_DIR)/usr/include" \
                CONFIGURE_SILENT="--silent" \
-               dahdi_cfg dahdi_monitor dahdi_tool dahdi_scan dahdi_speed dahdi_test fxotune libs
+               dahdi_cfg dahdi_monitor dahdi_scan dahdi_speed dahdi_test fxotune
 endef
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/libtonezone.so $(1)/usr/lib/
-       $(CP) $(PKG_BUILD_DIR)/libtonezone.a $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/.libs/*.so* $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/.libs/*.a $(1)/usr/lib/
 
        $(INSTALL_DIR) $(1)/usr/include/dahdi
        $(CP) $(PKG_BUILD_DIR)/tonezone.h $(1)/usr/include/dahdi/
@@ -86,8 +74,9 @@ endef
 
 define Package/dahdi-cfg/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/dahdi_cfg $(1)/usr/sbin/
+       $(CP) $(PKG_BUILD_DIR)/.libs/dahdi_cfg $(1)/usr/sbin/
        $(CP) $(PKG_BUILD_DIR)/dahdi_scan $(1)/usr/sbin/
+       $(CP) $(PKG_BUILD_DIR)/fxotune $(1)/usr/sbin/
 endef
 
 define Package/dahdi-monitor/install
@@ -97,18 +86,12 @@ define Package/dahdi-monitor/install
        $(CP) $(PKG_BUILD_DIR)/dahdi_test $(1)/usr/sbin/
 endef
 
-define Package/dahdi-tool/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/dahdi_tool $(1)/usr/sbin/
-endef
-
 define Package/dahdi-tools-libtonezone/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/libtonezone.so $(1)/usr/lib/
-       cd $(1)/usr/lib/; ln -s libtonezone.so libtonezone.so.2.0
+       $(CP) $(PKG_BUILD_DIR)/.libs/libtonezone.so.2.0.0 $(1)/usr/lib/
+       cd $(1)/usr/lib/; ln -s libtonezone.so.2.0.0 libtonezone.so; ln -s libtonezone.so.2.0.0 libtonezone.so.2
 endef
 
 $(eval $(call BuildPackage,dahdi-cfg))
 $(eval $(call BuildPackage,dahdi-monitor))
-$(eval $(call BuildPackage,dahdi-tool))
 $(eval $(call BuildPackage,dahdi-tools-libtonezone))