aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-10-17 17:45:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-10-17 17:45:14 +0000
commit634a6d7f861165f4275b4eb3c121755dce5e6ceb (patch)
tree3a0401e9567b3b88394cb7b57c7edab0fe0fab31
parente2434a5515c4c56ffa9eb78276793c7bcf0a1b75 (diff)
downloadupstream-634a6d7f861165f4275b4eb3c121755dce5e6ceb.tar.gz
upstream-634a6d7f861165f4275b4eb3c121755dce5e6ceb.tar.bz2
upstream-634a6d7f861165f4275b4eb3c121755dce5e6ceb.zip
menuconfig: include dependency checking in submenu sorting function
SVN-Revision: 5193
-rwxr-xr-xscripts/gen_menuconfig.pl32
1 files changed, 32 insertions, 0 deletions
diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl
index c0279d5452..fe0dc27636 100755
--- a/scripts/gen_menuconfig.pl
+++ b/scripts/gen_menuconfig.pl
@@ -11,6 +11,7 @@ use strict;
my $src;
my $makefile;
my $pkg;
+my %package;
my %category;
my $cur_menu;
my $cur_menu_dep;
@@ -26,6 +27,35 @@ sub close_submenu {
}
}
+sub find_dep($$) {
+ my $pkg = shift;
+ my $name = shift;
+
+ return 0 unless defined $pkg->{depends};
+ foreach my $dep (@{$pkg->{depends}}) {
+ return 1 if $dep eq $name;
+ return 1 if ($package{$dep} and (find_dep($package{$dep},$name) == 1));
+ }
+ return 0;
+}
+
+sub depends($$) {
+ my $a = shift;
+ my $b = shift;
+ my $ret;
+
+ if (find_dep($a, $b->{name}) == 1) {
+ $ret = 1;
+ } elsif (find_dep($b, $a->{name}) == 1) {
+ $ret = -1;
+ } else {
+ $ret = 0;
+ }
+# print STDERR "depends($a->{name}, $b->{name}) == $ret\n";
+ return $ret;
+}
+
+
sub print_category($) {
my $cat = shift;
@@ -35,6 +65,7 @@ sub print_category($) {
my %spkg = %{$category{$cat}};
foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
my @pkgs = sort {
+ depends($a, $b) or
$a->{submenu}."->".$a->{name} cmp $b->{submenu}."->".$b->{name}
} @{$spkg{$spkg}};
foreach my $pkg (@pkgs) {
@@ -93,6 +124,7 @@ while ($line = <>) {
$pkg->{makefile} = $makefile;
$pkg->{name} = $1;
$pkg->{default} = "m if ALL";
+ $package{$1} = $pkg;
};
$line =~ /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
$line =~ /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;