the patch causes issues when installing feeds
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 44078
+++ /dev/null
-BEGIN { FS="/" }
-$1 ~ /^feeds/ { FEEDS[$NF]=$0 }
-$1 !~ /^feeds/ { PKGS[$NF]=$0 }
-END {
- # Filter-out OpenWrt packages which have a feeds equivalent
- for (pkg in PKGS)
- if (pkg in FEEDS)
- delete PKGS[pkg]
- n = asort(PKGS)
- for (i=1; i <= n; i++) {
- print PKGS[i]
- }
- n = asort(FEEDS)
- for (i=1; i <= n; i++){
- print FEEDS[i]
- }
-}
$(FILELIST):
rm -f $(TMP_DIR)/info/.files-$(SCAN_TARGET)-*
$(FILELIST):
rm -f $(TMP_DIR)/info/.files-$(SCAN_TARGET)-*
- $(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|Build(Package|Target)|.+Package)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq | awk -f include/scan.awk > $@
+ $(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|Build(Package|Target)|.+Package)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@
$(TMP_DIR)/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
( \
$(TMP_DIR)/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
( \
sub install_package {
my $feed = shift;
my $name = shift;
sub install_package {
my $feed = shift;
my $name = shift;
my $ret = 0;
$feed = lookup_package($feed, $name);
my $ret = 0;
$feed = lookup_package($feed, $name);
$src or $src = $name;
# previously installed packages set the runtime package
$src or $src = $name;
# previously installed packages set the runtime package
- # 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{$src}->{feed});
+ # newly installed packages set the source package
+ $installed{$src} and return 0;
# check previously installed packages
# check previously installed packages
- $installed{$name} and !$override and return 0;
+ $installed{$name} and return 0;
-
- $override == 1
- and warn "Overriding package '$src'\n"
- or warn "Installing package '$src'\n";
+ warn "Installing package '$src'\n";
$install_method{$type} or do {
warn "Unknown installation method: '$type'\n";
$install_method{$type} or do {
warn "Unknown installation method: '$type'\n";
- getopts('ap:d:fh', \%opts);
+ getopts('ap:d:h', \%opts);
my $p = $feed_package->{$name};
next if $p->{vdepends};
if( $p->{name} ) {
my $p = $feed_package->{$name};
next if $p->{vdepends};
if( $p->{name} ) {
- install_package($feed, $p->{name}, exists($opts{f})) == 0 or $ret = 1;
+ install_package($feed, $p->{name}) == 0 or $ret = 1;
}
} else {
while ($name = shift @ARGV) {
}
} else {
while ($name = shift @ARGV) {
- install_package($feed, $name, exists($opts{f})) == 0 or $ret = 1;
+ install_package($feed, $name) == 0 or $ret = 1;
-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.
-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.
- -f : Install will be forced even if the package exists in core OpenWrt (override)
search [options] <substring>: Search for a package
Options:
search [options] <substring>: Search for a package
Options: