diff options
| -rw-r--r-- | packages/images/nylon-image-base.bb | 13 | ||||
| -rw-r--r-- | packages/images/nylon-image-standard.bb | 16 |
2 files changed, 11 insertions, 18 deletions
diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb index 120cff5822..2c45d40bb6 100644 --- a/packages/images/nylon-image-base.bb +++ b/packages/images/nylon-image-base.bb @@ -1,15 +1,15 @@ -inherit image -inherit nylon-image -LICENSE = "MIT" +inherit image_ipk +inherit nylon_image +LICENSE = MIT export IMAGE_BASENAME = "nylon-base" - + NYLON_BASE = "base-files base-passwd bash busybox \ ipkg initscripts less \ mtd-utils \ nano ncurses netbase \ openssh sysvinit \ - timezones tinylogin" + timezones tinylogin udev" DEPENDS += "virtual/kernel less nano" RDEPENDS = "kernel less nano elvis-tiny \ @@ -20,8 +20,9 @@ RDEPENDS_append_mtx-1 = " modutils modutils-initscripts modutils-depmod modutils RDEPENDS_append_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" -export PACKAGE_INSTALL = "${RDEPENDS}" +export IPKG_INSTALL = "${RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb index 29e29cd1eb..ca5f987dfe 100644 --- a/packages/images/nylon-image-standard.bb +++ b/packages/images/nylon-image-standard.bb @@ -3,26 +3,18 @@ require nylon-image-base.bb export IMAGE_BASENAME = "nylon-standard" NYLON_STANDARD = "\ - bridge-utils \ - dnsmasq \ hostap-utils \ - hostap-daemon \ linux-hotplug \ - ifplugd iproute2 iptables \ - madwifi-modules \ - nylon-scripts \ + ifplugd \ olsrd \ - ppp pciutils \ + ppp \ rp-pppoe \ shorewall \ tcpdump \ - usbutils \ - wireless-tools \ - wpa-supplicant \ - yamonenv" + wpa-supplicant" DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" -RDEPENDS += "hostap-modules-pci ntpdate nano elvis-tiny \ +RDEPENDS += "hostap-modules-pci ntpdate less nano elvis-tiny \ ${NYLON_STANDARD}" |