aboutsummaryrefslogtreecommitdiffstats
path: root/packages/images
diff options
context:
space:
mode:
authorMartin Dietze <di@fh-wedel.de>2006-09-25 12:44:18 +0000
committerMartin Dietze <di@fh-wedel.de>2006-09-25 12:44:18 +0000
commitacb686820241239fa43f43f2f5f64a799acb592c (patch)
tree5eb115f344ec863d1d9e60597c4d4236ebcb32f8 /packages/images
parentd4c0cdb0f3c6a89c1f24efc582221339ecfd3b59 (diff)
parentd2bb3d2a055ed2826468187b7373f981a6c10f97 (diff)
downloadopenembedded-acb686820241239fa43f43f2f5f64a799acb592c.tar.gz
merge of '6159b24371b1d635546251f92f5c705343f88b30'
and 'd6a8fb6a4dc52ff3bda0e3bf30b05a0db05377a1'
Diffstat (limited to 'packages/images')
-rw-r--r--packages/images/nylon-image-base.bb2
-rw-r--r--packages/images/nylon-image-extended.bb3
-rw-r--r--packages/images/nylon-image-standard.bb2
3 files changed, 4 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}"