move the broadcom driver stuff into its own submenu

SVN-Revision: 4073
master
Felix Fietkau 19 years ago
parent f59462b0e7
commit 44746a7f68
  1. 6
      openwrt/include/package.mk
  2. 7
      openwrt/package/broadcom-wl/Makefile
  3. 12
      openwrt/scripts/gen_menuconfig.pl

@ -74,6 +74,7 @@ define Package/Default
PRIORITY:=optional PRIORITY:=optional
DEFAULT:= DEFAULT:=
MENU:= MENU:=
SUBMENU:=
TITLE:= TITLE:=
DESCRIPTION:= DESCRIPTION:=
endef endef
@ -124,6 +125,11 @@ define BuildPackage
echo "Menu: $(MENU)"; echo "Menu: $(MENU)";
endif endif
ifneq ($(SUBMENU),)
DUMPINFO += \
echo "Submenu: $(SUBMENU)";
endif
ifneq ($(DEFAULT),) ifneq ($(DEFAULT),)
DUMPINFO += \ DUMPINFO += \
echo "Default: $(DEFAULT)"; echo "Default: $(DEFAULT)";

@ -21,8 +21,8 @@ define Package/kmod-brcm-wl
CATEGORY:=Drivers CATEGORY:=Drivers
DEPENDS:=@LINUX_2_4_BRCM DEPENDS:=@LINUX_2_4_BRCM
DEFAULT:=y DEFAULT:=y
MENU:=1 SUBMENU:=Proprietary BCM43xx WiFi driver
TITLE:=Proprietary BCM43xx WiFi driver TITLE:=Kernel driver (normal version)
DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE) VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
endef endef
@ -30,8 +30,7 @@ endef
define Package/kmod-brcm-wl-mimo define Package/kmod-brcm-wl-mimo
$(call Package/kmod-brcm-wl) $(call Package/kmod-brcm-wl)
DEFAULT:=m if ALL DEFAULT:=m if ALL
MENU:= TITLE:=Kernel driver (MIMO version)
TITLE:=Proprietary BCM43xx WiFi driver (MIMO version)
DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset (MIMO version) DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset (MIMO version)
endef endef

@ -5,6 +5,7 @@ my $src;
my $makefile; my $makefile;
my $pkg; my $pkg;
my %category; my %category;
my $cur_menu;
sub print_category($) { sub print_category($) {
my $cat = shift; my $cat = shift;
@ -15,6 +16,16 @@ sub print_category($) {
my %spkg = %{$category{$cat}}; my %spkg = %{$category{$cat}};
foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) { foreach my $spkg (sort {uc($a) cmp uc($b)} keys %spkg) {
foreach my $pkg (@{$spkg{$spkg}}) { foreach my $pkg (@{$spkg{$spkg}}) {
if ($cur_menu ne $pkg->{submenu}) {
if ($cur_menu) {
print "endmenu\n";
undef $cur_menu;
}
if ($pkg->{submenu}) {
$cur_menu = $pkg->{submenu};
print "menu \"$cur_menu\"\n";
}
}
my $title = $pkg->{name}; my $title = $pkg->{name};
my $c = (72 - length($pkg->{name}) - length($pkg->{title})); my $c = (72 - length($pkg->{name}) - length($pkg->{title}));
if ($c > 0) { if ($c > 0) {
@ -65,6 +76,7 @@ while ($line = <>) {
$line =~ /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1; $line =~ /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
$line =~ /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1; $line =~ /^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;
$line =~ /^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1; $line =~ /^Menu: \s*(.+)\s*$/ and $pkg->{menu} = $1;
$line =~ /^Submenu: \s*(.+)\s*$/ and $pkg->{submenu} = $1;
$line =~ /^Default: \s*(.+)\s*$/ and $pkg->{default} = $1; $line =~ /^Default: \s*(.+)\s*$/ and $pkg->{default} = $1;
$line =~ /^Depends: \s*(.+)\s*$/ and do { $line =~ /^Depends: \s*(.+)\s*$/ and do {
my @dep = split /\s+/, $1; my @dep = split /\s+/, $1;

Loading…
Cancel
Save