From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 16 Apr 2010 10:42:10 +0000 (+0000)
Subject: package/busybox: rename 'target-config.in' to 'Config.in' for coherency, move submenu... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5611e4d94d1793afc6e1282f0bc43c75b8f4d5dd;p=openwrt%2Fstaging%2Fluka.git

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
---

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
new file mode 100644
index 0000000000..1002a5a0d6
--- /dev/null
+++ b/package/busybox/Config.in
@@ -0,0 +1,39 @@
+menu "Configuration"
+	depends on PACKAGE_busybox
+
+config BUSYBOX_CONFIG_FEATURE_DEVFS
+	bool
+	default y if LINUX_2_4
+	default n if LINUX_2_6
+
+config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
+	bool
+	default y if LINUX_2_4
+	default n if LINUX_2_6
+
+config BUSYBOX_CONFIG_FEATURE_2_6_MODULES
+	bool
+	default n if LINUX_2_4
+	default y if LINUX_2_6
+
+config BUSYBOX_CONFIG_NOMMU
+	bool
+	depends NOMMU
+	default y if NOMMU
+	deselect BUSYBOX_CONFIG_ASH
+	deselect BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
+	deselect BUSYBOX_CONFIG_LOCK
+
+config CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
+	bool
+	default y if NOMMU
+	default n if !NOMMU
+
+config BUSYBOX_CONFIG_HUSH
+	bool
+	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
diff --git a/package/busybox/target-config.in b/package/busybox/target-config.in
deleted file mode 100644
index b06556134e..0000000000
--- a/package/busybox/target-config.in
+++ /dev/null
@@ -1,33 +0,0 @@
-config BUSYBOX_CONFIG_FEATURE_DEVFS
-	bool
-	default y if LINUX_2_4
-	default n if LINUX_2_6
-
-config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
-	bool
-	default y if LINUX_2_4
-	default n if LINUX_2_6
-
-config BUSYBOX_CONFIG_FEATURE_2_6_MODULES
-	bool
-	default n if LINUX_2_4
-	default y if LINUX_2_6
-
-config BUSYBOX_CONFIG_NOMMU
-	bool
-	depends NOMMU
-	default y if NOMMU
-	deselect BUSYBOX_CONFIG_ASH
-	deselect BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
-	deselect BUSYBOX_CONFIG_LOCK
-
-config CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
-	bool
-	default y if NOMMU
-	default n if !NOMMU
-
-config BUSYBOX_CONFIG_HUSH
-	bool
-	default y if NOMMU
-	default n if !NOMMU
-