diff --git a/ookla-speedtest/Makefile b/ookla-speedtest/Makefile index dbade287..8feffac8 100644 --- a/ookla-speedtest/Makefile +++ b/ookla-speedtest/Makefile @@ -1,41 +1,65 @@ +# +# Copyright (C) 2024 sbwml +# Copyright (c) 2025-2026 sirpdboy +# +# This is free software, licensed under the GPL-3.0 License. +# + include $(TOPDIR)/rules.mk PKG_NAME:=ookla-speedtest PKG_VERSION:=1.2.0 -PKG_RELEASE:=10 -PKG_MAINTAINER:=Konstantine Shevlakov +PKG_RELEASE:=11 +ifeq ($(ARCH),aarch64) + PKG_ARCH_SUFFIX:=aarch64 + PKG_HASH:=skip +else ifeq ($(ARCH),arm) + ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) + ifeq ($(ARM_CPU_FEATURES),) + PKG_ARCH_SUFFIX:=armel + PKG_HASH:=skip + else + PKG_ARCH_SUFFIX:=armhf + PKG_HASH:=skip + endif +else ifeq ($(ARCH),i386) + PKG_ARCH_SUFFIX:=i386 + PKG_HASH:=skip +else ifeq ($(ARCH),x86_64) + PKG_ARCH_SUFFIX:=x86_64 + PKG_HASH:=skip +endif + +PKG_SOURCE:=ookla-speedtest-$(PKG_VERSION)-linux-$(PKG_ARCH_SUFFIX).tgz +PKG_SOURCE_URL:=https://install.speedtest.net/app/cli +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_ARCH_SUFFIX) + +PKG_MAINTAINER:=sbwml include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - TITLE:=Speedtest from Ookla - SECTION:=net - CATEGORY:=Network + SECTION:=net + CATEGORY:=Network + SUBMENU:=Speed Test + TITLE:=Speedtest CLI by Ookla + URL:=https://www.speedtest.net/ + DEPENDS:=@(aarch64||arm||i386||x86_64) +ca-certificates + URL:=https://www.speedtest.net/ endef -ifeq ($(ARCH),x86_64) - BIN_PATH:=./files/x86_64 -endif -ifeq ($(ARCH),i386) - BIN_PATH:=./files/i386 -endif -ifeq ($(ARCH),arm) - BIN_PATH:=./files/armhf -endif -ifeq ($(ARCH),aarch64) - BIN_PATH:=./files/aarch64 -endif - define Package/$(PKG_NAME)/description - Speedtest CLI brings the trusted technology and global server network behind Speedtest to the command line. - Built for software developers, system administrators and computer enthusiasts alike, - Speedtest CLI is the first official Linux-native Speedtest application backed by Ookla®. + Speedtest CLI by Ookla is the official command line client + for testing internet bandwidth using speedtest.net servers. endef + define Build/Prepare -endef - -define Build/Configure + ( \ + pushd $(PKG_BUILD_DIR) ; \ + $(TAR) -zxf $(DL_DIR)/ookla-speedtest-$(PKG_VERSION)-linux-$(PKG_ARCH_SUFFIX).tgz -C . ; \ + popd ; \ + ) endef define Build/Compile @@ -43,9 +67,7 @@ endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(BIN_PATH)/speedtest $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/speedtest $(1)/usr/bin/ookla-speedtest endef -ifeq ($(ARCH),$(filter $(ARCH), x86_64 i386 arm aarch64)) - $(eval $(call BuildPackage,$(PKG_NAME))) -endif +$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file diff --git a/ookla-speedtest/files/aarch64/speedtest b/ookla-speedtest/files/aarch64/speedtest deleted file mode 100755 index 677c6e78..00000000 Binary files a/ookla-speedtest/files/aarch64/speedtest and /dev/null differ diff --git a/ookla-speedtest/files/armhf/speedtest b/ookla-speedtest/files/armhf/speedtest deleted file mode 100755 index 0b01c45b..00000000 Binary files a/ookla-speedtest/files/armhf/speedtest and /dev/null differ diff --git a/ookla-speedtest/files/i386/speedtest b/ookla-speedtest/files/i386/speedtest deleted file mode 100755 index 6a6854e5..00000000 Binary files a/ookla-speedtest/files/i386/speedtest and /dev/null differ diff --git a/ookla-speedtest/files/x86_64/speedtest b/ookla-speedtest/files/x86_64/speedtest deleted file mode 100755 index 44c03da4..00000000 Binary files a/ookla-speedtest/files/x86_64/speedtest and /dev/null differ