metadata: allow build variants to contain "-"

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19284 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index b7a448b..52ca989 100644 (file)
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -112,7 +112,7 @@ sub parse_package_metadata($) {
                        }
                };
                /^Depends: \s*(.+)\s*$/ and $pkg->{depends} = [ split /\s+/, $1 ];
                        }
                };
                /^Depends: \s*(.+)\s*$/ and $pkg->{depends} = [ split /\s+/, $1 ];

-               /^Build-Variant: \s*(\w+)\s*/ and $pkg->{variant} = $1;
+               /^Build-Variant: \s*([\w\-]+)\s*/ and $pkg->{variant} = $1;

                /^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1;
                /^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [ split /\s+/, $1 ];
                /^Build-Depends\/(\w+): \s*(.+)\s*$/ and $pkg->{"builddepends/$1"} = [ split /\s+/, $2 ];
                /^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1;
                /^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [ split /\s+/, $1 ];
                /^Build-Depends\/(\w+): \s*(.+)\s*$/ and $pkg->{"builddepends/$1"} = [ split /\s+/, $2 ];