[openwrt/openwrt] scripts/feed: no warn on toolchain/linux overwrite

LEDE Commits lede-commits at lists.infradead.org
Wed Jan 6 19:13:17 EST 2021


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a323a653f0338474ce9f2044574d2adc67d527d7

commit a323a653f0338474ce9f2044574d2adc67d527d7
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Sun Dec 27 11:26:37 2020 -1000

    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 at aparcar.org>
---
 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;



More information about the lede-commits mailing list