aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-04-16 10:42:10 +0000
committerNicolas Thill <nico@openwrt.org>2010-04-16 10:42:10 +0000
commit5611e4d94d1793afc6e1282f0bc43c75b8f4d5dd (patch)
treeabb55ed898a02ae71d89c5b237c50348aaa08677 /package
parent01ff61d12766ac8d10922aa7c7fe14b7f1cba4b0 (diff)
downloadupstream-5611e4d94d1793afc6e1282f0bc43c75b8f4d5dd.tar.gz
upstream-5611e4d94d1793afc6e1282f0bc43c75b8f4d5dd.tar.bz2
upstream-5611e4d94d1793afc6e1282f0bc43c75b8f4d5dd.zip
package/busybox: rename 'target-config.in' to 'Config.in' for coherency, move submenu to it and source main busybox Config.in from there
SVN-Revision: 20912
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Config.in (renamed from package/busybox/target-config.in)6
-rw-r--r--package/busybox/Makefile6
2 files changed, 7 insertions, 5 deletions
diff --git a/package/busybox/target-config.in b/package/busybox/Config.in
index b06556134e..1002a5a0d6 100644
--- a/package/busybox/target-config.in
+++ b/package/busybox/Config.in
@@ -1,3 +1,6 @@
+menu "Configuration"
+ depends on PACKAGE_busybox
+
config BUSYBOX_CONFIG_FEATURE_DEVFS
bool
default y if LINUX_2_4
@@ -31,3 +34,6 @@ config BUSYBOX_CONFIG_HUSH
default y if NOMMU
default n if !NOMMU
+source "package/busybox/config/Config.in"
+
+endmenu
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 9638e9c5f2..d13980ceb0 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -42,11 +42,7 @@ define Package/busybox/description
endef
define Package/busybox/config
- menu "Configuration"
- depends on PACKAGE_busybox
- source "$(SOURCE)/target-config.in"
- source "$(SOURCE)/config/Config.in"
- endmenu
+ source "$(SOURCE)/Config.in"
endef
define Build/Configure