From 37e53349f3133d09160984d7d91ed50e8c8b5471 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 16 Apr 2010 10:42:10 +0000
Subject: 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/Config.in        | 39 +++++++++++++++++++++++++++++++++++++++
 package/busybox/Makefile         |  6 +-----
 package/busybox/target-config.in | 33 ---------------------------------
 3 files changed, 40 insertions(+), 38 deletions(-)
 create mode 100644 package/busybox/Config.in
 delete mode 100644 package/busybox/target-config.in

(limited to 'package/busybox')

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
new file mode 100644
index 000000000..1002a5a0d
--- /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 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
diff --git a/package/busybox/target-config.in b/package/busybox/target-config.in
deleted file mode 100644
index b06556134..000000000
--- 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
-
-- 
cgit v1.2.3