ethtool: fix recursive dependency
Change the CONFLICTS definition from the alternative package
(ethtool-full) to the main one.
The CONFLICTS line creates a dependency to the conflicting package.
Right now, the dependency would be created in the PACKAGE_ethtool-full
symbol:
config PACKAGE_ethtool-full
        depends on m || (PACKAGE_ethtool != y)
When the main package is selected by airmon-ng, it selects
PACKAGE_ethtool, *depending* on the value of PACKAGE_ethtool-full:
config PACKAGE_airmon-ng
        select PACKAGE_ethtool if PACKAGE_ethtool-full<PACKAGE_airmon-ng
In the first block, the value of PACKAGE_ethtool-full depends on the
value of PACKAGE_ethtool.  In the second block, the opposite is true:
the value of PACKAGE_ethtool depends on the value of
PACKAGE_ethtool-full.  This is a recursive dependency.
Fix it by changing the package where the dependency is created, so that
only the value of PACKAGE_ethtool will depend on PACKAGE_ethtool-full.
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
			
			
This commit is contained in:
		 Eneas U de Queiroz
					Eneas U de Queiroz
				
			
				
					committed by
					
						 Hans Dedecker
						Hans Dedecker
					
				
			
			
				
	
			
			
			 Hans Dedecker
						Hans Dedecker
					
				
			
						parent
						
							bf94c2da3e
						
					
				
				
					commit
					4d0883c011
				
			| @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk | |||||||
|  |  | ||||||
| PKG_NAME:=ethtool | PKG_NAME:=ethtool | ||||||
| PKG_VERSION:=5.13 | PKG_VERSION:=5.13 | ||||||
| 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 | ||||||
| @@ -31,6 +31,7 @@ define Package/ethtool | |||||||
|   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 |   VARIANT:=tiny | ||||||
|  |   CONFLICTS:=ethtool-full | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Package/ethtool-full | define Package/ethtool-full | ||||||
| @@ -38,8 +39,8 @@ define Package/ethtool-full | |||||||
|   TITLE += (full) |   TITLE += (full) | ||||||
|   VARIANT:=full |   VARIANT:=full | ||||||
|   PROVIDES:=ethtool |   PROVIDES:=ethtool | ||||||
|   CONFLICTS:=ethtool |  | ||||||
|   DEPENDS:=+libmnl |   DEPENDS:=+libmnl | ||||||
|  |   CONFLICTS:= | ||||||
| endef | endef | ||||||
|  |  | ||||||
| define Package/ethtool/description | define Package/ethtool/description | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user