From patchwork Sun Dec 27 21:31:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1420774 X-Patchwork-Delegate: mail@aparcar.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aparcar.org 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=merlin.20170209 header.b=BcMh0KbU; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4D3v9p5Rjkz9sW4 for ; Mon, 28 Dec 2020 08:35:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=dqRMDs81Wj6sqa+uYKgQ76JyYFgvf4uXTt6LhM5oNP8=; b=BcMh0KbUTKPXOejNxkwHki3iib lFzcssuarmrWEpU4URbPlPyenV85UsS0xW5siKRKzISHOnyfsLbjtr2vzsq/UAaEzVFzRgQ15M+ac H4rdptagrGyxJHTmqOEvbKlABrciHQ35nBXy3+MWkFsrGsS6AEJ1AEIq+1kKhhdJ3ipq8zKZqnTe/ Zu/NVAWXJ7cdsDwbsFT6vauqza1pUEY8zCcx4+CKAZk5B9PrRknpRHOnC66WcO79lwW9w0rjOUg2i ToX3z2TUpveeqSwpdTRwSUxI9L1Z9nESkAnzkm3M+hN1x/lF2YZBrabh65f0niKQ3fV1Oy41FieCC aKTwcPdA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ktdeq-000218-5Y; Sun, 27 Dec 2020 21:32:56 +0000 Received: from relay7-d.mail.gandi.net ([217.70.183.200]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ktdel-00020c-GR for openwrt-devel@lists.openwrt.org; Sun, 27 Dec 2020 21:32:52 +0000 X-Originating-IP: 72.235.129.18 Received: from dawn.lan (udp100268uds.hawaiiantel.net [72.235.129.18]) (Authenticated sender: mail@aparcar.org) by relay7-d.mail.gandi.net (Postfix) with ESMTPA id 35C0F20009; Sun, 27 Dec 2020 21:32:44 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH] scripts/feed: no warn on toolchain/linux overwrite Date: Sun, 27 Dec 2020 11:31:25 -1000 Message-Id: <20201227213124.1638854-1-mail@aparcar.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201227_163251_655365_C7CF74F9 X-CRM114-Status: UNSURE ( 9.74 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.200 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Spooren , ~aparcar/openwrt-devel@lists.sr.ht Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The recent 7f285d "scripts/feeds: warn when skipping core package override" floats SDK output with warning of overwriting "linux" and "toolchain" core packages. This should be ignored as these are not regular packages added via feeds. While at it slightly improve the warning string. Signed-off-by: Paul Spooren --- scripts/feeds | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/feeds b/scripts/feeds index 122f8568cb..eee0a50717 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -537,7 +537,9 @@ sub install_src { my $override = 0; if (is_core_src($name)) { if (!$force) { - warn "Not overriding core package $name; use -f to force\n"; + if ($name ne "toolchain" && $name ne "linux") { + warn "WARNING: Not overriding core package '$name'; use -f to force\n"; + } return 0; } $override = 1;