diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-06-25 16:05:43 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-06-25 16:05:43 +0000 |
| commit | 5bd73a12052f8e9182ac1f51372cf6d0323f9dad (patch) | |
| tree | 65815db5ef06a70ab2b9f87b8789997b27c4d7ac | |
| parent | d3abc2c9f5dc2d238c17bd8764f780b38cf58491 (diff) | |
move the broadcom driver stuff into its own submenu
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4073 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package.mk | 6 | ||||
| -rw-r--r-- | package/broadcom-wl/Makefile | 7 | ||||
| -rwxr-xr-x | scripts/gen_menuconfig.pl | 12 |
3 files changed, 21 insertions, 4 deletions
diff --git a/include/package.mk b/include/package.mk index cf8756ea63..0996574d26 100644 --- a/include/package.mk +++ b/include/package.mk @@ -74,6 +74,7 @@ define Package/Default PRIORITY:=optional DEFAULT:= MENU:= + SUBMENU:= TITLE:= DESCRIPTION:= endef @@ -124,6 +125,11 @@ define BuildPackage echo "Menu: $(MENU)"; endif + ifneq ($(SUBMENU),) + DUMPINFO += \ + echo "Submenu: $(SUBMENU)"; + endif + ifneq ($(DEFAULT),) DUMPINFO += \ echo "Default: $(DEFAULT)"; diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index 8b68e752f1..79586a3a57 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -21,8 +21,8 @@ define Package/kmod-brcm-wl CATEGORY:=Drivers DEPENDS:=@LINUX_2_4_BRCM DEFAULT:=y - MENU:=1 - TITLE:=Proprietary BCM43xx WiFi driver + SUBMENU:=Proprietary BCM43xx WiFi driver + TITLE:=Kernel driver (normal version) DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE) endef @@ -30,8 +30,7 @@ endef define Package/kmod-brcm-wl-mimo $(call Package/kmod-brcm-wl) DEFAULT:=m if ALL - MENU:= - TITLE:=Proprietary BCM43xx WiFi driver (MIMO version) + TITLE:=Kernel driver (MIMO version) DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset (MIMO version) endef diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl index eff78dcd90..c1510b0d58 100755 --- a/scripts/gen_menuconfig.pl +++ b/scripts/gen_menuconfig.pl @@ -5,6 +5,7 @@ my $src; my $makefile; my $pkg; my %category; +my $cur_menu; sub print_category($) { my $cat = shift; @@ -15,6 +16,16 @@ sub print_category($) { my %spkg = %{$category{$cat}}; foreach my $spkg (sort {uc($a) cmp uc($b)} keys %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 $c = (72 - length($pkg->{name}) - length($pkg->{title})); if ($c > 0) { @@ -65,6 +76,7 @@ while ($line = <>) { $line =~ /^Version: \s*(.+)\s*$/ and $pkg->{version} = $1; $line =~ /^Title: \s*(.+)\s*$/ and $pkg->{title} = $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 =~ /^Depends: \s*(.+)\s*$/ and do { my @dep = split /\s+/, $1; |