KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix PACKAGES:= for target profiles in target.mk

Browse source 
SVN-Revision: 7907
This commit is contained in:
Felix Fietkau 2007-07-10 20:36:25 +00:00
parent c0f9679587
commit 0ed9124016
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/metadata.pl
View file

@ -131,6 +131,20 @@ sub parse_package_metadata() {
return %category;
}
sub merge_package_lists($$) {
my $list1 = shift;
my $list2 = shift;
my @l = ();
my %pkgs;
foreach my $pkg (@$list1, @$list2) {
$pkgs{$pkg} = 1;
}
foreach my $pkg (keys %pkgs) {
push @l, $pkg unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
}
return sort(@l);
}
sub gen_target_mk() {
my @target = parse_target_metadata();
@ -149,7 +163,7 @@ sub gen_target_mk() {
define Profile/$conf\_$profile->{id}
ID:=$profile->{id}
NAME:=$profile->{name}
PACKAGES:=".join(" ", @{$profile->{packages}})."\n";
PACKAGES:=".join(" ", merge_package_lists($target->{packages}, $profile->{packages}))."\n";
$profile->{kconfig} and $profiles_def .= " KCONFIG:=1\n";
$profiles_def .= " endef";
$profiles_eval .= "
@ -303,12 +317,9 @@ config LINUX_$target->{conf}_$profile->{id}
$profile->{config}
EOF
$profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
my %pkgs;
foreach my $pkg (@{$target->{packages}}, @{$profile->{packages}}) {
$pkgs{$pkg} = 1;
}
foreach my $pkg (keys %pkgs) {
print "\tselect DEFAULT_$pkg\n" unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
foreach my $pkg (@pkglist) {
print "\tselect DEFAULT_$pkg\n";
}
print "\n";
}
@ -317,6 +328,7 @@ EOF
print "endchoice\n";
}
sub find_package_dep($$) {
my $pkg = shift;
my $name = shift;