X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=scripts%2Fmetadata.pl;h=54341c458fd78747eae0219a863c1b5cd1f358a2;hp=1971607ebb6f0576a3e323079b63e76090d563ba;hb=90043a99adccb6c7f9dc881f051b5a7b247f8704;hpb=61c9b8665f411aed59f4a10f413d46603d2ebf25 diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 1971607ebb..54341c458f 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -6,83 +6,45 @@ use metadata; my %board; -sub confstr($) { - my $conf = shift; - $conf =~ tr#/\.\-/#___#; - return $conf; +sub version_to_num($) { + my $str = shift; + my $num = 0; + + if (defined($str) && $str =~ /^\d+(?:\.\d+)+$/) + { + my @n = (split(/\./, $str), 0, 0, 0, 0); + $num = ($n[0] << 24) | ($n[1] << 16) | ($n[2] << 8) | $n[3]; + } + + return $num; } -sub parse_target_metadata() { - my $file = shift @ARGV; - my ($target, @target, $profile); - my %target; +sub version_filter_list(@) { + my $cmpver = version_to_num(shift @_); + my @items; - open FILE, "<$file" or do { - warn "Can't open file '$file': $!\n"; - return; - }; - while () { - chomp; - /^Target:\s*(.+)\s*$/ and do { - my $name = $1; - $target = { - id => $name, - board => $name, - boardconf => confstr($name), - conf => confstr($name), - profiles => [], - features => [], - depends => [], - subtargets => [] - }; - push @target, $target; - $target{$name} = $target; - if ($name =~ /([^\/]+)\/([^\/]+)/) { - push @{$target{$1}->{subtargets}}, $2; - $target->{board} = $1; - $target->{boardconf} = confstr($1); - $target->{subtarget} = 1; - $target->{parent} = $target{$1}; - } - }; - /^Target-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1; - /^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1; - /^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1; - /^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1; - /^Target-Features:\s*(.+)\s*$/ and $target->{features} = [ split(/\s+/, $1) ]; - /^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; - /^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; - /^Default-Packages:\s*(.+)\s*$/ and $target->{packages} = [ split(/\s+/, $1) ]; - /^Target-Profile:\s*(.+)\s*$/ and do { - $profile = { - id => $1, - name => $1, - packages => [] - }; - push @{$target->{profiles}}, $profile; - }; - /^Target-Profile-Name:\s*(.+)\s*$/ and $profile->{name} = $1; - /^Target-Profile-Packages:\s*(.*)\s*$/ and $profile->{packages} = [ split(/\s+/, $1) ]; - /^Target-Profile-Description:\s*(.*)\s*/ and $profile->{desc} = get_multiline(*FILE); - /^Target-Profile-Config:/ and $profile->{config} = get_multiline(*FILE, "\t"); - /^Target-Profile-Kconfig:/ and $profile->{kconfig} = 1; - } - close FILE; - foreach my $target (@target) { - next if @{$target->{subtargets}} > 0; - @{$target->{profiles}} > 0 or $target->{profiles} = [ + foreach my $item (@_) + { + if ($item =~ s/@(lt|le|gt|ge|eq|ne)(\d+(?:\.\d+)+)\b//) + { + my $op = $1; + my $symver = version_to_num($2); + + if ($symver > 0 && $cmpver > 0) { - id => 'Default', - name => 'Default', - packages => [] + next unless (($op eq 'lt' && $cmpver < $symver) || + ($op eq 'le' && $cmpver <= $symver) || + ($op eq 'gt' && $cmpver > $symver) || + ($op eq 'ge' && $cmpver >= $symver) || + ($op eq 'eq' && $cmpver == $symver) || + ($op eq 'ne' && $cmpver != $symver)); } - ]; + } + + push @items, $item; } - return @target; + + return @items; } sub gen_kconfig_overrides() { @@ -91,6 +53,7 @@ sub gen_kconfig_overrides() { my $package; my $pkginfo = shift @ARGV; my $cfgfile = shift @ARGV; + my $patchver = shift @ARGV; # parameter 2: build system config open FILE, "<$cfgfile" or return; @@ -105,7 +68,7 @@ sub gen_kconfig_overrides() { /^Package:\s*(.+?)\s*$/ and $package = $1; /^Kernel-Config:\s*(.+?)\s*$/ and do { my @config = split /\s+/, $1; - foreach my $config (@config) { + foreach my $config (version_filter_list($patchver, @config)) { my $val = 'm'; my $override; if ($config =~ /^(.+?)=(.+)$/) { @@ -114,6 +77,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'; @@ -151,19 +115,34 @@ 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"; + /dt/ and $ret .= "\tselect USES_DEVICETREE\n"; /gpio/ and $ret .= "\tselect GPIO_SUPPORT\n"; /pci/ and $ret .= "\tselect PCI_SUPPORT\n"; + /pcie/ and $ret .= "\tselect PCIE_SUPPORT\n"; /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"; - /ext2/ and $ret .= "\tselect USES_EXT2\n"; - /tgz/ and $ret .= "\tselect USES_TGZ\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"; + /ubifs/ and $ret .= "\tselect USES_UBIFS\n"; /fpu/ and $ret .= "\tselect HAS_FPU\n"; + /spe_fpu/ and $ret .= "\tselect HAS_SPE_FPU\n"; /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"; + /low_mem/ and $ret .= "\tselect LOW_MEMORY_FOOTPRINT\n"; + /nand/ and $ret .= "\tselect NAND_SUPPORT\n"; } return $ret; } @@ -181,7 +160,11 @@ sub target_name($) { sub kver($) { my $v = shift; $v =~ tr/\./_/; - $v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1; + if (substr($v,0,2) eq "2_") { + $v =~ /(\d+_\d+_\d+)(_\d+)?/ and $v = $1; + } else { + $v =~ /(\d+_\d+)(_\d+)?/ and $v = $1; + } return $v; } @@ -189,9 +172,7 @@ sub print_target($) { my $target = shift; my $features = target_config_features(@{$target->{features}}); my $help = $target->{desc}; - my $kernel = $target->{kernel}; my $confstr; - $kernel =~ tr/./_/; chomp $features; $features .= "\n"; @@ -207,7 +188,6 @@ sub print_target($) { $confstr = <{conf} bool "$target->{name}" - select LINUX_$kernel select LINUX_$v EOF } @@ -218,35 +198,39 @@ 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 .= "\tselect $target->{arch}\n"; - foreach my $dep (@{$target->{depends}}) { - my $mode = "depends"; - my $flags; - my $name; - - $dep =~ /^([@\+\-]+)(.+)$/; - $flags = $1; - $name = $2; - - next if $name =~ /:/; - $flags =~ /-/ and $mode = "deselect"; - $flags =~ /\+/ and $mode = "select"; - $flags =~ /@/ and $confstr .= "\t$mode $name\n"; - } $confstr .= $features; + if ($target->{arch} =~ /\w/) { + $confstr .= "\tselect $target->{arch}\n"; + } } + foreach my $dep (@{$target->{depends}}) { + my $mode = "depends on"; + my $flags; + my $name; + + $dep =~ /^([@\+\-]+)(.+)$/; + $flags = $1; + $name = $2; + + next if $name =~ /:/; + $flags =~ /-/ and $mode = "deselect"; + $flags =~ /\+/ and $mode = "select"; + $flags =~ /@/ and $confstr .= "\t$mode $name\n"; + } $confstr .= "$help\n\n"; print $confstr; } sub gen_target_config() { - my @target = parse_target_metadata(); + my $file = shift @ARGV; + my @target = parse_target_metadata($file); my %defaults; my @target_sort = sort { @@ -257,7 +241,7 @@ sub gen_target_config() { print <{def_subtarget}; + print <{conf}_$target->{def_subtarget} if TARGET_$target->{conf} +EOF + } + 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"; @@ -328,6 +320,15 @@ EOF $target->{subtarget} or print "\t\tdefault \"".$target->{board}."\" if TARGET_".$target->{conf}."\n"; } print <{subtargets}} > 0; + print "\t\tdefault \"".($target->{arch_packages} || $target->{board})."\" if TARGET_".$target->{conf}."\n"; + } + print <{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) { @@ -407,16 +418,21 @@ 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"; - $depend =~ s/^([@\+]+)//; - my $flags = $1; + my $m = "depends on"; + my $flags = ""; + $depend =~ s/^([@\+]+)// and $flags = $1; my $vdep; my $condition = $parent_condition; + 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") { if ($condition) { @@ -427,9 +443,7 @@ sub mconf_depends { } $depend = $2; } - next if $seen->{$depend}; next if $package{$depend} and $package{$depend}->{buildonly}; - $seen->{$depend} = 1; if ($vdep = $package{$depend}->{vdepends}) { $depend = join("||", map { "PACKAGE_".$_ } @$vdep); } else { @@ -438,7 +452,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; @@ -446,14 +460,20 @@ sub mconf_depends { $flags =~ /@/ or $depend = "PACKAGE_$depend"; if ($condition) { if ($m =~ /select/) { + next if $depend eq $condition; $depend = "$depend if $condition"; } else { - $depend = "!($condition) || $depend"; + $depend = "!($condition) || $depend" unless $dep->{$condition} eq 'select'; } } } $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"; @@ -461,6 +481,18 @@ sub mconf_depends { return $res; } +sub mconf_conflicts { + my $pkgname = shift; + my $depends = shift; + my $res = ""; + + foreach my $depend (@$depends) { + next unless $package{$depend}; + $res .= "\t\tdepends on m || (PACKAGE_$depend != y)\n"; + } + return $res; +} + sub print_package_config_category($) { my $cat = shift; my %menus; @@ -505,15 +537,28 @@ sub print_package_config_category($) { if ($c > 0) { $title .= ("." x $c). " ". $pkg->{title}; } + $title = "\"$title\""; print "\t"; $pkg->{menu} and print "menu"; print "config PACKAGE_".$pkg->{name}."\n"; - print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." \"$title\"\n"; + $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}) { + if ($pkg->{name} =~ /^kmod-/) { + $pkg->{default} ||= "m if ALL_KMODS"; + } else { + $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); + print mconf_conflicts($pkg->{name}, $pkg->{conflicts}); print "\t\thelp\n"; print $pkg->{description}; print "\n"; @@ -530,26 +575,64 @@ sub print_package_config_category($) { undef $category{$cat}; } +sub print_package_features() { + keys %features > 0 or return; + print "menu \"Package features\"\n"; + foreach my $n (keys %features) { + my @features = sort { $b->{priority} <=> $a->{priority} or $a->{title} cmp $b->{title} } @{$features{$n}}; + print <{target_title}" + default FEATURE_$features[0]->{name} +EOF + + foreach my $feature (@features) { + print <{name} + bool "$feature->{title}" +EOF + $feature->{description} =~ /\w/ and do { + print "\t\thelp\n".$feature->{description}."\n"; + }; + } + print "endchoice\n" + } + print "endmenu\n\n"; +} + +sub print_package_overrides() { + keys %overrides > 0 or return; + print "\tconfig OVERRIDE_PKGS\n"; + print "\t\tstring\n"; + print "\t\tdefault \"".join(" ", keys %overrides)."\"\n\n"; +} + sub gen_package_config() { parse_package_metadata($ARGV[0]) or exit 1; - print "menuconfig UCI_PRECONFIG\n\tbool \"Image configuration\"\n" if %preconfig; + print "menuconfig IMAGEOPT\n\tbool \"Image configuration\"\n\tdefault n\n"; foreach my $preconfig (keys %preconfig) { foreach my $cfg (keys %{$preconfig{$preconfig}}) { my $conf = $preconfig{$preconfig}->{$cfg}->{id}; $conf =~ tr/\.-/__/; print <{$cfg}->{label}" if UCI_PRECONFIG - depends PACKAGE_$preconfig + string "$preconfig{$preconfig}->{$cfg}->{label}" if IMAGEOPT + depends on PACKAGE_$preconfig default "$preconfig{$preconfig}->{$cfg}->{default}" EOF } } + print "source \"package/*/image-config.in\"\n"; + if (scalar glob "package/feeds/*/*/image-config.in") { + print "source \"package/feeds/*/*/image-config.in\"\n"; + } + 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; } + print_package_overrides(); } sub get_conditional_dep($$) { @@ -580,17 +663,16 @@ sub gen_package_mk() { next if defined $pkg->{vdepends}; - if ($ENV{SDK}) { - $conf{$pkg->{src}} or do { - $config = 'm'; - $conf{$pkg->{src}} = 1; - }; - } else { - $config = "\$(CONFIG_PACKAGE_$name)" - } + $config = "\$(CONFIG_PACKAGE_$name)"; if ($config) { $pkg->{buildonly} and $config = ""; print "package-$config += $pkg->{subdir}$pkg->{src}\n"; + if ($pkg->{variant}) { + if (!defined($done{$pkg->{src}}) or $pkg->{variant_default}) { + print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n"; + } + print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n" + } $pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n"; } @@ -626,22 +708,23 @@ sub gen_package_mk() { $dep = $1; $suffix = $2; } - my $pkg_dep = $package{$dep}; - next unless $pkg_dep; my $idx = ""; - if (defined $pkg_dep->{src}) { + my $pkg_dep = $package{$dep}; + if (defined($pkg_dep) && defined($pkg_dep->{src})) { $idx = $pkg_dep->{subdir}.$pkg_dep->{src}; } elsif (defined($srcpackage{$dep})) { $idx = $subdir{$dep}.$dep; + } else { + next; } my $depstr = "\$(curdir)/$idx$suffix/compile"; my $depline = get_conditional_dep($condition, $depstr); if ($depline) { - $deplines{$dep} = $depline; + $deplines{$depline}++; } } - my $depline = join(" ", values %deplines); + my $depline = join(" ", sort keys %deplines); if ($depline) { $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/$type/compile += $depline\n"; } @@ -680,12 +763,13 @@ sub gen_package_mk() { } elsif (defined($srcpackage{$dep})) { $idx = $subdir{$dep}.$dep; } - $idx .= $suffix; - undef $idx if $idx =~ /^(kernel)|(base-files)$/; + undef $idx if $idx eq 'base-files'; if ($idx) { + $idx .= $suffix; + my $depline; next if $pkg->{src} eq $pkg_dep->{src}.$suffix; - next if $dep{$pkg->{src}."->".$idx}; + next if $dep{$condition.":".$pkg->{src}."->".$idx}; next if $dep{$pkg->{src}."->($dep)".$idx} and $pkg_dep->{vdepends}; my $depstr; @@ -698,12 +782,12 @@ sub gen_package_mk() { } $depline = get_conditional_dep($condition, $depstr); if ($depline) { - $deplines{$idx.$dep} = $depline; + $deplines{$depline}++; } } } } - my $depline = join(" ", values %deplines); + my $depline = join(" ", sort keys %deplines); if ($depline) { $line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n"; } @@ -722,14 +806,17 @@ sub gen_package_mk() { next unless $cmds; print < \$@ -ifneq (\$(UCI_PRECONFIG)\$(CONFIG_UCI_PRECONFIG),) +ifneq (\$(IMAGEOPT)\$(CONFIG_IMAGEOPT),) package/preconfig: \$(TARGET_DIR)/etc/uci-defaults/$preconfig endif +endif + EOF } } @@ -745,6 +832,44 @@ sub gen_package_source() { } } +sub gen_package_feeds() { + parse_package_metadata($ARGV[0]) or exit 1; + foreach my $name (sort {uc($a) cmp uc($b)} keys %package) { + my $pkg = $package{$name}; + if ($pkg->{name} && $pkg->{feed}) { + print "Package/$name/feed = $pkg->{feed}\n"; + } + } +} + +sub gen_package_license($) { + my $level = shift; + parse_package_metadata($ARGV[0]) or exit 1; + foreach my $name (sort {uc($a) cmp uc($b)} keys %package) { + my $pkg = $package{$name}; + if ($pkg->{name}) { + if ($pkg->{license}) { + print "$pkg->{name}: "; + print "$pkg->{license}\n"; + if ($pkg->{licensefiles} && $level == 0) { + print "\tFiles: $pkg->{licensefiles}\n"; + } + } else { + if ($level == 1) { + print "$pkg->{name}: Missing license! "; + print "Please fix $pkg->{makefile}\n"; + } + } + } + } +} + +sub gen_version_filtered_list() { + foreach my $item (version_filter_list(@ARGV)) { + print "$item\n"; + } +} + sub parse_command() { my $cmd = shift @ARGV; for ($cmd) { @@ -753,14 +878,22 @@ sub parse_command() { /^package_config$/ and return gen_package_config(); /^kconfig/ and return gen_kconfig_overrides(); /^package_source$/ and return gen_package_source(); + /^package_feeds$/ and return gen_package_feeds(); + /^package_license$/ and return gen_package_license(0); + /^package_licensefull$/ and return gen_package_license(1); + /^version_filter$/ and return gen_version_filtered_list(); } print <