diff options
author | Martin Dietze <di@fh-wedel.de> | 2006-09-08 12:52:43 +0000 |
---|---|---|
committer | Martin Dietze <di@fh-wedel.de> | 2006-09-08 12:52:43 +0000 |
commit | 30596c3e0a0216faaaa5b1ffaa4bd0e2c816eb21 (patch) | |
tree | 41173d7708d23aba6ffb9ba20a8ffc6b40146d99 | |
parent | abf168554971b3e714dd2ee2bbebf18ab91121e9 (diff) |
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
-rw-r--r-- | packages/images/nylon-image-base.bb | 8 | ||||
-rw-r--r-- | packages/images/nylon-image-extended.bb | 85 | ||||
-rw-r--r-- | packages/images/nylon-image-extra.bb | 4 | ||||
-rw-r--r-- | packages/images/nylon-image-standard.bb | 2 | ||||
-rw-r--r-- | packages/meta/nylon-feed.bb | 128 | ||||
-rw-r--r-- | packages/meta/nylon-feed.inc | 68 | ||||
-rw-r--r-- | packages/nylon/nylon-scripts_cvs.bb | 14 | ||||
-rw-r--r-- | packages/nylon/nylon-statistics.bb | 7 | ||||
-rw-r--r-- | packages/nylon/simple-firewall.bb | 5 | ||||
-rw-r--r-- | packages/nylon/yamonenv.bb | 3 |
10 files changed, 214 insertions, 110 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 diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb index f5b803f58e..40faab8056 100644 --- a/packages/meta/nylon-feed.bb +++ b/packages/meta/nylon-feed.bb @@ -1,99 +1,43 @@ -DEPENDS = " \ -base-files \ -bash \ -bridge-utils \ -busybox \ -chillispot \ -dash \ -db3 \ -ddclient \ -dhcp-forwarder \ -dhcp \ -dnsmasq \ -expat \ -gdb \ -glib-2.0 \ -glibc \ -gmp \ -gnupg \ -hostap-modules \ -hostap-utils \ -hostap-daemon \ -linux-hotplug \ -htb-init \ -ifplugd \ -initscripts \ -iperf \ -ipkg \ -iproute2 \ -iptables \ -virtual/kernel \ -kismet \ -less \ -libcgicc \ -libmail-sendmail-perl \ -libnetserver-generic-perl \ -libpcap \ -lsof \ -lzo \ -madwifi-modules \ -maradns \ -mc \ -mobilemesh \ -modutils \ -mtd-utils \ -mtr \ -nano \ -ncurses \ -netbase \ -netperf \ -net-snmp \ -ntp \ -nylon-scripts \ -nylon-statistics \ -olsrd \ -openssh \ -openssl \ -openvpn \ -openswan \ -pciutils \ -pcre \ -perl \ -pmacct \ -ppp \ -ppp-dsl \ -rp-pppoe \ -rrdtool \ -prism2-firmware-update \ -prism54-module \ -prism54-firmware \ -shorewall \ -stunnel \ -sysvinit \ -tcpdump \ -tinc \ -timezones \ -usbutils \ -vtun \ -wireless-tools \ -wlan-ng-modules \ -yamonenv \ -zlib \ -" +LICENSE = MIT -# TODO: -# ksymoops / binutils -# strace: SYS_read? -# gdb-cross: install paths, sdk? -# screen: sgttyb? -# nocat? -# pptp -# meshroaming +include nylon-feed.inc +DEPENDS = "${NYLON_FEED} \ + db3 \ + dhcp \ + dhcp-forwarder \ + expat \ + glib-2.0 \ + glibc \ + gmp \ + hotplug \ + iproute2 \ + libcgicc \ + libedit \ + libmail-sendmail-perl \ + libnetserver-generic-perl \ + lzo \ + make \ + mystun-server \ + mc \ + net-snmp \ + ntp \ + openssl \ + openswan \ + openvpn \ + pcre \ + ppp-dsl \ + rp-pppoe \ + simple-firewall \ + thttpd \ + vsftpd \ + wget \ + wlan-ng-modules \ + zlib \ +" do_index() { - ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} + ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} } addtask index before do_build after do_install -LICENSE = MIT diff --git a/packages/meta/nylon-feed.inc b/packages/meta/nylon-feed.inc new file mode 100644 index 0000000000..f2e55dc3a6 --- /dev/null +++ b/packages/meta/nylon-feed.inc @@ -0,0 +1,68 @@ +NYLON_FEED = " \ +base-files \ +bash \ +binutils \ +bridge-utils \ +busybox \ +chillispot \ +dash \ +ddclient \ +dnsmasq \ +gdb \ +gnupg \ +hostap-modules \ +hostap-utils \ +hostap-daemon \ +hotplug-ng \ +htb-init \ +ifplugd \ +initscripts \ +iperf \ +ipkg \ +iptables \ +kismet \ +ksymoops \ +less \ +lsof \ +madwifi-modules \ +maradns \ +minicom \ +mobilemesh \ +modutils \ +mtd-utils \ +mtr \ +nano \ +ncurses \ +netbase \ +netperf \ +nylon-scripts \ +nylon-statistics \ +olsrd \ +openssh \ +pciutils \ +pcmcia-cs \ +perl \ +pmacct \ +ppp \ +pptp-linux \ +rrdtool \ +ser \ +shorewall \ +stunnel \ +sysvinit \ +tcl \ +tcpdump \ +tinc \ +timezones \ +usbutils \ +vtun \ +wireless-tools \ +wpa-supplicant \ +yamonenv \ +" + +# TODO: +# strace: SYS_read? +# gdb-cross: install paths, sdk? +# screen: sgttyb? + diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb index b7ce512e87..e4917d310f 100644 --- a/packages/nylon/nylon-scripts_cvs.bb +++ b/packages/nylon/nylon-scripts_cvs.bb @@ -5,14 +5,17 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPLv2" -PV = "1:0.0+cvs${SRCDATE}" +SRCDATE = "20060114" +PV = "1.0.0+cvs${SRCDATE}" PR = "r2" +RDEPENDS = "bash" SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" S = "${WORKDIR}/${PN}" INHIBIT_PACKAGE_STRIP = "1" do_install() { + install -d -m 755 ${D} (cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf - } @@ -21,8 +24,8 @@ if test "x$D" != "x"; then exit 1 else update-rc.d -s hostap defaults 14 - update-rc.d -s firewall defaults 20 - update-rc.d -s routing defaults 20 + update-rc.d -s firewall defaults 16 + update-rc.d -s routing defaults 17 update-rc.d -s emergency-ip defaults 98 update-rc.d -s flash-backup start 38 S . stop 38 0 6 . update-rc.d -s dummydate start 50 S . stop 50 0 6 . @@ -46,8 +49,6 @@ fi pkg_postrm() { #!/bin/sh -e update-rc.d hostap remove -update-rc.d bridge remove -update-rc.d ipaliases remove update-rc.d firewall remove update-rc.d routing remove update-rc.d emergency-ip remove @@ -55,4 +56,5 @@ update-rc.d flash-backup remove update-rc.d dummydate remove } -CONFFILES_${PN} = "/etc/nylon/backup.list /etc/nylon/hostap.conf /etc/nylon/interfaces.conf /etc/nylon/route.list" +CONFFILES_${PN} = "/etc/nylon/backup.list /etc/nylon/hostap.conf /etc/nylon/check-process.list \ + /etc/nylon/interfaces.conf /etc/nylon/route.list /etc/nylon/wds-bridge.conf" diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb index e24d9c93e8..21c588e78a 100644 --- a/packages/nylon/nylon-statistics.bb +++ b/packages/nylon/nylon-statistics.bb @@ -4,7 +4,8 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPLv2" -PV = "1:0.0+cvs${SRCDATE}" +SRCDATE = "20050909" +PV = "1.0.0+cvs${SRCDATE}" PR = "r1" SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" @@ -13,11 +14,11 @@ INHIBIT_PACKAGE_STRIP = "1" do_install() { install -d ${D}/srv/www/cgi-bin - install -d ${D}${sbindir} + install -d ${D}/${sbindir} ln -s /var/tmp ${D}/srv/www/rrd-img install -m 755 ${S}/*.html ${D}/srv/www/cgi-bin ln -s /var/tmp/nav.inc.html ${D}/srv/www/cgi-bin - install -m 755 ${S}/collect.sh ${D}${sbindir} + install -m 755 ${S}/collect.sh ${D}/${sbindir} } pkg_postinst() { diff --git a/packages/nylon/simple-firewall.bb b/packages/nylon/simple-firewall.bb index 5698eb732a..35911dad2c 100644 --- a/packages/nylon/simple-firewall.bb +++ b/packages/nylon/simple-firewall.bb @@ -4,8 +4,9 @@ PRIORITY = "optional" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" DEPENDS = "virtual/kernel" -SRCDATE = "20060114" -PV = "cvs${SRCDATE}" +SRCDATE = "20060810" +PV = "cvs${CVSDATE}" + INHIBIT_PACKAGE_STRIP = "1" diff --git a/packages/nylon/yamonenv.bb b/packages/nylon/yamonenv.bb index bf4c94200e..2c2fb3cbb7 100644 --- a/packages/nylon/yamonenv.bb +++ b/packages/nylon/yamonenv.bb @@ -3,7 +3,8 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Michael Stickel <michael.stickel@4g-systems.biz>" LICENSE = "GPL" -PV = "1:0.0+cvs${SRCDATE}" +SRCDATE = "20050909" +PV = "1.0.0+cvs${SRCDATE}" SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" S = "${WORKDIR}/${PN}" |