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 6c0337581c88c85cc82fdd9ef193375dbf24e372..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;
 }
 
@@ -383,6 +385,9 @@ 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 to 1
        $installed{$src} and $installed{$src} == 1 and return 0;
@@ -391,13 +396,13 @@ sub install_package {
        # - 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{$src}->{feed});
+       my $override = 1 if ($force and is_core_package($src) and !$installed{$name}->{feed});
 
        # check previously installed packages
        $installed{$name} and !$override and return 0;
        $installed{$src} = 1;
 
-       $override == 1
+       defined($override) and $override == 1
                and warn "Overriding package '$src'\n"
                or warn "Installing package '$src'\n";
 
@@ -419,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;
                }
        }