From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 26 Mar 2006 22:27:05 +0000 (+0000)
Subject: fix typo, add a warning when both ipkg versions are selected for install until we... 
X-Git-Tag: whiterussian_rc6~307
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=7d67de90d907bb40011cd3bc10db523982a69135;p=openwrt%2Fsvn-archive%2Fopenwrt.git

fix typo, add a warning when both ipkg versions are selected for install until we find a better way to do it

SVN-Revision: 3501
---

diff --git a/openwrt/package/ipkg/Config.in b/openwrt/package/ipkg/Config.in
index 90c512b4a5..a1fdce4907 100644
--- a/openwrt/package/ipkg/Config.in
+++ b/openwrt/package/ipkg/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_IPKG
 	tristate
 	default n
-	depends BR2_PACKAGE_IPKG_C || BR2_PACKAGE_IPKG_SHELL
+	depends BR2_PACKAGE_IPKG_C || BR2_PACKAGE_IPKG_SH
 
 config BR2_PACKAGE_IPKG_C
 	tristate "ipkg - itsy package management system"
@@ -21,7 +21,7 @@ config BR2_PACKAGE_IPKG_C
 	 up much less space).
 	 
 config BR2_PACKAGE_IPKG_SH
-	tristate "ipkg - itsy package management system (shell version)"
+	tristate "ipkg-sh - itsy package management system (shell version)"
 	default m if CONFIG_DEVEL
 	default m if BR2_PACKAGE_IMAGEBUILDER
 	select BR2_PACKAGE_IPKG
@@ -38,3 +38,6 @@ config BR2_PACKAGE_IPKG_SH
 	 Familiar that dpkg and apt serve for Debian, (while taking
 	 up much less space).
 
+if (BR2_PACKAGE_IPKG_C = y) && (BR2_PACKAGE_IPKG_SH = y)
+	comment "WARNING: both ipkg and ipkg-sh are selected for installation !"
+endif