X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fyousong.git;a=blobdiff_plain;f=scripts%2Ffeeds;h=7744dd068e6baa268eba594b4154468bd0896d65;hp=26c2de09452bbf1ddfec614638123a380b0a7a04;hb=3846bb9ac92060669f9c798c3c128057a6d32809;hpb=a720dd209f8b345cdfa5d2432287520389404445 diff --git a/scripts/feeds b/scripts/feeds index 26c2de0945..7744dd068e 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -28,10 +28,12 @@ $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 +51,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 +100,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; } @@ -124,6 +128,13 @@ my %update_method = ( 'update' => "git pull --ff", 'controldir' => ".git", 'revision' => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | 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 show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"}, 'src-gitsvn' => { 'init' => "git svn clone -r HEAD '%s' '%s'", 'update' => "git svn rebase", @@ -151,7 +162,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,10 +184,20 @@ sub update_feed_via($$$$) { } else { system("cd '$safepath'; $m->{'update'}") == 0 or return 1; } - + 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 +210,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 +226,7 @@ sub get_installed() { clear_packages(); parse_package_metadata("./tmp/.packageinfo"); %installed = %package; + %installed_targets = get_targets("./tmp/.targetinfo"); } sub search_feed { @@ -232,6 +257,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,6 +301,13 @@ 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; } @@ -302,7 +354,7 @@ sub list { return 0; } -sub install_generic() { +sub do_install_package($$) { my $feed = shift; my $pkg = shift; my $path = $pkg->{makefile}; @@ -321,18 +373,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 +403,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,11 +430,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; @@ -369,9 +466,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 @@ -382,21 +479,28 @@ 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"; - $install_method{$type} or do { - warn "Unknown installation method: '$type'\n"; - return 1; - }; + defined($override) and $override == 1 + and warn "Overriding core package '$src' with version from $feed->[1]\n" + or warn "Installing package '$src' from $feed->[1]\n"; - &{$install_method{$type}}($feed, $pkg) == 0 or do { + do_install_package($feed, $pkg) == 0 or do { warn "failed.\n"; return 1; }; @@ -409,7 +513,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; } } @@ -436,7 +540,7 @@ sub install { my $feed; my $ret = 0; - getopts('ap:d:h', \%opts); + getopts('ap:d:fh', \%opts); if ($opts{h}) { usage(); @@ -446,8 +550,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; @@ -462,7 +566,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]); } } @@ -470,7 +574,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; } } @@ -484,6 +588,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; @@ -498,6 +613,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) { @@ -506,6 +625,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"; @@ -585,7 +711,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) { @@ -637,6 +764,7 @@ Commands: -a : Install all packages from all feeds or from the specified feed using the -p option. -p : Prefer this feed when installing packages. -d : Set default for newly installed packages. + -f : Install will be forced even if the package exists in core OpenWrt (override) search [options] : Search for a package Options: @@ -665,7 +793,7 @@ my %commands = ( 'uninstall' => \&uninstall, 'feed_config' => \&feed_config, 'clean' => sub { - system("rm -rf feeds"); + system("rm -rf ./feeds ./package/feeds"); } );