ath9k: fix switching channel bandwidth from 5/10 back to 20mhz

[openwrt.git] / scripts / metadata.pm

diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index b7a448b..5efef46 100644 (file)
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -66,6 +66,7 @@ sub parse_package_metadata($) {
                        $pkg->{title} = "";
                        $pkg->{default} = "m if ALL";
                        $pkg->{depends} = [];
                        $pkg->{title} = "";
                        $pkg->{default} = "m if ALL";
                        $pkg->{depends} = [];

+                       $pkg->{mdepends} = [];

                        $pkg->{builddepends} = [];
                        $pkg->{buildtypes} = [];
                        $pkg->{subdir} = $subdir;
                        $pkg->{builddepends} = [];
                        $pkg->{buildtypes} = [];
                        $pkg->{subdir} = $subdir;


@@ -111,8 +112,10 @@ sub parse_package_metadata($) {
                                push @{$package{$vpkg}->{vdepends}}, $pkg->{name};
                        }
                };
                                push @{$package{$vpkg}->{vdepends}}, $pkg->{name};
                        }
                };

+               /^Menu-Depends: \s*(.+)\s*$/ and $pkg->{mdepends} = [ split /\s+/, $1 ];

                /^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;
+               /^Hidden: \s*(.+)\s*$/ and $pkg->{hidden} = 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 ];