From babf10adf958602867ae34978923f0cfd3b31e50 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Oct 2021 08:43:34 +0200 Subject: [PATCH] package/net-tools: bump to version 2.10 Use standard install target as update target has been removed with https://sourceforge.net/p/net-tools/code/ci/5484cf9a13a2b1d6f604aad2a4fa41c7f01e1a46/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/net-tools/net-tools.hash | 5 ++++- package/net-tools/net-tools.mk | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/net-tools/net-tools.hash b/package/net-tools/net-tools.hash index e29415b8ff..fdc30fa2b2 100644 --- a/package/net-tools/net-tools.hash +++ b/package/net-tools/net-tools.hash @@ -1,3 +1,6 @@ +# From http://sourceforge.net/projects/net-tools/files/ +sha1 4080baab0486dc882c3b293d5559c27251ae4268 net-tools-2.10.tar.xz +md5 78aae762c95e2d731faf88d482e4cde5 net-tools-2.10.tar.xz # Locally computed -sha256 4c68ef33d97cc807fe437fa64a801355c36d638774c0c8a4342742f6bdceea78 net-tools-479bb4a7e11a4084e2935c0a576388f92469225b-br1.tar.gz +sha256 b262435a5241e89bfa51c3cabd5133753952f7a7b7b93f32e08cb9d96f580d69 net-tools-2.10.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk index eb268a6e14..4a03e3d846 100644 --- a/package/net-tools/net-tools.mk +++ b/package/net-tools/net-tools.mk @@ -4,8 +4,9 @@ # ################################################################################ -NET_TOOLS_VERSION = 479bb4a7e11a4084e2935c0a576388f92469225b -NET_TOOLS_SITE = git://git.code.sf.net/p/net-tools/code +NET_TOOLS_VERSION = 2.10 +NET_TOOLS_SOURCE = net-tools-$(NET_TOOLS_VERSION).tar.xz +NET_TOOLS_SITE = http://downloads.sourceforge.net/project/net-tools NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) NET_TOOLS_LICENSE = GPL-2.0+ NET_TOOLS_LICENSE_FILES = COPYING @@ -35,11 +36,10 @@ define NET_TOOLS_BUILD_CMDS $(MAKE) -C $(@D) endef -# install renames conflicting binaries, update does not # ifconfig & route reside in /sbin for busybox, so ensure we don't end # up with two versions of those. define NET_TOOLS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) update + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install mv -f $(TARGET_DIR)/bin/ifconfig $(TARGET_DIR)/sbin/ifconfig mv -f $(TARGET_DIR)/bin/route $(TARGET_DIR)/sbin/route endef