projects
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
276ce3c
)
scripts/feeds: remove useless install_method abstraction
author
nbd
<nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 15 Mar 2015 11:07:52 +0000
(11:07 +0000)
committer
nbd
<nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 15 Mar 2015 11:07:52 +0000
(11:07 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44778
3c298f89
-4303-0410-b956-
a3cf2f4a3e73
scripts/feeds
patch
|
blob
|
history
diff --git
a/scripts/feeds
b/scripts/feeds
index
aa33af9
..
6e30b5a
100755
(executable)
--- a/
scripts/feeds
+++ b/
scripts/feeds
@@
-347,7
+347,7
@@
sub list {
return 0;
}
return 0;
}
-sub
install_generic(
) {
+sub
do_install_package($$
) {
my $feed = shift;
my $pkg = shift;
my $path = $pkg->{makefile};
my $feed = shift;
my $pkg = shift;
my $path = $pkg->{makefile};
@@
-366,17
+366,6
@@
sub install_generic() {
return 0;
}
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,
-);
-
my %feed;
sub lookup_package($$) {
my %feed;
sub lookup_package($$) {
@@
-449,12
+438,7
@@
sub install_package {
and warn "Overriding package '$src'\n"
or warn "Installing package '$src'\n";
and warn "Overriding package '$src'\n"
or warn "Installing package '$src'\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;
};
warn "failed.\n";
return 1;
};