domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/feeds: allow adding parameters to feeds

Browse Source 
this allows adding "--" prefixed parameters inside feeds.conf between the
target and name. The first parameter is --force which has the same effect
as using -f when installing any of the packages. This allows creating
feeds that will override base packages by default.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich
2019-08-28 15:21:35 +02:00
committed by John Crispin
parent 6e45ba4699
commit 775b70f8d5
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scripts/feeds
View File

@@ -44,7 +44,7 @@ my $feed_vpackage = {};
sub parse_file($$); sub parse_file($$);
sub parse_file($$) { sub parse_file($$) {
my ($fname, $name) = @_; my ($fname, $existing) = @_;
my $line = 0; my $line = 0;
my $fh; my $fh;
@@ -54,26 +54,33 @@ sub parse_file($$) {
s/#.+$//; s/#.+$//;
$line++; $line++;
next unless /\S/; next unless /\S/;
my @line = split /\s+/, $_, 3;
my @src;
my $valid = 1; my ($type, $flags, $name, $urls) = m!^src-(\w+)((?:\s+--\w+(?:=\S+)?)*)\s+(\w+)(?:\s+(\S.*))?$!;
$line[0] =~ /^src-[\w-]+$/ or $valid = 0; unless ($type && $name) {
$line[1] =~ /^\w+$/ or $valid = 0; die "Syntax error in $fname, line $line\n";
@src = split /\s+/, ($line[2] or ''); }
@src = ('') if @src == 0;
$valid or die "Syntax error in $fname, line: $line\n";
$name->{$line[1]} and die "Duplicate feed name '$line[1]' in '$fname' line: $line\n"; if ($existing->{$name}++) {
$name->{$line[1]} = 1; die "Duplicate feed name '$name' in '$fname' line: $line\n";
}
if ($line[0] eq "src-include") { my @src = defined($urls) ? split /\s+/, $urls : ();
parse_file($line[2], $name) or push @src, '' if @src == 0;
die "Unable to open included file '$line[2]'";
my %flags;
if (defined $flags) {
while ($flags =~ m!\s+--(\w+)(?:=(\S+))?!g) {
$flags{$1} = defined($2) ? $2 : 1;
}
}
if ($type eq "include") {
parse_file($urls, $name) or
die "Unable to open included file '$urls'";
next; next;
} }
push @feeds, [$line[0], $line[1], \@src]; push @feeds, ["src-$type", $name, \@src, \%flags];
} }
close $fh; close $fh;
return 1; return 1;
@@ -521,6 +528,11 @@ sub install_src {
get_feed($feed->[1]); get_feed($feed->[1]);
my $src = $feed_src->{$name} or return 1; my $src = $feed_src->{$name} or return 1;
# enable force flag if feed src line was declared with --force
if (exists($feed->[3]{force})) {
$force = 1;
}
# If it's a core package and we don't want to override, just return # If it's a core package and we don't want to override, just return
my $override = 0; my $override = 0;
if (is_core_src($name)) { if (is_core_src($name)) {