From: Paul Spooren <mail@aparcar.org>
Date: Sun, 27 Dec 2020 21:26:37 +0000 (-1000)
Subject: scripts/feed: no warn on toolchain/linux overwrite
X-Git-Tag: v21.02.0-rc1~603
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=a323a653f0338474ce9f2044574d2adc67d527d7

scripts/feed: no warn on toolchain/linux overwrite

The recent 7f285d "scripts/feeds: warn when skipping core package
override" floods 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 <mail@aparcar.org>
---

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;