X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=ddcf50bf32a3b9a1e0ab4770b4a97443787e109e;hp=41e6e9cd581917afa7d26ed4a5734ce6099b57f5;hb=bae18818be329c7eb889d182038365c61a147120;hpb=6d99a919086e9e91a0a94cbde7743476ae5fbb51 diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 41e6e9cd58..ddcf50bf32 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -53,6 +53,7 @@ sub parse_target_metadata() { /^Target-Depends:\s*(.+)\s*$/ and $target->{depends} = [ split(/\s+/, $1) ]; /^Target-Description:/ and $target->{desc} = get_multiline(*FILE); /^Target-Optimization:\s*(.+)\s*$/ and $target->{cflags} = $1; + /^CPU-Type:\s*(.+)\s*$/ and $target->{cputype} = $1; /^Linux-Version:\s*(.+)\s*$/ and $target->{version} = $1; /^Linux-Release:\s*(.+)\s*$/ and $target->{release} = $1; /^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target->{karch} = $1; @@ -115,6 +116,7 @@ sub gen_kconfig_overrides() { $val = $2; } if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) { + next if $kconfig{$config} eq 'y'; $kconfig{$config} = $val; } elsif (!$override) { $kconfig{$config} or $kconfig{$config} = 'n'; @@ -152,7 +154,8 @@ sub target_config_features(@) { 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"; @@ -161,8 +164,10 @@ sub target_config_features(@) { /usb/ and $ret .= "\tselect USB_SUPPORT\n"; /usbgadget/ and $ret .= "\tselect USB_GADGET_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"; @@ -172,6 +177,8 @@ sub target_config_features(@) { /ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n"; /powerpc64/ and $ret .= "\tselect powerpc64\n"; /nommu/ and $ret .= "\tselect NOMMU\n"; + /mips16/ and $ret .= "\tselect HAS_MIPS16\n"; + /rfkill/ and $ret .= "\tselect RFKILL_SUPPORT\n"; } return $ret; } @@ -227,10 +234,11 @@ config TARGET_$target->{conf} 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 on BROKEN\n"; } else { $confstr .= $features; } @@ -239,7 +247,7 @@ EOF $confstr .= "\tselect $target->{arch}\n"; } foreach my $dep (@{$target->{depends}}) { - my $mode = "depends"; + my $mode = "depends on"; my $flags; my $name; @@ -268,7 +276,7 @@ sub gen_target_config() { print <{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"; @@ -365,6 +373,16 @@ EOF print "\tdefault \"".$target->{cflags}."\" if TARGET_".$target->{conf}."\n"; } print "\tdefault \"-Os -pipe -funit-at-a-time\"\n"; + print <{subtargets}} > 0; + print "\tdefault \"".$target->{cputype}."\" if TARGET_".$target->{conf}."\n"; + } + print "\tdefault \"\"\n"; my %kver; foreach my $target (@target) { @@ -435,11 +453,12 @@ sub mconf_depends { my $parent_condition = shift; $dep or $dep = {}; $seen or $seen = {}; + my @t_depends; $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; @@ -447,6 +466,7 @@ sub mconf_depends { next if $condition eq $depend; next if $seen->{"$parent_condition:$depend"}; + next if $seen->{":$depend"}; $seen->{"$parent_condition:$depend"} = 1; if ($depend =~ /^(.+):(.+)$/) { if ($1 ne "PACKAGE_$pkgname") { @@ -467,7 +487,7 @@ sub mconf_depends { # thus if FOO depends on other config options, these dependencies # will not be checked. To fix this, we simply emit all of FOO's # depends here as well. - $package{$depend} and mconf_depends($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition); + $package{$depend} and push @t_depends, [ $package{$depend}->{depends}, $condition ]; $m = "select"; next if $only_dep; @@ -484,6 +504,11 @@ sub mconf_depends { } $dep->{$depend} =~ /select/ or $dep->{$depend} = $m; } + + foreach my $tdep (@t_depends) { + mconf_depends($pkgname, $tdep->[0], 1, $dep, $seen, $tdep->[1]); + } + foreach my $depend (keys %$dep) { my $m = $dep->{$depend}; $res .= "\t\t$m $depend\n"; @@ -542,8 +567,13 @@ sub print_package_config_category($) { $pkg->{hidden} and $title = ""; print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n"; print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n"; - foreach my $default (split /\s*,\s*/, $pkg->{default}) { - print "\t\tdefault $default\n"; + unless ($pkg->{hidden}) { + $pkg->{default} ||= "m if ALL"; + } + if ($pkg->{default}) { + foreach my $default (split /\s*,\s*/, $pkg->{default}) { + print "\t\tdefault $default\n"; + } } print mconf_depends($pkg->{name}, $pkg->{depends}, 0); print mconf_depends($pkg->{name}, $pkg->{mdepends}, 0); @@ -598,7 +628,7 @@ sub gen_package_config() { print <{$cfg}->{label}" if IMAGEOPT - depends PACKAGE_$preconfig + depends on PACKAGE_$preconfig default "$preconfig{$preconfig}->{$cfg}->{default}" EOF @@ -610,7 +640,7 @@ 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; } } @@ -751,7 +781,7 @@ sub gen_package_mk() { $idx = $subdir{$dep}.$dep; } $idx .= $suffix; - undef $idx if $idx =~ /^(kernel)|(base-files)$/; + undef $idx if $idx eq 'base-files'; if ($idx) { my $depline; next if $pkg->{src} eq $pkg_dep->{src}.$suffix;