scripts/metadata.pl: move parse_target_metadata() to metadata.pm

[openwrt/staging/yousong.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index be07e59613cf9330e747723efa3312ac86fab1e5..004e5c9c6a8bd236a3d37c7fc7a8a8a1d55dd6be 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -98,7 +98,9 @@ sub update_index($)
 
        system("$mk -s prepare-mk OPENWRT_BUILD= TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
        system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPS=\"$ENV{TOPDIR}/include/package*.mk\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
+       system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"targetinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"target\" SCAN_DEPS=\"profiles/*.mk $ENV{TOPDIR}/include/target.mk\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" SCAN_MAKEOPTS=\"TARGET_BUILD=1\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
        system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
+       system("ln -sf $name.tmp/.targetinfo ./feeds/$name.targetindex");
 
        return 0;
 }
@@ -151,7 +153,7 @@ sub update_feed_via($$$$) {
        my $name = shift;
        my $src = shift;
        my $relocate = shift;
-       
+
        my $m = $update_method{$type};
        my $localpath = "./feeds/$name";
        my $safepath = $localpath;
@@ -173,7 +175,7 @@ sub update_feed_via($$$$) {
        } else {
                system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
        }
-       
+
        return 0;
 }
 
@@ -262,11 +264,17 @@ sub list_feed {
 sub list {
        my %opts;
 
-       getopts('r:d:sh', \%opts);
+       getopts('r:d:nsh', \%opts);
        if ($opts{h}) {
                usage();
                return 0;
        }
+       if ($opts{n}) {
+               foreach my $feed (@feeds) {
+                       printf "%s\n", $feed->[1];
+               }
+               return 0;
+       }
        if ($opts{s}) {
                foreach my $feed (@feeds) {
                        my $localpath = "./feeds/$feed->[1]";
@@ -352,6 +360,7 @@ sub is_core_package($) {
 sub install_package {
        my $feed = shift;
        my $name = shift;
+       my $force = shift;
        my $ret = 0;
 
        $feed = lookup_package($feed, $name);
@@ -376,14 +385,26 @@ sub install_package {
        my $type = $feed->[0];
        $src or $src = $name;
 
+       # If it's a core package and we don't want to override, just return
+       !$force and is_core_package($src) and return 0;
+
        # previously installed packages set the runtime package
-       # newly installed packages set the source package
-       $installed{$src} and return 0;
+       # newly installed packages set the source package to 1
+       $installed{$src} and $installed{$src} == 1 and return 0;
+
+       # we'll trigger the override only with the 3 conditions below:
+       # - override is allowed by command line (-f)
+       # - a package with the same src exists in the core packages list
+       # - the package previously installed is not from a feed
+       my $override = 1 if ($force and is_core_package($src) and !$installed{$name}->{feed});
 
        # check previously installed packages
-       $installed{$name} and return 0;
+       $installed{$name} and !$override and return 0;
        $installed{$src} = 1;
-       warn "Installing package '$src'\n";
+
+       defined($override) and $override == 1
+               and warn "Overriding package '$src'\n"
+               or warn "Installing package '$src'\n";
 
        $install_method{$type} or do {
                warn "Unknown installation method: '$type'\n";
@@ -403,7 +424,7 @@ sub install_package {
                        $dep =~ s/^.+://;
                        $dep =~ s/\/.+$//;
                        next unless $dep;
-                       install_package($feed, $dep) == 0 or $ret = 1;
+                       install_package($feed, $dep, 0) == 0 or $ret = 1;
                }
        }
 
@@ -430,7 +451,7 @@ sub install {
        my $feed;
        my $ret = 0;
 
-       getopts('ap:d:h', \%opts);
+       getopts('ap:d:fh', \%opts);
 
        if ($opts{h}) {
                usage();
@@ -456,7 +477,7 @@ sub install {
                                        my $p = $feed_package->{$name};
                                        next if $p->{vdepends};
                                        if( $p->{name} ) {
-                                               install_package($feed, $p->{name}) == 0 or $ret = 1;
+                                               install_package($feed, $p->{name}, exists($opts{f})) == 0 or $ret = 1;
                                                get_feed($f->[1]);
                                        }
                                }
@@ -464,7 +485,7 @@ sub install {
                }
        } else {
                while ($name = shift @ARGV) {
-                       install_package($feed, $name) == 0 or $ret = 1;
+                       install_package($feed, $name, exists($opts{f})) == 0 or $ret = 1;
                }
        }
 
@@ -579,7 +600,8 @@ sub update {
        if ( ($#ARGV == -1) or $opts{a}) {
                foreach my $feed (@feeds) {
                        my ($type, $name, $src) = @$feed;
-                       update_feed($type, $name, $src, $perform_update);
+                       next unless update_feed($type, $name, $src, $perform_update) == 1;
+                       last;
                }
        } else {
                while ($feed_name = shift @ARGV) {
@@ -598,6 +620,22 @@ sub update {
        return 0;
 }
 
+sub feed_config() {
+       foreach my $feed (@feeds) {
+               my $installed = (-f "feeds/$feed->[1].index");
+
+               printf "\tconfig FEED_%s\n", $feed->[1];
+               printf "\t\tbool \"Enable feed %s\"\n", $feed->[1];
+               printf "\t\tdepends on PER_FEED_REPO\n";
+               printf "\t\tdefault y\n" if $installed;
+               printf "\t\thelp\n";
+               printf "\t\t Enable the \\\"%s\\\" feed at %s.\n", $feed->[1], $feed->[2][0];
+               printf "\n";
+       }
+
+       return 0;
+}
+
 sub usage() {
        print <<EOF;
 Usage: $0 <command> [options]
@@ -605,6 +643,7 @@ Usage: $0 <command> [options]
 Commands:
        list [options]: List feeds, their content and revisions (if installed)
        Options:
+           -n :            List of feed names.
            -s :            List of feed names and their URL.
            -r <feedname>:  List packages of specified feed.
            -d <delimiter>: Use specified delimiter to distinguish rows (default: spaces)
@@ -614,6 +653,7 @@ Commands:
            -a :           Install all packages from all feeds or from the specified feed using the -p option.
            -p <feedname>: Prefer this feed when installing packages.
            -d <y|m|n>:    Set default for newly installed packages.
+           -f :           Install will be forced even if the package exists in core OpenWrt (override)
 
        search [options] <substring>: Search for a package
        Options:
@@ -640,6 +680,7 @@ my %commands = (
        'install' => \&install,
        'search' => \&search,
        'uninstall' => \&uninstall,
+       'feed_config' => \&feed_config,
        'clean' => sub {
                system("rm -rf feeds");
        }