From 47d8546a56ecc27f248480ddbc3d6f17da6e9d39 Mon Sep 17 00:00:00 2001
From: Martin Dietze <di@fh-wedel.de>
Date: Mon, 25 Sep 2006 12:40:48 +0000
Subject: nylon images and feed: use elvis-tiny as standard editor instead of
 busybox-vi.

---
 packages/images/nylon-image-base.bb     | 2 +-
 packages/images/nylon-image-extended.bb | 3 ++-
 packages/images/nylon-image-standard.bb | 2 +-
 packages/meta/nylon-feed.inc            | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

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 \
-- 
cgit v1.2.3