qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 18:35:55 +02:00
Code

fix PACKAGES:= for target profiles in target.mk

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7907 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-07-10 20:36:25 +00:00
parent 70e09c2296
commit 8bf629c36a
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; 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() { sub gen_target_mk() {
my @target = parse_target_metadata(); my @target = parse_target_metadata();
@ -149,7 +163,7 @@ sub gen_target_mk() {
define Profile/$conf\_$profile->{id} define Profile/$conf\_$profile->{id}
ID:=$profile->{id} ID:=$profile->{id}
NAME:=$profile->{name} 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"; $profile->{kconfig} and $profiles_def .= " KCONFIG:=1\n";
$profiles_def .= " endef"; $profiles_def .= " endef";
$profiles_eval .= " $profiles_eval .= "
@ -303,12 +317,9 @@ config LINUX_$target->{conf}_$profile->{id}
$profile->{config} $profile->{config}
EOF EOF
$profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n"; $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
my %pkgs; my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
foreach my $pkg (@{$target->{packages}}, @{$profile->{packages}}) { foreach my $pkg (@pkglist) {
$pkgs{$pkg} = 1; print "\tselect DEFAULT_$pkg\n";
}
foreach my $pkg (keys %pkgs) {
print "\tselect DEFAULT_$pkg\n" unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});
} }
print "\n"; print "\n";
} }
@ -317,6 +328,7 @@ EOF
print "endchoice\n"; print "endchoice\n";
} }
sub find_package_dep($$) { sub find_package_dep($$) {
my $pkg = shift; my $pkg = shift;
my $name = shift; my $name = shift;