A WPA(2) pre-shared key can either be specified as a 8 to 63 character passphrase...

[openwrt.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 186144e..8e18855 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -11,6 +11,10 @@ use Cwd 'abs_path';
 chdir "$FindBin::Bin/..";
 $ENV{TOPDIR}=getcwd();
 
 chdir "$FindBin::Bin/..";
 $ENV{TOPDIR}=getcwd();
 

+my $mk=`which gmake`;  # select the right 'make' program
+chomp($mk);            # trim trailing newline
+$mk or $mk = "make";   # default to 'make'
+

 my @feeds;
 my %build_packages;
 my %installed;
 my @feeds;
 my %build_packages;
 my %installed;


@@ -19,7 +23,9 @@ sub parse_config() {
        my $line = 0;
        my %name;
 
        my $line = 0;
        my %name;
 

-       open FEEDS, "feeds.conf";
+       open FEEDS, "feeds.conf" or
+               open FEEDS, "feeds.conf.default" or
+               die "Unable to open feeds configuration";

        while (<FEEDS>) {
                chomp;
                s/#.+$//;
        while (<FEEDS>) {
                chomp;
                s/#.+$//;


@@ -48,8 +54,8 @@ sub update_index($)
        -d "./feeds/$name.tmp" or mkdir "./feeds/$name.tmp" or return 1;
        -d "./feeds/$name.tmp/info" or mkdir "./feeds/$name.tmp/info" or return 1;
 
        -d "./feeds/$name.tmp" or mkdir "./feeds/$name.tmp" or return 1;
        -d "./feeds/$name.tmp/info" or mkdir "./feeds/$name.tmp/info" or return 1;
 

-       system("make -s prepare-mk TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
-       system("make -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=4 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
+       system("$mk -s prepare-mk 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=4 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");

        system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
 
        return 0;
        system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
 
        return 0;


@@ -96,7 +102,7 @@ sub update_git($$) {
                system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
        } else {
                system("rm -rf \"./feeds/$name\"");
                system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
        } else {
                system("rm -rf \"./feeds/$name\"");

-               system("git-clone --depth 1 $src ./feeds/$name") == 0 or return 1;
+               system("git clone --depth 1 $src ./feeds/$name") == 0 or return 1;

        }
 
        return 0;
        }
 
        return 0;


@@ -104,14 +110,20 @@ sub update_git($$) {
 
 sub get_feed($) {
        my $feed = shift;
 
 sub get_feed($) {
        my $feed = shift;

+       my $file = "./feeds/$feed.index";

 
        clear_packages();
 
        clear_packages();

-       parse_package_metadata("./feeds/$feed.index") or return;
+
+       -f $file or do {
+               print "Ignoring feed '$feed' - index missing\n";
+               return;
+       };
+       parse_package_metadata($file) or return;

        return { %package };
 }
 
 sub get_installed() {
        return { %package };
 }
 
 sub get_installed() {

-       system("make -s prepare-tmpinfo");
+       system("$mk -s prepare-tmpinfo");

        clear_packages();
        parse_package_metadata("./tmp/.packageinfo");
        %installed = %package;
        clear_packages();
        parse_package_metadata("./tmp/.packageinfo");
        %installed = %package;


@@ -239,7 +251,7 @@ sub install_package {
        $feed or do {
                $installed{$name} and return 0;
                # TODO: check if it's already installed within ./package directory
        $feed or do {
                $installed{$name} and return 0;
                # TODO: check if it's already installed within ./package directory

-               warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n";
+               $srcpackage{$name} or -d "./package/$name" or warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n";

                return 0;
        };
 
                return 0;
        };
 


@@ -258,13 +270,6 @@ sub install_package {
        # newly installed packages set the source package
        $installed{$src} and return 0;
 
        # newly installed packages set the source package
        $installed{$src} and return 0;
 

-       # install all dependencies
-       foreach my $dep (@{$pkg->{depends}}) {
-               next if $dep =~ /@/;
-               $dep =~ s/^\+//;
-               install_package($feed, $dep) == 0 or $ret = 1;
-       }
-

        # check previously installed packages
        $installed{$name} and return 0;
        $installed{$src} = 1;
        # check previously installed packages
        $installed{$name} and return 0;
        $installed{$src} = 1;


@@ -280,6 +285,15 @@ sub install_package {
                return 1;
        };
 
                return 1;
        };
 

+       # install all dependencies
+       foreach my $vpkg (@{$srcpackage{$src}}) {
+               foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
+                       next if $dep =~ /@/;
+                       $dep =~ s/^\+//;
+                       install_package($feed, $dep) == 0 or $ret = 1;
+               }
+       }
+

        return $ret;
 }
 
        return $ret;
 }
 


@@ -291,9 +305,9 @@ sub refresh_config {
 
        # refresh the config
        if ($default) { 
 
        # refresh the config
        if ($default) { 

-               system("make oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null");
+               system("$mk oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null");

        } else {
        } else {

-               system("make defconfig Config.in >/dev/null 2>/dev/null");
+               system("$mk defconfig Config.in >/dev/null 2>/dev/null");

        }
 }
 
        }
 }