From patchwork Thu Aug 12 13:57:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eneas U de Queiroz X-Patchwork-Id: 1516353 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=wdNHLZjM; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=hYl7KNN0; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GlqkJ0kC8z9sRK for ; Fri, 13 Aug 2021 01:05:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=NgTLoAX1jGFRtx4u76bOt3QOSuhN+xqAvliCiU9ez2c=; b=wdNHLZjMbwk+Bq tfV9mG8iNYVmexuLZcwvQX1N5bAXPYHy9zOgIa0Lkjego/jioQteI9iOemPaff/isFAci4lj7/1yG uOWXXi+J3WntszIfpMmhDhbax1m/EZ9MpoQ3oqIjff7ry272WDRTb85jaQXVpDeVQwk+byUk/JHaz oYczwrk+yJ8lZtEvu7/pLhpsAscdL35eyF6d8FHd8HNCWZTAPr4yMyq8fBXc3kj0LzM6XRAJWKNdL gbq6BLx/s7MrMMOT9P6RDMlU+6s9MZ+N6vw3O8mGwGg9kp1aAQHySuk5KiNaQluMOhb/u2H31BQFp Djr6LPR3eI5QM93IAk8g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mECCH-00AVdM-RV; Thu, 12 Aug 2021 15:00:41 +0000 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mEBCw-00ALxB-0D for openwrt-devel@lists.openwrt.org; Thu, 12 Aug 2021 13:57:25 +0000 Received: by mail-qk1-x736.google.com with SMTP id t3so6593744qkg.11 for ; Thu, 12 Aug 2021 06:57:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=r3/V0FhYOnVtBo05Jzh9TAtjQaI1bQnBES3FkUNDb8E=; b=hYl7KNN0eHL85w2/Gf86hvFub9AyF8eeheRjcX7Nb8P4zlIctKGSadMXgSa1KaYQZn RhpnNrNwLxV8uqUwTKPHfQHzMUhfjUYuNDGOSAc/lRJ4woPEXht2et/Dy+EYPIOgbqcF yOtfiOzGA/XwJ/TUefK/yvzN+3+Cm/gUwWjrEc9BHDKCE8pV0W+8O9ZHookMWQERZf1A cIbCJXzUtYHPrMnNnhdbZsH2mf+bUCXP3Hc0sdI3tEgkZQWyXTGXFcONRRnHkLLN4aVn l+d5k9JEYf0KPJ0e67KQJIh+zsZ8D5xM4aAGyEqg8WgdM/oIdqwy9aGivDE1vtCPyO+/ oRbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=r3/V0FhYOnVtBo05Jzh9TAtjQaI1bQnBES3FkUNDb8E=; b=VQKOgWFre2CZH3VQoh+Eru0w2GJNLfV5CFisLO+FkcEV+pUOrB06Mq16M8MWoB9Eq+ N2hkvblT8sTQFk33NQ+Sijzxv4KHLVQROrDtBAkC6wTbW7X3OsDFhoXZ4RSCA/NgGrJO RSPyVsF8WF09a2DkBxz7O0arttqGUNcaMzQ0tpKy2lmnkx4yAk5DUCHEmfhtfQtf47LD QGoOBfZ5CoV+eRcNl5RbXxPswySQbbk1ZZNoYj7pBFna6nZItSK+vtobAm1wUyC8e6Wl Nb7F/PJvG1pxXkHum5z+66yjQ1LSj8C4T2SYTfPe9Iz1K3s0j/iCULBiFq7NdNPMC5QA r9ig== X-Gm-Message-State: AOAM530ssFpK9UNdrxWBVtLMFYqKcP696MZPBa7K3Gm+S/oNNTu4bV0/ ABKOvDC5ThiCVnQBNyQpcOVGTVYpL4Rjpg== X-Google-Smtp-Source: ABdhPJzMCtF3XwJzu7xtTnZRfcKmhtHiKlj02RN0VVmvOI59Mn74fKlUo7Z2NmKDfTiV35rjO++Jrw== X-Received: by 2002:a05:620a:678:: with SMTP id a24mr4835571qkh.74.1628776635705; Thu, 12 Aug 2021 06:57:15 -0700 (PDT) Received: from TRIBSUPORT-421.troianet.com.br ([177.75.175.22]) by smtp.gmail.com with ESMTPSA id g22sm1297303qkm.33.2021.08.12.06.57.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 06:57:15 -0700 (PDT) From: Eneas U de Queiroz To: openwrt-devel@lists.openwrt.org Cc: Eneas U de Queiroz Subject: [PATCH] ethtool: fix recursive dependency Date: Thu, 12 Aug 2021 10:57:07 -0300 Message-Id: <20210812135707.20595-1-cotequeiroz@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210812_065718_111334_6925599C X-CRM114-Status: UNSURE ( 9.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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: Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:736 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [cotequeiroz[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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/network/utils/ethtool/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile index a82e5c92fa..9889677a16 100644 --- a/package/network/utils/ethtool/Makefile +++ b/package/network/utils/ethtool/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool PKG_VERSION:=5.13 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Felix Fietkau PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -31,6 +31,7 @@ define Package/ethtool TITLE:=Display or change ethernet card settings URL:=http://www.kernel.org/pub/software/network/ethtool/ VARIANT:=tiny + CONFLICTS:=ethtool-full endef define Package/ethtool-full @@ -38,8 +39,8 @@ define Package/ethtool-full TITLE += (full) VARIANT:=full PROVIDES:=ethtool - CONFLICTS:=ethtool DEPENDS:=+libmnl + CONFLICTS:= endef define Package/ethtool/description