my $ret;
while ($_ = shift @_) {
- /broken/ and $ret .= "\tdepends BROKEN\n";
+ /arm_v(\w+)/ and $ret .= "\tselect arm_v$1\n";
+ /broken/ and $ret .= "\tdepends on BROKEN\n";
/audio/ and $ret .= "\tselect AUDIO_SUPPORT\n";
/display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
/gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
/rtc/ and $ret .= "\tselect RTC_SUPPORT\n";
/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
- /jffs2/ and $ret .= "\tselect USES_JFFS2\n";
+ /jffs2$/ and $ret .= "\tselect USES_JFFS2\n";
+ /jffs2_nand/ and $ret .= "\tselect USES_JFFS2_NAND\n";
/ext4/ and $ret .= "\tselect USES_EXT4\n";
/targz/ and $ret .= "\tselect USES_TARGZ\n";
/cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
EOF
}
if ($target->{subtarget}) {
- $confstr .= "\tdepends TARGET_$target->{boardconf}\n";
+ $confstr .= "\tdepends on TARGET_$target->{boardconf}\n";
}
if (@{$target->{subtargets}} > 0) {
$confstr .= "\tselect HAS_SUBTARGETS\n";
- grep { /broken/ } @{$target->{features}} and $confstr .= "\tdepends BROKEN\n";
+ grep { /broken/ } @{$target->{features}} and $confstr .= "\tdepends on BROKEN\n";
} else {
$confstr .= $features;
}
$confstr .= "\tselect $target->{arch}\n";
}
foreach my $dep (@{$target->{depends}}) {
- my $mode = "depends";
+ my $mode = "depends on";
my $flags;
my $name;
print <<EOF;
config TARGET_$target->{conf}_$profile->{id}
bool "$profile->{name}"
- depends TARGET_$target->{conf}
+ depends on TARGET_$target->{conf}
$profile->{config}
EOF
$profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
$depends or return;
my @depends = @$depends;
foreach my $depend (@depends) {
- my $m = "depends";
+ my $m = "depends on";
my $flags = "";
$depend =~ s/^([@\+]+)// and $flags = $1;
my $vdep;
print <<EOF
config UCI_PRECONFIG_$conf
string "$preconfig{$preconfig}->{$cfg}->{label}" if IMAGEOPT
- depends PACKAGE_$preconfig
+ depends on PACKAGE_$preconfig
default "$preconfig{$preconfig}->{$cfg}->{default}"
EOF
}
print_package_features();
print_package_config_category 'Base system';
- foreach my $cat (keys %category) {
+ foreach my $cat (sort {uc($a) cmp uc($b)} keys %category) {
print_package_config_category $cat;
}
}
$idx = $subdir{$dep}.$dep;
}
$idx .= $suffix;
- undef $idx if $idx =~ /^(kernel)|(base-files)$/;
+ undef $idx if $idx =~ /^(kernel\/linux)|(base-files)$/;
if ($idx) {
my $depline;
next if $pkg->{src} eq $pkg_dep->{src}.$suffix;