nylon: updated images and nylon specific packages from 4G trunk

* updated list of supported packages in nylon-feed
* new image nylon-image-extended aiming to put nylon-feed into one image (for debugging)
* new versions of nylon-scripts, nylon-statistics, simple-firewall

4 files changed, 93 insertions, 6 deletions

diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb
index a4f6d17dd8..4e7711e6c7 100644
--- a/packages/images/nylon-image-base.bb
+++ b/packages/images/nylon-image-base.bb
@@ -1,3 +1,6 @@
+inherit image_ipk nylon-image
+LICENSE = MIT
+
 export IMAGE_BASENAME = "nylon-base"
  
 NYLON_BASE = "base-files base-passwd bash busybox \
@@ -7,8 +10,8 @@ NYLON_BASE = "base-files base-passwd bash busybox \
 	openssh sysvinit \
 	timezones tinylogin"
 
-DEPENDS = "virtual/kernel"
-RDEPENDS = "kernel modutils-depmod modutils-modinfo \
+DEPENDS += "virtual/kernel less nano"
+RDEPENDS = "kernel modutils-depmod modutils-modinfo less nano \
 	${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
 export IPKG_INSTALL = "${RDEPENDS}" 
@@ -19,4 +22,3 @@ IMAGE_LINGUAS = ""
 ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*"
 
 inherit image_ipk nylon-image
-LICENSE = MIT
diff --git a/packages/images/nylon-image-extended.bb b/packages/images/nylon-image-extended.bb
new file mode 100644
index 0000000000..09ec4897f6
--- /dev/null
+++ b/packages/images/nylon-image-extended.bb
@@ -0,0 +1,85 @@
+LICENSE = MIT
+require nylon-image-base.bb
+require ../meta/nylon-feed.inc
+
+export IMAGE_BASENAME = "nylon-extended"
+ 
+NYLON_EXTENDED_DEPENDS = "${NYLON_FEED}"
+
+NYLON_EXTENDED_RDEPENDS = "\
+    hostap-modules-cs \
+    hostap-modules-pci \
+    modutils-depmod \
+    modutils-initscripts \
+    modutils-modinfo \
+    ntpdate \
+    ntp-bin \
+    ntp-tickadj \
+    openssh-scp \
+    openssh-ssh \
+    openssh-sshd \
+    perl-misc \
+    perl-module-autoloader \
+    perl-module-base \
+    perl-module-bytes \
+    perl-module-carp \
+    perl-module-config \
+    perl-module-constant \
+    perl-module-data-dumper \
+    perl-module-encode \
+    perl-module-encode-alias \
+    perl-module-encode-config \
+    perl-module-encode-encoding \
+    perl-module-encode-unicode \
+    perl-module-errno \
+    perl-module-exporter \
+    perl-module-exporter-heavy \
+    perl-module-fields \
+    perl-module-getopt-long \
+    perl-module-integer \
+    perl-module-io \
+    perl-module-io-handle \
+    perl-module-io-socket \
+    perl-module-io-socket-inet \
+    perl-module-io-socket-unix \
+    perl-module-locale \
+    perl-module-overload \
+    perl-module-posix \
+    perl-module-selectsaver \
+    perl-module-socket \
+    perl-module-strict \
+    perl-module-symbol \
+    perl-module-sys-hostname \
+    perl-module-vars \
+    perl-module-warnings \
+    perl-module-warnings-register \
+    perl-module-xsloader \
+"
+
+KERNEL_MODULES = " \
+    kernel-module-aes \
+    kernel-module-bridge \
+    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 \
+    kernel-module-usb-ohci \
+    kernel-module-usbnet \
+    kernel-module-usbserial \
+    kernel-module-vfat \
+    kernel-module-yenta-socket \
+"
+
+
+DEPENDS += "${NYLON_EXTENDED_DEPENDS}"
+
+RDEPENDS += "${NYLON_EXTENDED_DEPENDS} ${KERNEL_MODULES} ${NYLON_EXTENDED_RDEPENDS}"
+
+RDEPENDS_append_mtx-1 = "\
+    kernel-module-au1x00-bi \
+    kernel-module-network-fd \
+    kernel-module-usbdcore"
+    kernel-module-usbdprocfs \
diff --git a/packages/images/nylon-image-extra.bb b/packages/images/nylon-image-extra.bb
index 194783af7e..e825b15e69 100644
--- a/packages/images/nylon-image-extra.bb
+++ b/packages/images/nylon-image-extra.bb
@@ -1,3 +1,5 @@
+LICENSE = MIT
+
 require nylon-image-standard.bb
 
 export IMAGE_BASENAME = "nylon-extra"
@@ -7,5 +9,3 @@ RDEPENDS = "\
     netperf \
     nylon-statistics \
     openvpn"
-
-LICENSE = MIT
diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb
index d7acf29142..c3c98ceca4 100644
--- a/packages/images/nylon-image-standard.bb
+++ b/packages/images/nylon-image-standard.bb
@@ -1,3 +1,4 @@
+LICENSE = MIT
 require nylon-image-base.bb
 
 export IMAGE_BASENAME = "nylon-standard"
@@ -26,4 +27,3 @@ DEPENDS += "hostap-modules ntp \
 	
 RDEPENDS += "hostap-modules-pci ntpdate \
 	${NYLON_STANDARD}"
-LICENSE = MIT