nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: metadata: fix issue generating syntax errors in Kconfig files

Browse Source 
Update "scripts: metadata: always resolve dependencies through provides
list" to new version.
This commit is contained in:
Matthias Schiffer 2017-07-08 21:19:14 +02:00
parent 2cd30d644b
commit e52c575b57
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
patches/lede/0033-scripts-metadata-always-resolve-dependencies-through-provides-list.patch
View File

@ -95,7 +95,7 @@ index 8334f26d3179a0eb83aa1aa976778ff5828faf45..e7bdbab4568ddd7e10c10b2ca6a71838
}; };
/^Menu-Depends: \s*(.+)\s*$/ and $pkg->{mdepends} = [ split /\s+/, $1 ]; /^Menu-Depends: \s*(.+)\s*$/ and $pkg->{mdepends} = [ split /\s+/, $1 ];
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 2da32c770ef3333bfcc18922ede556f9734510c7..bd795bfe58d86c0e48205042192751fadf8a209b 100755 index 2da32c770ef3333bfcc18922ede556f9734510c7..998d37dd415d89e7eccad2ddf73f855f6a9b017c 100755
--- a/scripts/package-metadata.pl --- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl +++ b/scripts/package-metadata.pl
@@ -101,14 +101,16 @@ my %dep_check; @@ -101,14 +101,16 @@ my %dep_check;
@ -121,27 +121,37 @@ index 2da32c770ef3333bfcc18922ede556f9734510c7..bd795bfe58d86c0e48205042192751fa
} }
return 0; return 0;
} }
@@ -173,9 +175,8 @@ sub mconf_depends { @@ -156,7 +158,6 @@ sub mconf_depends {
my $m = "depends on";
my $flags = "";
$depend =~ s/^([@\+]+)// and $flags = $1;
- my $vdep;
my $condition = $parent_condition;
next if $condition eq $depend;
@@ -173,9 +174,9 @@ sub mconf_depends {
} }
$depend = $2; $depend = $2;
} }
- next if $package{$depend} and $package{$depend}->{buildonly}; - next if $package{$depend} and $package{$depend}->{buildonly};
if ($flags =~ /\+/) { if ($flags =~ /\+/) {
- if ($vdep = $package{$depend}->{vdepends}) { - if ($vdep = $package{$depend}->{vdepends}) {
+ if ($vdep = $vpackage{$depend}) { + my $vdep = $vpackage{$depend};
+ if ($vdep and @$vdep > 0) {
my @vdeps; my @vdeps;
$depend = undef; $depend = undef;
@@ -209,7 +210,7 @@ sub mconf_depends { @@ -209,7 +210,8 @@ sub mconf_depends {
$flags =~ /@/ or $depend = "PACKAGE_$depend"; $flags =~ /@/ or $depend = "PACKAGE_$depend";
} else { } else {
- if ($vdep = $package{$depend}->{vdepends}) { - if ($vdep = $package{$depend}->{vdepends}) {
+ if ($vdep = $vpackage{$depend}) { + my $vdep = $vpackage{$depend};
+ if ($vdep and @$vdep > 0) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep); $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
} else { } else {
$flags =~ /@/ or $depend = "PACKAGE_$depend"; $flags =~ /@/ or $depend = "PACKAGE_$depend";
@@ -413,7 +414,6 @@ sub get_conditional_dep($$) { @@ -413,7 +415,6 @@ sub get_conditional_dep($$) {
sub gen_package_mk() { sub gen_package_mk() {
my %conf; my %conf;
@ -149,7 +159,7 @@ index 2da32c770ef3333bfcc18922ede556f9734510c7..bd795bfe58d86c0e48205042192751fa
my %done; my %done;
my $line; my $line;
@@ -423,8 +423,6 @@ sub gen_package_mk() { @@ -423,8 +424,6 @@ sub gen_package_mk() {
my $pkg = $package{$name}; my $pkg = $package{$name};
my @srcdeps; my @srcdeps;
@ -158,7 +168,7 @@ index 2da32c770ef3333bfcc18922ede556f9734510c7..bd795bfe58d86c0e48205042192751fa
$config = "\$(CONFIG_PACKAGE_$name)"; $config = "\$(CONFIG_PACKAGE_$name)";
if ($config) { if ($config) {
$pkg->{buildonly} and $config = ""; $pkg->{buildonly} and $config = "";
@@ -445,16 +443,7 @@ sub gen_package_mk() { @@ -445,16 +444,7 @@ sub gen_package_mk() {
print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$pkg->{buildtypes}})."\n"; print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$pkg->{buildtypes}})."\n";
} }
@ -175,7 +185,7 @@ index 2da32c770ef3333bfcc18922ede556f9734510c7..bd795bfe58d86c0e48205042192751fa
my %deplines; my %deplines;
next unless $pkg->{"builddepends/$type"}; next unless $pkg->{"builddepends/$type"};
@@ -492,63 +481,70 @@ sub gen_package_mk() { @@ -492,63 +482,70 @@ sub gen_package_mk() {
} }
} }
@ -285,7 +295,7 @@ index 2da32c770ef3333bfcc18922ede556f9734510c7..bd795bfe58d86c0e48205042192751fa
my $depline = join(" ", sort keys %deplines); my $depline = join(" ", sort keys %deplines);
if ($depline) { if ($depline) {
$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n"; $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
@@ -573,7 +569,7 @@ ifndef DUMP_TARGET_DB @@ -573,7 +570,7 @@ ifndef DUMP_TARGET_DB
( \\ ( \\
$cmds \\ $cmds \\
) > \$@ ) > \$@