X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Ffeeds;h=83007f5e167e21edd3a84123f3d3b630c004ec07;hb=d9d090e52082635a24aeaefdc6bfe61ab97f38bb;hp=1ddf304045632e437813e1fc1ea009e71904aef0;hpb=1592f3f607e242de18c38b76b95399119439157f;p=openwrt%2Fopenwrt.git diff --git a/scripts/feeds b/scripts/feeds index 1ddf304045..83007f5e16 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use Getopt::Std; use FindBin; use Cwd; @@ -22,16 +22,21 @@ my @mkver = split /\s+/, `$mk -v`, 4; my $valid_mk = 1; $mkver[0] =~ /^GNU/ or $valid_mk = 0; $mkver[1] =~ /^Make/ or $valid_mk = 0; -$mkver[2] >= "3.81" or $valid_mk = 0; + +my ($mkv1, $mkv2) = split /\./, $mkver[2]; +($mkv1 >= 4 || ($mkv1 == 3 && $mkv2 >= 81)) or $valid_mk = 0; + $valid_mk or die "Unsupported version of make found: $mk\n"; my @feeds; my %build_packages; my %installed; +my %installed_targets; my %feed_cache; my $feed_package = {}; my $feed_src = {}; +my $feed_target = {}; sub parse_config() { my $line = 0; @@ -49,7 +54,7 @@ sub parse_config() { $line++; my $valid = 1; - $line[0] =~ /^src-\w+$/ or $valid = 0; + $line[0] =~ /^src-[\w-]+$/ or $valid = 0; $line[1] =~ /^\w+$/ or $valid = 0; @src = split /\s+/, $line[2]; $valid or die "Syntax error in feeds.conf, line: $line\n"; @@ -98,7 +103,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; } @@ -123,12 +130,19 @@ my %update_method = ( 'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -", 'update' => "git pull --ff", 'controldir' => ".git", - 'revision' => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"}, + 'revision' => "git rev-parse --short HEAD | tr -d '\n'"}, + 'src-git-full' => { + 'init' => "git clone '%s' '%s'", + 'init_branch' => "git clone --branch '%s' '%s' '%s'", + 'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -", + 'update' => "git pull --ff", + 'controldir' => ".git", + 'revision' => "git rev-parse --short HEAD | tr -d '\n'"}, 'src-gitsvn' => { 'init' => "git svn clone -r HEAD '%s' '%s'", 'update' => "git svn rebase", 'controldir' => ".git", - 'revision' => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"}, + 'revision' => "git rev-parse --short HEAD | tr -d '\n'"}, 'src-bzr' => { 'init' => "bzr checkout --lightweight '%s' '%s'", 'update' => "bzr update", @@ -177,6 +191,16 @@ sub update_feed_via($$$$) { return 0; } +sub get_targets($) { + my $file = shift; + my @target = parse_target_metadata($file); + my %target; + foreach my $target (@target) { + $target{$target->{id}} = $target; + } + return %target +} + sub get_feed($) { my $feed = shift; @@ -189,11 +213,14 @@ sub get_feed($) { return; }; parse_package_metadata($file) or return; - $feed_cache{$feed} = [ { %package }, { %srcpackage } ]; + my %target = get_targets("./feeds/$feed.targetindex"); + + $feed_cache{$feed} = [ { %package }, { %srcpackage }, { %target } ]; } $feed_package = $feed_cache{$feed}->[0]; $feed_src = $feed_cache{$feed}->[1]; + $feed_target = $feed_cache{$feed}->[2]; return $feed_cache{$feed}->[0]; } @@ -202,6 +229,7 @@ sub get_installed() { clear_packages(); parse_package_metadata("./tmp/.packageinfo"); %installed = %package; + %installed_targets = get_targets("./tmp/.targetinfo"); } sub search_feed { @@ -232,6 +260,26 @@ sub search_feed { printf "\%-25s\t\%s\n", $pkg->{name}, $pkg->{title}; }; } + + foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_target) { + my $target = $feed_target->{$name}; + my $targetmatch = 1; + + foreach my $substr (@substr) { + my $match; + foreach my $key (qw(id name description)) { + $target->{$key} and $substr and $target->{$key} =~ m/$substr/i and $match = 1; + } + $match or undef $targetmatch; + }; + $targetmatch and do { + $display or do { + print "Search results in feed '$feed':\n"; + $display = 1; + }; + printf "TARGET: \%-17s\t\%s\n", $target->{id}, $target->{name}; + }; + } return 0; } @@ -256,13 +304,20 @@ sub list_feed { } } + foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_target) { + my $target = $feed_target->{$name}; + if($target->{name}) { + printf "TARGET: \%-24s\t\%s\n", $target->{id}, $target->{name}; + } + } + return 0; } sub list { my %opts; - getopts('r:d:nsh', \%opts); + getopts('r:d:nshf', \%opts); if ($opts{h}) { usage(); return 0; @@ -278,7 +333,7 @@ sub list { my $localpath = "./feeds/$feed->[1]"; my $m = $update_method{$feed->[0]}; my $revision; - if( !$m->{'revision'} ) { + if (!-d "$localpath" || !$m->{'revision'}) { $revision = "X"; } elsif( $m->{'controldir'} && -d "$localpath/$m->{'controldir'}" ) { @@ -290,8 +345,16 @@ sub list { if ($opts{d}) { printf "%s%s%s%s%s%s%s\n", $feed->[1], $opts{d}, $feed->[0], $opts{d}, $revision, $opts{d}, join(", ", @{$feed->[2]}); } + elsif ($opts{f}) { + my $uri = join(", ", @{$feed->[2]}); + if ($revision ne "local" && $revision ne "X") { + $uri =~ s/[;^].*//; + $uri .= "^" . $revision; + } + printf "%s %s %s\n", $feed->[0], $feed->[1], $uri; + } else { - printf "\%-8s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]}); + printf "\%-10s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]}); } } return 0; @@ -302,7 +365,7 @@ sub list { return 0; } -sub install_generic() { +sub do_install_package($$) { my $feed = shift; my $pkg = shift; my $path = $pkg->{makefile}; @@ -321,18 +384,29 @@ sub install_generic() { return 0; } -my %install_method = ( - 'src-svn' => \&install_generic, - 'src-cpy' => \&install_generic, - 'src-link' => \&install_generic, - 'src-git' => \&install_generic, - 'src-gitsvn' => \&install_generic, - 'src-bzr' => \&install_generic, - 'src-hg' => \&install_generic, - 'src-darcs' => \&install_generic, -); +sub do_install_target($) { + my $target = shift; + my $path = $target->{makefile}; -my %feed; + if ($path) { + $path =~ s/\/Makefile$//; + my $name = $path; + $name =~ s/.*\///; + my $dest = "./target/linux/$name"; + + -e $dest and do { + warn "Path $dest already exists"; + return 1; + }; + + system("ln -sf ../../$path ./target/linux/"); + } else { + warn "Target is not valid\n"; + return 1; + } + + return 0; +} sub lookup_package($$) { my $feed = shift; @@ -340,8 +414,20 @@ sub lookup_package($$) { foreach my $feed ($feed, @feeds) { next unless $feed->[1]; - next unless $feed{$feed->[1]}; - $feed{$feed->[1]}->{$package} and return $feed; + next unless $feed_cache{$feed->[1]}; + $feed_cache{$feed->[1]}->[0]->{$package} and return $feed; + } + return; +} + +sub lookup_target($$) { + my $feed = shift; + my $target = shift; + + foreach my $feed ($feed, @feeds) { + next unless $feed->[1]; + next unless $feed_cache{$feed->[1]}; + $feed_cache{$feed->[1]}->[2]->{$target} and return $feed; } return; } @@ -355,12 +441,33 @@ sub is_core_package($) { return 0; } +sub install_target { + my $feed = shift; + my $name = shift; + + $feed = $feed_cache{$feed->[1]}->[2]; + $feed or return 0; + + my $target = $feed->{$name}; + $target or return 0; + + warn "Installing target '$name'\n"; + return do_install_target($target); +} + sub install_package { my $feed = shift; my $name = shift; my $force = shift; my $ret = 0; + my $this_feed_target = lookup_target($feed, $name); + $this_feed_target and do { + $installed_targets{$name} and return 0; + install_target($this_feed_target, $name); + return 0; + }; + $feed = lookup_package($feed, $name); $feed or do { $installed{$name} and return 0; @@ -370,9 +477,9 @@ sub install_package { }; # switch to the metadata for the selected feed - get_feed($feed->[1]); + my $cur = get_feed($feed->[1]); - my $pkg = $feed{$feed->[1]}->{$name} or return 1; + my $pkg = $cur->{$name} or return 1; $pkg->{name} or do { $installed{$name} and return 0; # TODO: check if this is an alias package, maybe it's known by another name @@ -401,15 +508,10 @@ 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"; - $install_method{$type} or do { - warn "Unknown installation method: '$type'\n"; - return 1; - }; - - &{$install_method{$type}}($feed, $pkg) == 0 or do { + do_install_package($feed, $pkg) == 0 or do { warn "failed.\n"; return 1; }; @@ -432,6 +534,11 @@ sub install_package { sub refresh_config { my $default = shift; + # Don't create .config if it doesn't already exist so that making a + # config only occurs when the user intends it do (however we do + # want to refresh an existing config). + return if not (-e '.config'); + # workaround for timestamp check system("rm -f tmp/.packageinfo"); @@ -459,8 +566,8 @@ sub install { get_installed(); foreach my $f (@feeds) { - # index all feeds - $feed{$f->[1]} = get_feed($f->[1]); + # fetch all feeds + get_feed($f->[1]); # look up the preferred feed $opts{p} and $f->[1] eq $opts{p} and $feed = $f; @@ -497,6 +604,17 @@ sub install { return $ret; } +sub uninstall_target($) { + my $dir = shift; + my $name = $dir; + $name =~ s/.*\///g; + + my $dest = readlink $dir; + return unless $dest =~ /..\/..\/feeds/; + warn "Uninstalling target '$name'\n"; + unlink "$dir"; +} + sub uninstall { my %opts; my $name; @@ -511,6 +629,10 @@ sub uninstall { if ($opts{a}) { system("rm -rvf ./package/feeds"); + foreach my $dir (glob "target/linux/*") { + next unless -l $dir; + uninstall_target($dir); + } $uninstall = 1; } else { if($#ARGV == -1) { @@ -519,6 +641,13 @@ sub uninstall { } get_installed(); while ($name = shift @ARGV) { + my $target = "target/linux/$name"; + -l "$target" and do { + uninstall_target($target); + $uninstall = 1; + next; + }; + my $pkg = $installed{$name}; $pkg or do { warn "WARNING: $name not installed\n"; @@ -574,6 +703,7 @@ sub update { my %opts; my $feed_name; my $perform_update=1; + my $failed=0; $ENV{SCAN_COOKIE} = $$; $ENV{OPENWRT_VERBOSE} = 's'; @@ -598,8 +728,7 @@ sub update { if ( ($#ARGV == -1) or $opts{a}) { foreach my $feed (@feeds) { my ($type, $name, $src) = @$feed; - next unless update_feed($type, $name, $src, $perform_update) == 1; - last; + update_feed($type, $name, $src, $perform_update) == 0 or $failed=1; } } else { while ($feed_name = shift @ARGV) { @@ -608,14 +737,14 @@ sub update { if($feed_name ne $name) { next; } - update_feed($type, $name, $src, $perform_update); + update_feed($type, $name, $src, $perform_update) == 0 or $failed=1; } } } refresh_config(); - return 0; + return $failed; } sub feed_config() { @@ -645,6 +774,7 @@ Commands: -s : List of feed names and their URL. -r : List packages of specified feed. -d : Use specified delimiter to distinguish rows (default: spaces) + -f : List feeds in feeds.conf compatible format (when using -s). install [options] : Install a package Options: @@ -680,7 +810,7 @@ my %commands = ( 'uninstall' => \&uninstall, 'feed_config' => \&feed_config, 'clean' => sub { - system("rm -rf feeds"); + system("rm -rf ./feeds ./package/feeds"); } );