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

scripts/package-metadata.pl: fix kmod pakage dependencies within the SDK

Browse Source 
Instead of ignoring all metadata for package/kernel/linux, process it
and only suppress emitting config data to tmp/.config-package.in

This ensures that packages that select kmod-* packages can inherit their
depdendencies.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2016-07-07 12:39:27 +02:00
parent b80dfe4cde
commit d8dbd33eba
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/metadata.pm
View File

@@ -162,10 +162,10 @@ sub parse_package_metadata($) {
$overrides{$src} = 1; $overrides{$src} = 1;
}; };
next unless $src; next unless $src;
next if $ignore{$src};
/^Package:\s*(.+?)\s*$/ and do { /^Package:\s*(.+?)\s*$/ and do {
undef $feature; undef $feature;
$pkg = {}; $pkg = {};
$pkg->{ignore} = $ignore{$src};
$pkg->{src} = $src; $pkg->{src} = $src;
$pkg->{makefile} = $makefile; $pkg->{makefile} = $makefile;
$pkg->{name} = $1; $pkg->{name} = $1;
@@ -189,7 +189,7 @@ sub parse_package_metadata($) {
$feature and do { $feature and do {
/^Target-Name:\s*(.+?)\s*$/ and do { /^Target-Name:\s*(.+?)\s*$/ and do {
$features{$1} or $features{$1} = []; $features{$1} or $features{$1} = [];
push @{$features{$1}}, $feature; push @{$features{$1}}, $feature unless $ignore{$src};
}; };
/^Target-Title:\s*(.+?)\s*$/ and $feature->{target_title} = $1; /^Target-Title:\s*(.+?)\s*$/ and $feature->{target_title} = $1;
/^Feature-Priority:\s*(\d+)\s*$/ and $feature->{priority} = $1; /^Feature-Priority:\s*(\d+)\s*$/ and $feature->{priority} = $1;
@@ -256,7 +256,7 @@ sub parse_package_metadata($) {
$preconfig = { $preconfig = {
id => $1 id => $1
}; };
$preconfig{$pkgname}->{$1} = $preconfig; $preconfig{$pkgname}->{$1} = $preconfig unless $ignore{$src};
} }
}; };
/^Preconfig-Type:\s*(.*?)\s*$/ and $preconfig->{type} = $1; /^Preconfig-Type:\s*(.*?)\s*$/ and $preconfig->{type} = $1;

1
scripts/package-metadata.pl
View File

@@ -272,6 +272,7 @@ sub print_package_config_category($) {
print "menu \"$menu\"\n"; print "menu \"$menu\"\n";
} }
foreach my $pkg (@pkgs) { foreach my $pkg (@pkgs) {
next if $pkg->{ignore};
my $title = $pkg->{name}; my $title = $pkg->{name};
my $c = (72 - length($pkg->{name}) - length($pkg->{title})); my $c = (72 - length($pkg->{name}) - length($pkg->{title}));
if ($c > 0) { if ($c > 0) {