Changeset 481

Timestamp:

05/02/08 19:37:23 (3 months ago)

Author:

florida

Message:

Changeset 10823 (openwrt)

Files:

• firmware/trunk/kamikaze/scripts/feeds (modified) (16 diffs)

firmware/trunk/kamikaze/scripts/feeds

@@ -42 +42 @@
-}
-
-$
+
-{
-        my $name = shift;
-
+
-        -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;
@@ -66 +66 @@
-                system("svn co $src \"./feeds/$name\"") == 0 or return 1;
-        }
-
+
+
-}
-
@@ -73 +74 @@
-        my $src = shift;
-
-
-
+
+
+
+
-}
-
@@ -81 +84 @@
-        my $src = abs_path(shift);
-
-
-
+
+
+
-}
-
@@ -95 +99 @@
-                system("git-clone --depth 1 $src ./feeds/$name") == 0 or return 1;
-        }
-
+
+
-}
-
-sub get_feed($) {
-        my $feed = shift;
+        my $file = "./feeds/$feed.index";
-
-        clear_packages();
-
+
+
+
+
+
+
-        return { %package };
-}
@@ -234 +245 @@
-        $feed or do {
-                $installed{$name} and return 0;
-
-
+
+
+
-        };
-
@@ -241 +253 @@
-        $pkg->{name} or do {
-                $installed{$name} and return 0;
+                # TODO: check if this is an alias package, maybe it's known by another name
-                warn "WARNING: Package '$name' is not available in feed $feed->[1].\n";
-1
+0
-        };
-        my $src = $pkg->{src};
@@ -251 +264 @@
-        # 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
@@ -274 +280 @@
-        };
-
+        # install all dependencies
+        foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) {
+                next if $dep =~ /@/;
+                $dep =~ s/^\+//;
+                install_package($feed, $dep) == 0 or $ret = 1;
+        }
+
-        return $ret;
-}
@@ -279 +292 @@
-sub refresh_config {
-        my $default = shift;
-        $default or $default = "o";
-
-        # workaround for timestamp check
@@ -285 +297 @@
-
-        # refresh the config
-
+
+
+
+
+
-}
-
@@ -294 +310 @@
-        my $ret = 0;
-
-
+
+
+
+
+
+
+
-        get_installed();
-
@@ -314 +336 @@
-                                        if( $p->{name} ) {
-                                                install_package($feed, $p->{name}) == 0 or $ret = 1;
-                                        } else {
-                                                warn "WARNING: Package '$name' is not available\n";
-                                        }
-                                }
@@ -337 +357 @@
-
-sub uninstall {
+        my %opts;
-        my $name;
-        my $uninstall;
-
-
-
+
+
+
+
+
+
+
+
+
-                $uninstall = 1;
-        } else {
+                if($#ARGV == -1) {
+                        warn "WARNING: no package to uninstall\n";
+                        return 0;
+                }
-                get_installed();
-                while ($name = shift @ARGV) {
@@ -361 +393 @@
-}
-
-sub usage() {
-        print <<EOF;
-Usage: $0 <command> [options]
-
-Commands:
-        list [options]: List feeds and their content
-        Options:
-            -s :           List of feed names and their URL.
-            -r <feedname>: List packages of specified feed.
-
-        install [options] <package>: Install a package
-        Options:
-            -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.
-
-        search [options] <substring>: Search for a package
-        Options:
-            -r <feedname>: Only search in this feed
-
-        uninstall -a|<package>: Uninstall a package
-            -a :           Uninstalls all packages.
-
-        update:            Update packages and lists of feeds in feeds.conf .
-
-        clean:             Remove downloaded/generated files.
-
-EOF
-        exit(1);
-}
-
-my %update_method = (
-        'src-svn' => \&update_svn,
@@ -399 +400 @@
-);
-
+sub update_feed($$$$)
+{
+        my $type=shift;
+        my $name=shift;
+        my $src=shift;
+        my $perform_update=shift;
+
+        $update_method{$type} or do {
+                warn "Unknown type '$type' in feed $name\n";
+                return 1;
+        };
+        $perform_update and do {
+                warn "Updating feed '$name' from '$src' ...\n";
+                &{$update_method{$type}}($name, $src) == 0 or do {
+                        warn "failed.\n";
+                        return 1;
+                };
+        };
+        warn "Create index file './feeds/$name.index' \n";
+        update_index($name) == 0 or do {
+                warn "failed.\n";
+                return 1;
+        };
+        return 0;
+}
+
+sub update {
+        my %opts;
+        my $feed_name;
+        my $perform_update=1;
+
+        $ENV{SCAN_COOKIE} = $$;
+        $ENV{KBUILD_VERBOSE} = 99;
+
+        getopts('ahi', \%opts);
+
+        if ($opts{h}) {
+                usage();
+                return 0;
+        }
+
+        if ($opts{i}) {
+                # don't update from (remote) repository
+                # only re-create index information
+                $perform_update=0;
+        }
+
+        -d "feeds" or do {
+                        mkdir "feeds" or die "Unable to create the feeds directory";
+                };
+
+        if ( ($#ARGV == -1) or $opts{a}) {
+                foreach my $feed (@feeds) {
+                        my ($type, $name, $src) = @$feed;
+                        update_feed($type, $name, $src, $perform_update);
+                }
+        } else {
+                while ($feed_name = shift @ARGV) {
+                        foreach my $feed (@feeds) {
+                                my ($type, $name, $src) = @$feed;
+                                if($feed_name ne $name) {
+                                        next;
+                                }
+                                update_feed($type, $name, $src, $perform_update);
+                        }
+                }
+        }
+
+        refresh_config();
+
+        return 0;
+}
+
+sub usage() {
+        print <<EOF;
+Usage: $0 <command> [options]
+
+Commands:
+        list [options]: List feeds and their content
+        Options:
+            -s :           List of feed names and their URL.
+            -r <feedname>: List packages of specified feed.
+
+        install [options] <package>: Install a package
+        Options:
+            -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.
+
+        search [options] <substring>: Search for a package
+        Options:
+            -r <feedname>: Only search in this feed
+
+        uninstall -a|<package>: Uninstall a package
+        Options:
+            -a :           Uninstalls all packages.
+
+        update -a|<feedname(s)>: Update packages and lists of feeds in feeds.conf .
+        Options:
+            -a :           Update all feeds listed within feeds.conf. Otherwise the spezified feeds will be updated.
+            -i :           Recreate the index only. No feed update from repository is performed.
+
+        clean:             Remove downloaded/generated files.
+
+EOF
+        exit(1);
+}
+
-my %commands = (
-        'list' => \&list,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        'install' => \&install,
-        'search' => \&search,