diff options
author | Matt Reimer <mattjreimer@gmail.com> | 2006-11-06 18:29:44 +0000 |
---|---|---|
committer | Matt Reimer <mattjreimer@gmail.com> | 2006-11-06 18:29:44 +0000 |
commit | 2b622239c20657486f9e84842fd392f0a03c4598 (patch) | |
tree | 6b0f2058023f53c03ef7a0419eb06af11e8ba47f /packages/images/nylon-image-base.bb | |
parent | 5f7acfb7fa919640d4b9e3a997ff4ddfc5a39569 (diff) | |
parent | e37ddf6842faf9b3421fa4ab688944a20f0bba94 (diff) |
merge of '41daabd524e84d8b355abb1ef7c1d06479c25b7d'
and '749aa1340946e929e3de2422cb6c275ee1ae34ba'
Diffstat (limited to 'packages/images/nylon-image-base.bb')
-rw-r--r-- | packages/images/nylon-image-base.bb | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb index bcbcc67c05..4034590822 100644 --- a/packages/images/nylon-image-base.bb +++ b/packages/images/nylon-image-base.bb @@ -1,24 +1,31 @@ -inherit image_ipk nylon-image +inherit image_ipk +inherit nylon_image LICENSE = MIT export IMAGE_BASENAME = "nylon-base" NYLON_BASE = "base-files base-passwd bash busybox \ ipkg initscripts less \ - modutils modutils-initscripts mtd-utils \ + mtd-utils \ nano ncurses netbase \ openssh sysvinit \ timezones tinylogin" DEPENDS += "virtual/kernel less nano" -RDEPENDS = "kernel modutils-depmod modutils-modinfo less nano elvis-tiny \ +RDEPENDS = "kernel less nano elvis-tiny \ ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" +## kernel 2.4 ## +RDEPENDS_append_mtx-1 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" +RDEPENDS_append_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" +## kernel 2.6 ## +RDEPENDS_append_mtx-3 = " module-init-tools udev" + export IPKG_INSTALL = "${RDEPENDS}" IMAGE_LINGUAS = "" # we dont need the kernel in the image -ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*" +ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/*Image*" +# needed?? the above line is the same as in classes/nylon-image.bbclass -inherit image_ipk nylon-image |