[toolchain/eglibc] when selecting eglibc, use version 2.12 by default

[openwrt.git] / scripts / metadata.pl

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 3de4087..7208e16 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -45,7 +45,6 @@ sub parse_target_metadata() {
                                $target->{parent} = $target{$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-Name:\s*(.+)\s*$/ and $target->{name} = $1;
                /^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1;
                /^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1;


@@ -189,7 +188,11 @@ sub target_name($) {
 sub kver($) {
        my $v = shift;
        $v =~ tr/\./_/;
 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;
 }
 
        return $v;
 }