diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-05-19 22:46:24 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-05-19 22:46:24 +0000 |
| commit | 93e50b06ca295bc34326f6221b48ff5e94ccaa12 (patch) | |
| tree | 46f55bf4c2d3e1cfeb45070ddf91640bdacd87d7 | |
| parent | 95bdcf394e439d688a5290a26a15e0bc31144f91 (diff) | |
clean up menu configuration
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3801 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | Config.in | 18 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | package/busybox/Makefile | 6 | ||||
| -rw-r--r-- | package/rules.mk | 8 | ||||
| -rwxr-xr-x | scripts/gen_menuconfig.pl | 13 |
5 files changed, 33 insertions, 14 deletions
@@ -8,23 +8,24 @@ config HAVE_DOT_CONFIG source "target/Config.in" -config DEVEL +config ALL + bool "Select all packages by default" + default n + +menuconfig DEVEL bool "Advanced configuration options (for developers)" default n select BUILDOPTS select TOOLCHAINOPTS -config ALL - bool "Select all packages by default" - default n +menuconfig BUILDOPTS + bool "Build Options" if DEVEL config WGET string + prompt "WGET command" if BUILDOPTS default "wget --passive-ftp -nd" -menuconfig BUILDOPTS - bool "Build Options" if DEVEL - config TAR_VERBOSITY bool prompt "Tar verbose" if BUILDOPTS @@ -41,6 +42,3 @@ source "toolchain/Config.in" source "target/linux/Config.in" source ".config.in" -menu "busybox" -source "package/busybox/config/Config.in" -endmenu @@ -45,7 +45,7 @@ ifeq ($(shell ./scripts/timestamp.pl -p .pkginfo package),package) @echo Collecting package info... @-for makefile in package/*/Makefile; do \ echo Source-Makefile: $$makefile; \ - $(MAKE) DUMP=1 -f $$makefile 2>&- || true; \ + $(MAKE) --no-print-dir DUMP=1 -f $$makefile 2>&- || true; \ done > $@ endif diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 23dcc1cf8..ff23ee7dd 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -15,14 +15,18 @@ PKG_CAT:=bzcat include $(TOPDIR)/package/rules.mk define Package/busybox -CONFIGFILE:=config/Config.in SECTION:=base CATEGORY:=Base system +MENU:=1 DEFAULT:=y TITLE:=Core utilities for embedded Linux DESCRIPTION:=The Swiss Army Knife of embedded Linux. \\\ It slices, it dices, it makes Julian Fries. URL:=http://busybox.net/ +CONFIG:=menu "Configuration" \\\ + depends on PACKAGE_busybox \\\ +source "package/busybox/config/Config.in" \\\ +endmenu endef define Build/Configure diff --git a/package/rules.mk b/package/rules.mk index e8417c3a5..99e4a846a 100644 --- a/package/rules.mk +++ b/package/rules.mk @@ -116,6 +116,12 @@ define BuildPackage DUMPINFO += \ echo "@@"; + ifneq ($(CONFIG),) + DUMPINFO += \ + echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \ + echo "@@"; + endif + $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared mkdir -p $$(IDIR_$(1))/CONTROL echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control @@ -222,7 +228,7 @@ endef ifneq ($(DUMP),) dumpinfo: FORCE - $(DUMPINFO) + @$(DUMPINFO) else $(PACKAGE_DIR): diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl index 3f4476a2c..e282ee3ed 100755 --- a/scripts/gen_menuconfig.pl +++ b/scripts/gen_menuconfig.pl @@ -30,7 +30,9 @@ sub print_category($) { } print "\t\thelp\n"; print $pkg->{description}; - print "\n" + print "\n"; + + $pkg->{config} and print $pkg->{config}."\n"; } } print "endmenu\n\n"; @@ -75,6 +77,15 @@ while ($line = <>) { $desc .= "\t\t$line"; } $pkg->{description} = $desc; + }; + $line =~ /^Config: \s*(.*)\s*$/ and do { + my $conf = "$1\n"; + my $line; + while ($line = <>) { + last if $line =~ /^@@/; + $conf .= "$line"; + } + $pkg->{config} = $conf; } } |