chdir "$FindBin::Bin/..";
$ENV{TOPDIR}=getcwd();
+$ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
-my $mk=`which gmake`; # select the right 'make' program
+my $mk=`which gmake 2>/dev/null`; # select the right 'make' program
chomp($mk); # trim trailing newline
$mk or $mk = "make"; # default to 'make'
-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("$mk -s prepare-mk TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
+ 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("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
'src-svn' => {
'init' => "svn checkout '%s' '%s'",
'update' => "svn update",
- 'controldir' => ".svn"},
+ 'controldir' => ".svn",
+ 'revision' => "svn info | grep 'Revision' | cut -d ' ' -f 2 | tr -d '\n'"},
'src-cpy' => {
'init' => "cp -Rf '%s' '%s'",
- 'update' => ""},
+ 'update' => "",
+ 'revision' => "echo -n 'local'"},
'src-link' => {
'init' => "ln -s '%s' '%s'",
- 'update' => ""},
+ 'update' => "",
+ 'revision' => "echo -n 'local'"},
'src-git' => {
- 'init' => "git clone --depth 1 '%s' '%s'",
+ 'init' => "git clone --depth 1 '%s' '%s'",
+ 'init_branch' => "git clone --depth 1 --branch '%s' '%s' '%s'",
'update' => "git pull",
- 'controldir' => ".git"},
+ '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",
+ 'controldir' => ".git",
+ 'revision' => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
'src-bzr' => {
'init' => "bzr checkout --lightweight '%s' '%s'",
'update' => "bzr update",
'src-hg' => {
'init' => "hg clone '%s' '%s'",
'update' => "hg pull --update",
- 'controldir' => ".hg"}
+ 'controldir' => ".hg"},
+ 'src-darcs' => {
+ 'init' => "darcs get '%s' '%s'",
+ 'update' => "darcs pull -a",
+ 'controldir' => "_darcs"},
);
# src-git: pull broken
my $localpath = "./feeds/$name";
my $safepath = $localpath;
$safepath =~ s/'/'\\''/;
+ my ($base, $branch) = split(/;/, $src, 2);
if( $relocate || !$m->{'update'} || !-d "$localpath/$m->{'controldir'}" ) {
system("rm -rf '$safepath'");
- system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
+ if ($m->{'init_branch'} and $branch) {
+ system(sprintf($m->{'init_branch'}, $branch, $base, $safepath)) == 0 or return 1;
+ } else {
+ system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
+ }
} else {
system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
}
}
sub get_installed() {
- system("$mk -s prepare-tmpinfo");
+ system("$mk -s prepare-tmpinfo OPENWRT_BUILD=");
clear_packages();
parse_package_metadata("./tmp/.packageinfo");
%installed = %package;
my $feed = shift;
get_feed($feed);
- foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
+ foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
my $pkg = $feed_package->{$name};
next if $pkg->{vdepends};
if($pkg->{name}) {
sub list {
my %opts;
- getopts('r:sh', \%opts);
+ getopts('r:d:sh', \%opts);
if ($opts{h}) {
usage();
return 0;
}
if ($opts{s}) {
foreach my $feed (@feeds) {
- printf "\%-32s\tURL: %s\n", $feed->[1], join(", ", @{$feed->[2]});
+ my $localpath = "./feeds/$feed->[1]";
+ my $m = $update_method{$feed->[0]};
+ my $revision;
+ if( !$m->{'revision'} ) {
+ $revision = "X";
+ }
+ elsif( $m->{'controldir'} && -d "$localpath/$m->{'controldir'}" ) {
+ $revision = `cd '$localpath'; $m->{'revision'}`;
+ }
+ else {
+ $revision = "local";
+ }
+ 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]});
+ }
+ else {
+ printf "\%-8s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
+ }
}
return 0;
}
'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,
);
my %feed;
return 0;
};
+ # switch to the metadata for the selected feed
+ get_feed($feed->[1]);
+
my $pkg = $feed{$feed->[1]}->{$name} or return 1;
$pkg->{name} or do {
$installed{$name} and return 0;
return 1;
};
- # install all dependencies
- foreach my $vpkg (@{$feed_src->{$src}}, $pkg) {
+ # install all dependencies referenced from the source package
+ foreach my $vpkg (@{$feed_src->{$src}}) {
foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
next if $dep =~ /@/;
$dep =~ s/^\+//;
if (!defined($opts{p}) or $opts{p} eq $f->[1]) {
printf "Installing all packages from feed %s.\n", $f->[1];
get_feed($f->[1]);
- foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
+ foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
my $p = $feed_package->{$name};
next if $p->{vdepends};
if( $p->{name} ) {
install_package($feed, $p->{name}) == 0 or $ret = 1;
+ get_feed($f->[1]);
}
}
}
my $perform_update=1;
$ENV{SCAN_COOKIE} = $$;
- $ENV{KBUILD_VERBOSE} = 99;
+ $ENV{OPENWRT_VERBOSE} = 's';
getopts('ahi', \%opts);
Usage: $0 <command> [options]
Commands:
- list [options]: List feeds and their content
+ list [options]: List feeds, their content and revisions (if installed)
Options:
- -s : List of feed names and their URL.
- -r <feedname>: List packages of specified feed.
+ -s : List of feed names and their URL.
+ -r <feedname>: List packages of specified feed.
+ -d <delimiter>: Use specified delimiter to distinguish rows (default: spaces)
install [options] <package>: Install a package
Options:
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.
+ -a : Update all feeds listed within feeds.conf. Otherwise the specified feeds will be updated.
-i : Recreate the index only. No feed update from repository is performed.
clean: Remove downloaded/generated files.
projects / openwrt / svn-archive / archive.git / blobdiff