projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e393b16
)
fix PACKAGES:= for target profiles in target.mk
author
Felix Fietkau
<nbd@openwrt.org>
Tue, 10 Jul 2007 20:36:25 +0000
(20:36 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Tue, 10 Jul 2007 20:36:25 +0000
(20:36 +0000)
SVN-Revision: 7907
scripts/metadata.pl
patch
|
blob
|
history
diff --git
a/scripts/metadata.pl
b/scripts/metadata.pl
index e19600332660db95bd7995f927094c8449dd3c20..dbd6ccef37c8d12a044f35b5abb4fc2bc7776d1e 100755
(executable)
--- a/
scripts/metadata.pl
+++ b/
scripts/metadata.pl
@@
-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() {
my @target = parse_target_metadata();
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}
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 .= "
$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";
$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";
}
}
print "\n";
}
@@
-317,6
+328,7
@@
EOF
print "endchoice\n";
}
print "endchoice\n";
}
+
sub find_package_dep($$) {
my $pkg = shift;
my $name = shift;
sub find_package_dep($$) {
my $pkg = shift;
my $name = shift;