mac80211: make ath10k firmware v2 selectable

[openwrt/openwrt.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 89cb5a22c535ebaf5af4500876a36587ea420ace..7744dd068e6baa268eba594b4154468bd0896d65 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -390,7 +390,7 @@ sub do_install_target($) {
 
                system("ln -sf ../../$path ./target/linux/");
        } else {
-               warn "Package is not valid\n";
+               warn "Target is not valid\n";
                return 1;
        }
 
@@ -450,10 +450,10 @@ sub install_package {
        my $force = shift;
        my $ret = 0;
 
-       $feed = lookup_target($feed, $name);
-       $feed and do {
+       my $this_feed_target = lookup_target($feed, $name);
+       $this_feed_target and do {
                $installed_targets{$name} and return 0;
-               install_target($feed, $name);
+               install_target($this_feed_target, $name);
                return 0;
        };
 
@@ -497,8 +497,8 @@ sub install_package {
        $installed{$src} = 1;
 
        defined($override) and $override == 1
-               and warn "Overriding package '$src'\n"
-               or warn "Installing package '$src'\n";
+               and warn "Overriding core package '$src' with version from $feed->[1]\n"
+               or warn "Installing package '$src' from $feed->[1]\n";
 
        do_install_package($feed, $pkg) == 0 or do {
                warn "failed.\n";
@@ -793,7 +793,7 @@ my %commands = (
        'uninstall' => \&uninstall,
        'feed_config' => \&feed_config,
        'clean' => sub {
-               system("rm -rf feeds");
+               system("rm -rf ./feeds ./package/feeds");
        }
 );