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

[Paul Spooren]

On Mo, Dez 28, 2020 at 01:02, Adrian Schmutzler 
<mail at adrianschmutzler.de> wrote:
>>  -----Original Message-----
>>  From: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org]
>>  On Behalf Of Paul Spooren
>>  Sent: Sonntag, 27. Dezember 2020 22:31
>>  To: openwrt-devel at lists.openwrt.org
>>  Cc: Paul Spooren <mail at aparcar.org>; 
>> ~aparcar/openwrt-devel at lists.sr.ht
>>  Subject: [PATCH] scripts/feed: no warn on toolchain/linux overwrite
>> 
>>  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.
> 
> Makes me wonder whether the original patch actually was the right 
> answer to the problem ...

Do you have a different idea? I may don't understand your comment.

> 
> Best
> 
> Adrian
> 
>> 
>>  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;
>>  --
>>  2.29.2
>> 
>> 
>>  _______________________________________________
>>  openwrt-devel mailing list
>>  openwrt-devel at lists.openwrt.org
>>  https://lists.openwrt.org/mailman/listinfo/openwrt-devel