diff options
| author |   Martin Dietze <di@fh-wedel.de> | 2009-05-20 00:36:25 +0200 |
|---|---|---|
| committer |   Koen Kooi <koen@openembedded.org> | 2009-05-20 10:16:06 +0200 |
| commit | cb70efeb71b3a1e5e8786d3488e4ec3a1580d45a (patch) | |
| tree | 107d51ea437c6dea9543b984cdec70f3b6f34245 /recipes/images | |
| parent | 24db351c88feaa1b7ef23dd20a95d2ce78fb5bd4 (diff) | |
| download | openembedded-cb70efeb71b3a1e5e8786d3488e4ec3a1580d45a.tar.gz | |
various nylon stuff: Updates to nylon-only code, needed to work with the current OE.
Diffstat (limited to 'recipes/images')
| -rw-r--r-- | recipes/images/nylon-image-base.bb | 27 | ||||
| -rw-r--r-- | recipes/images/nylon-image-extended.bb | 1 | ||||
| -rw-r--r-- | recipes/images/nylon-image-standard.bb | 12 |
3 files changed, 28 insertions, 12 deletions
diff --git a/recipes/images/nylon-image-base.bb b/recipes/images/nylon-image-base.bb index 27dc165800..416be1fae5 100644 --- a/recipes/images/nylon-image-base.bb +++ b/recipes/images/nylon-image-base.bb @@ -1,25 +1,36 @@ inherit image inherit nylon-image +IMAGE_FSTYPES = "jffs2 tar.gz" + export IMAGE_BASENAME = "nylon-base" NYLON_BASE = "base-files base-passwd bash busybox \ ipkg initscripts less \ + madwifi-modules \ mtd-utils \ + nylon-scripts \ nano ncurses netbase \ - openssh sysvinit \ - tzdata tinylogin udev" + openssh \ + pciutils \ + sysvinit \ + tinylogin \ + tzdata \ + wireless-tools wlan-ng-utils" DEPENDS += "virtual/kernel less nano" -IMAGE_INSTALL = "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" +NYLON_IMAGE_RDEPENDS_mtx-1 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" +NYLON_IMAGE_RDEPENDS_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" ## kernel 2.6 ## -RDEPENDS_append_mtx-3 = " module-init-tools udev" -RDEPENDS_append_mtx-3a = " module-init-tools" +NYLON_IMAGE_RDEPENDS_mtx-3 = " module-init-tools udev" +NYLON_IMAGE_RDEPENDS_mtx-3a = " module-init-tools" + +RDEPENDS_append = ${NYLON_IMAGE_RDEPENDS} + +IMAGE_INSTALL = "kernel less nano elvis-tiny \ + ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS} ${NYLON_IMAGE_RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/recipes/images/nylon-image-extended.bb b/recipes/images/nylon-image-extended.bb index 7a4e5b6c88..4fb324d52f 100644 --- a/recipes/images/nylon-image-extended.bb +++ b/recipes/images/nylon-image-extended.bb @@ -61,7 +61,6 @@ KERNEL_MODULES = " \ kernel-module-ds \ kernel-module-fat \ kernel-module-mii \ - kernel-module-pcmcia-core \ kernel-module-scsi-mod \ kernel-module-sd-mod \ kernel-module-usb-storage \ diff --git a/recipes/images/nylon-image-standard.bb b/recipes/images/nylon-image-standard.bb index 5f79402c99..9238b0f8b2 100644 --- a/recipes/images/nylon-image-standard.bb +++ b/recipes/images/nylon-image-standard.bb @@ -3,15 +3,21 @@ require nylon-image-base.bb export IMAGE_BASENAME = "nylon-standard" NYLON_STANDARD = "\ - hostap-utils \ + dash \ + dnsmasq \ + hostap-daemon hostap-utils \ linux-hotplug \ ifplugd \ + iproute2 \ + madwifi-modules \ + nylon-config \ olsrd \ ppp \ rp-pppoe \ - shorewall \ + simple-firewall \ tcpdump \ - wpa-supplicant" + wpa-supplicant \ + yamonenv" DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" |