Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ethtool: introduce ethtool-full build variant

Browse source 
Netlink support is required for using the virtual cable tester
functionality.

Remove the pretty print build option and instead create a second package
variant ethtool-full. This allows users to install the full ethtool
featureset using opkg.

Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
David Bauer 2021-03-04 00:11:31 +01:00
parent 91a52f22a1
commit d858366441
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
package/network/utils/ethtool/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ethtool PKG_NAME:=ethtool
PKG_VERSION:=5.12 PKG_VERSION:=5.12
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@ -23,8 +23,6 @@ PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:=CONFIG_ETHTOOL_PRETTY_DUMP
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/ethtool define Package/ethtool
@ -32,6 +30,16 @@ define Package/ethtool
CATEGORY:=Network CATEGORY:=Network
TITLE:=Display or change ethernet card settings TITLE:=Display or change ethernet card settings
URL:=http://www.kernel.org/pub/software/network/ethtool/ URL:=http://www.kernel.org/pub/software/network/ethtool/
VARIANT:=tiny
endef
define Package/ethtool-full
$(Package/ethtool)
TITLE += (full)
VARIANT:=full
PROVIDES:=ethtool
CONFLICTS:=ethtool
DEPENDS:=+libmnl
endef endef
define Package/ethtool/description define Package/ethtool/description
@ -39,18 +47,12 @@ define Package/ethtool/description
network interface network interface
endef endef
define Package/ethtool/config Package/ethtool-full/description:=$(Package/ethtool/description)
config ETHTOOL_PRETTY_DUMP
depends on PACKAGE_ethtool
bool "Enable pretty printing"
endef
CONFIGURE_ARGS += --disable-netlink ifeq ($(BUILD_VARIANT),full)
CONFIGURE_ARGS += --enable-netlink --enable-pretty-dump
ifeq ($(CONFIG_ETHTOOL_PRETTY_DUMP),y)
CONFIGURE_ARGS += --enable-pretty-dump
else else
CONFIGURE_ARGS += --disable-pretty-dump CONFIGURE_ARGS += --disable-netlink --disable-pretty-dump
endif endif
define Package/ethtool/install define Package/ethtool/install
@ -58,4 +60,7 @@ define Package/ethtool/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethtool $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/ethtool $(1)/usr/sbin
endef endef
Package/ethtool-full/install=$(Package/ethtool/install)
$(eval $(call BuildPackage,ethtool)) $(eval $(call BuildPackage,ethtool))
$(eval $(call BuildPackage,ethtool-full))