nylon images and feed: use elvis-tiny as standard editor instead of busybox-vi.

diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb
index 4e7711e..bcbcc67 100644 (file)
--- 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 09ec489..fc8c20a 100644 (file)
--- 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 c3c98ce..0fffbe0 100644 (file)
--- 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 216cc0a..1983bb7 100644 (file)
--- 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 \