EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clean up menu configuration

Browse Source 
SVN-Revision: 3801
This commit is contained in:
Mike Baker 2006-05-19 22:46:24 +00:00
parent b64d24928b
commit 59c1faa150
5 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openwrt/Config.in
View File

@ -8,23 +8,24 @@ config HAVE_DOT_CONFIG
source "target/Config.in" source "target/Config.in"
config DEVEL config ALL
bool "Select all packages by default"
default n
menuconfig DEVEL
bool "Advanced configuration options (for developers)" bool "Advanced configuration options (for developers)"
default n default n
select BUILDOPTS select BUILDOPTS
select TOOLCHAINOPTS select TOOLCHAINOPTS
config ALL menuconfig BUILDOPTS
bool "Select all packages by default" bool "Build Options" if DEVEL
default n
config WGET config WGET
string string
prompt "WGET command" if BUILDOPTS
default "wget --passive-ftp -nd" default "wget --passive-ftp -nd"
menuconfig BUILDOPTS
bool "Build Options" if DEVEL
config TAR_VERBOSITY config TAR_VERBOSITY
bool bool
prompt "Tar verbose" if BUILDOPTS prompt "Tar verbose" if BUILDOPTS
@ -41,6 +42,3 @@ source "toolchain/Config.in"
source "target/linux/Config.in" source "target/linux/Config.in"
source ".config.in" source ".config.in"
menu "busybox"
source "package/busybox/config/Config.in"
endmenu

2
openwrt/Makefile
View File

@ -45,7 +45,7 @@ ifeq ($(shell ./scripts/timestamp.pl -p .pkginfo package),package)
@echo Collecting package info... @echo Collecting package info...
@-for makefile in package/*/Makefile; do \ @-for makefile in package/*/Makefile; do \
echo Source-Makefile: $$makefile; \ echo Source-Makefile: $$makefile; \
$(MAKE) DUMP=1 -f $$makefile 2>&- || true; \ $(MAKE) --no-print-dir DUMP=1 -f $$makefile 2>&- || true; \
done > $@ done > $@
endif endif

6
openwrt/package/busybox/Makefile
View File

@ -15,14 +15,18 @@ PKG_CAT:=bzcat
include $(TOPDIR)/package/rules.mk include $(TOPDIR)/package/rules.mk
define Package/busybox define Package/busybox
CONFIGFILE:=config/Config.in
SECTION:=base SECTION:=base
CATEGORY:=Base system CATEGORY:=Base system
MENU:=1
DEFAULT:=y DEFAULT:=y
TITLE:=Core utilities for embedded Linux TITLE:=Core utilities for embedded Linux
DESCRIPTION:=The Swiss Army Knife of embedded Linux. \\\ DESCRIPTION:=The Swiss Army Knife of embedded Linux. \\\
It slices, it dices, it makes Julian Fries. It slices, it dices, it makes Julian Fries.
URL:=http://busybox.net/ URL:=http://busybox.net/
CONFIG:=menu "Configuration" \\\
depends on PACKAGE_busybox \\\
source "package/busybox/config/Config.in" \\\
endmenu
endef endef
define Build/Configure define Build/Configure

8
openwrt/package/rules.mk
View File

@ -116,6 +116,12 @@ define BuildPackage
DUMPINFO += \ DUMPINFO += \
echo "@@"; echo "@@";
ifneq ($(CONFIG),)
DUMPINFO += \
echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \
echo "@@";
endif
$$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
mkdir -p $$(IDIR_$(1))/CONTROL mkdir -p $$(IDIR_$(1))/CONTROL
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
@ -222,7 +228,7 @@ endef
ifneq ($(DUMP),) ifneq ($(DUMP),)
dumpinfo: FORCE dumpinfo: FORCE
$(DUMPINFO) @$(DUMPINFO)
else else
$(PACKAGE_DIR): $(PACKAGE_DIR):

13
openwrt/scripts/gen_menuconfig.pl
View File

@ -30,7 +30,9 @@ sub print_category($) {
} }
print "\t\thelp\n"; print "\t\thelp\n";
print $pkg->{description}; print $pkg->{description};
print "\n" print "\n";
$pkg->{config} and print $pkg->{config}."\n";
} }
} }
print "endmenu\n\n"; print "endmenu\n\n";
@ -75,6 +77,15 @@ while ($line = <>) {
$desc .= "\t\t$line"; $desc .= "\t\t$line";
} }
$pkg->{description} = $desc; $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;
} }
} }