merge of '6159b24371b1d635546251f92f5c705343f88b30'

     and 'd6a8fb6a4dc52ff3bda0e3bf30b05a0db05377a1'

10 files changed, 24 insertions, 21 deletions

diff --git a/packages/busybox/busybox-1.2.1/nylon/defconfig b/packages/busybox/busybox-1.2.1/nylon/defconfig
index 4d61408bf8..67c5408ada 100644
--- a/packages/busybox/busybox-1.2.1/nylon/defconfig
+++ b/packages/busybox/busybox-1.2.1/nylon/defconfig
@@ -257,17 +257,17 @@ CONFIG_FEATURE_AWK_MATH=y
 # CONFIG_ED is not set
 CONFIG_PATCH=y
 CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+# CONFIG_VI is not set
+#CONFIG_FEATURE_VI_COLON=y
+#CONFIG_FEATURE_VI_YANKMARK=y
+#CONFIG_FEATURE_VI_SEARCH=y
+#CONFIG_FEATURE_VI_USE_SIGNALS=y
+#CONFIG_FEATURE_VI_DOT_CMD=y
+#CONFIG_FEATURE_VI_READONLY=y
+#CONFIG_FEATURE_VI_SETOPTS=y
+#CONFIG_FEATURE_VI_SET=y
+#CONFIG_FEATURE_VI_WIN_RESIZE=y
+#CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 
 #
 # Finding Utilities
diff --git a/packages/elvis/elvis_2.2.0.bb b/packages/elvis/elvis_2.2.0.bb
index 6f0f19fc39..cd460c3400 100644
--- a/packages/elvis/elvis_2.2.0.bb
+++ b/packages/elvis/elvis_2.2.0.bb
@@ -3,6 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Martin Dietze <herbert@spamcop.net>"
 LICENSE = "Perl Clarified Artistic License"
+DEPENDS = "ncurses"
 
 SRC_URI = "ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz"
 S = "${WORKDIR}/elvis-2.2_0"
diff --git a/packages/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc
index a6e4a6246d..c095777446 100644
--- a/packages/hostap/hostap-daemon.inc
+++ b/packages/hostap/hostap-daemon.inc
@@ -6,8 +6,8 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "hostap-modules hostap-utils (${PV})"
 DEPENDS = "openssl"
-DEPENDS_mtx-1_append = "madwifi-modules"
-DEPENDS_mtx-2_append = "madwifi-modules"
+DEPENDS_append_mtx-1 = " madwifi-modules"
+DEPENDS_append_mtx-2 = " madwifi-modules"
 CPPFLAGS_append_mtx-1 = " -I${STAGING_INCDIR}/madwifi/"
 CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/"
 
diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb
index 4e7711e6c7..bcbcc67c05 100644
--- a/packages/images/nylon-image-base.bb
+++ b/packages/images/nylon-image-base.bb
@@ -11,7 +11,7 @@ NYLON_BASE = "base-files base-passwd bash busybox \
 	timezones tinylogin"
 
 DEPENDS += "virtual/kernel less nano"
-RDEPENDS = "kernel modutils-depmod modutils-modinfo less nano \
+RDEPENDS = "kernel modutils-depmod modutils-modinfo less nano elvis-tiny \
 	${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
 export IPKG_INSTALL = "${RDEPENDS}" 
diff --git a/packages/images/nylon-image-extended.bb b/packages/images/nylon-image-extended.bb
index 09ec4897f6..fc8c20ad30 100644
--- a/packages/images/nylon-image-extended.bb
+++ b/packages/images/nylon-image-extended.bb
@@ -76,7 +76,8 @@ KERNEL_MODULES = " \
 
 DEPENDS += "${NYLON_EXTENDED_DEPENDS}"
 
-RDEPENDS += "${NYLON_EXTENDED_DEPENDS} ${KERNEL_MODULES} ${NYLON_EXTENDED_RDEPENDS}"
+RDEPENDS += "${NYLON_EXTENDED_DEPENDS} ${KERNEL_MODULES} \
+	${NYLON_EXTENDED_RDEPENDS} elvis-tools"
 
 RDEPENDS_append_mtx-1 = "\
     kernel-module-au1x00-bi \
diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb
index c3c98ceca4..0fffbe0ff8 100644
--- a/packages/images/nylon-image-standard.bb
+++ b/packages/images/nylon-image-standard.bb
@@ -25,5 +25,5 @@ NYLON_STANDARD = "\
 DEPENDS += "hostap-modules ntp \
 	${NYLON_STANDARD}"
 	
-RDEPENDS += "hostap-modules-pci ntpdate \
+RDEPENDS += "hostap-modules-pci ntpdate nano elvis-tiny \
 	${NYLON_STANDARD}"
diff --git a/packages/meta/nylon-feed.inc b/packages/meta/nylon-feed.inc
index 216cc0aeb6..1983bb7336 100644
--- a/packages/meta/nylon-feed.inc
+++ b/packages/meta/nylon-feed.inc
@@ -8,6 +8,7 @@ chillispot \
 dash \
 ddclient \
 dnsmasq \
+elvis \
 gdb \
 gnupg \
 hostap-modules \
diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index e4917d310f..8be477bd7b 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -5,7 +5,7 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPLv2"
-SRCDATE = "20060114"
+SRCDATE = "20060923"
 PV = "1.0.0+cvs${SRCDATE}"
 PR = "r2"
 RDEPENDS = "bash"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb
index d125fb4027..a287e00eee 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 MAINTAINER = "Holger Schurig"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "openssl"
-DEPENDS_mtx-1_append = "madwifi-modules"
-DEPENDS_mtx-2_append = "madwifi-modules"
+DEPENDS_append_mtx-1 = " madwifi-modules"
+DEPENDS_append_mtx-2 = " madwifi-modules"
 PR = "r1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
index bbb42879d9..ec7ca146d5 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 MAINTAINER = "Holger Schurig"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "openssl"
-DEPENDS_mtx-1_append = "madwifi-modules"
-DEPENDS_mtx-2_append = "madwifi-modules"
+DEPENDS_append_mtx-1 = " madwifi-modules"
+DEPENDS_append_mtx-2 = " madwifi-modules"
 PR = "r1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \