From 37e53349f3133d09160984d7d91ed50e8c8b5471 Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 16 Apr 2010 10:42:10 +0000 Subject: [PATCH] package/busybox: rename 'target-config.in' to 'Config.in' for coherency, move submenu to it and source main busybox Config.in from there git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20912 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/busybox/{target-config.in => Config.in} | 6 ++++++ package/busybox/Makefile | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) rename package/busybox/{target-config.in => Config.in} (86%) diff --git a/package/busybox/target-config.in b/package/busybox/Config.in similarity index 86% rename from package/busybox/target-config.in rename to package/busybox/Config.in index b06556134..1002a5a0d 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 9638e9c5f..d13980ceb 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