[oe-commits] org.oe.dev nylon: updated images and nylon specific packages from 4G trunk
MartinDietze commit
openembedded-commits at lists.openembedded.org
Fri Sep 8 12:57:30 UTC 2006
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
Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: 59f5686356b4aa084ebf13254091b40864f7d4fd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=59f5686356b4aa084ebf13254091b40864f7d4fd
Files:
1
packages/images/nylon-image-extended.bb
packages/meta/nylon-feed.inc
packages/images/nylon-image-base.bb
packages/images/nylon-image-extra.bb
packages/images/nylon-image-standard.bb
packages/meta/nylon-feed.bb
packages/nylon/nylon-scripts_cvs.bb
packages/nylon/nylon-statistics.bb
packages/nylon/simple-firewall.bb
packages/nylon/yamonenv.bb
Diffs:
#
# mt diff -rc4d132486d8bee0c17d795c19e6ec966735cf81a -r59f5686356b4aa084ebf13254091b40864f7d4fd
#
#
#
# add_file "packages/images/nylon-image-extended.bb"
# content [06b79ef9ca4570aad0aa381bc53178860e6651d3]
#
# add_file "packages/meta/nylon-feed.inc"
# content [a617e819878ca92ebd655f16e5a75b66efe1587c]
#
# patch "packages/images/nylon-image-base.bb"
# from [71e039cb8167bd32affd14b7abc4e9e4af18e863]
# to [0701c6f1b09bb5f4f6d6ec9ed71d9211e13f6bf7]
#
# patch "packages/images/nylon-image-extra.bb"
# from [5dc2e80496873485a8a99dc6adc430a91ad811f9]
# to [085df5cc0e7605b415d78806a19a81830e159a26]
#
# patch "packages/images/nylon-image-standard.bb"
# from [75a6887281e485dcd621c0b769e345a20ccc1dff]
# to [7a79e0218978d1962e7009fa43d6322d45bb52ae]
#
# patch "packages/meta/nylon-feed.bb"
# from [120fafa3056f0a4dc254cbc8a43d8050497fd597]
# to [bc87d4ca45742719e73c249a26837a8fde33c43d]
#
# patch "packages/nylon/nylon-scripts_cvs.bb"
# from [fe1737e87a8ea21c3905e9230726bd8403ec128b]
# to [887324466f26f6e97099f44669602fa8768ba812]
#
# patch "packages/nylon/nylon-statistics.bb"
# from [2fcf1b3e18ff96c27f33ebbb9205b312fe77ce92]
# to [8a2a497fa7db77e6e22e63df132e4c911a752c03]
#
# patch "packages/nylon/simple-firewall.bb"
# from [1d92b46ff50aa72c25ec3485eaba750a66a804d6]
# to [a90ddc83e7c3a19a981542f010f31ea4d60f51f6]
#
# patch "packages/nylon/yamonenv.bb"
# from [7a2ccad387731b529a4ab507c043162d9802a0f6]
# to [10d14b9388576364e48ba23d7bfbd238305ef9e5]
#
============================================================
--- packages/images/nylon-image-extended.bb 06b79ef9ca4570aad0aa381bc53178860e6651d3
+++ packages/images/nylon-image-extended.bb 06b79ef9ca4570aad0aa381bc53178860e6651d3
@@ -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 \
============================================================
--- packages/meta/nylon-feed.inc a617e819878ca92ebd655f16e5a75b66efe1587c
+++ packages/meta/nylon-feed.inc a617e819878ca92ebd655f16e5a75b66efe1587c
@@ -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?
+
============================================================
--- packages/images/nylon-image-base.bb 71e039cb8167bd32affd14b7abc4e9e4af18e863
+++ packages/images/nylon-image-base.bb 0701c6f1b09bb5f4f6d6ec9ed71d9211e13f6bf7
@@ -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 bas
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 @@ inherit image_ipk nylon-image
ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*"
inherit image_ipk nylon-image
-LICENSE = MIT
============================================================
--- packages/images/nylon-image-extra.bb 5dc2e80496873485a8a99dc6adc430a91ad811f9
+++ packages/images/nylon-image-extra.bb 085df5cc0e7605b415d78806a19a81830e159a26
@@ -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
============================================================
--- packages/images/nylon-image-standard.bb 75a6887281e485dcd621c0b769e345a20ccc1dff
+++ packages/images/nylon-image-standard.bb 7a79e0218978d1962e7009fa43d6322d45bb52ae
@@ -1,3 +1,4 @@
+LICENSE = MIT
require nylon-image-base.bb
export IMAGE_BASENAME = "nylon-standard"
@@ -26,4 +27,3 @@ RDEPENDS += "hostap-modules-pci ntpdate
RDEPENDS += "hostap-modules-pci ntpdate \
${NYLON_STANDARD}"
-LICENSE = MIT
============================================================
--- packages/meta/nylon-feed.bb 120fafa3056f0a4dc254cbc8a43d8050497fd597
+++ packages/meta/nylon-feed.bb bc87d4ca45742719e73c249a26837a8fde33c43d
@@ -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
+
+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 \
"
-# TODO:
-# ksymoops / binutils
-# strace: SYS_read?
-# gdb-cross: install paths, sdk?
-# screen: sgttyb?
-# nocat?
-# pptp
-# meshroaming
-
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
============================================================
--- packages/nylon/nylon-scripts_cvs.bb fe1737e87a8ea21c3905e9230726bd8403ec128b
+++ packages/nylon/nylon-scripts_cvs.bb 887324466f26f6e97099f44669602fa8768ba812
@@ -5,14 +5,17 @@ LICENSE = "GPLv2"
PRIORITY = "optional"
MAINTAINER = "Bruno Randolf <bruno.randolf at 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 @@ else
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 @@ update-rc.d hostap remove
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 dummydate remove
update-rc.d dummydate remove
}
+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"
-CONFFILES_${PN} = "/etc/nylon/backup.list /etc/nylon/hostap.conf /etc/nylon/interfaces.conf /etc/nylon/route.list"
============================================================
--- packages/nylon/nylon-statistics.bb 2fcf1b3e18ff96c27f33ebbb9205b312fe77ce92
+++ packages/nylon/nylon-statistics.bb 8a2a497fa7db77e6e22e63df132e4c911a752c03
@@ -1,10 +1,11 @@ LICENSE = "GPLv2"
DESCRIPTION = "statistics & graphing for nylon"
RDEPENDS = "rrdtool"
SECTION = "base"
PRIORITY = "optional"
MAINTAINER = "Bruno Randolf <bruno.randolf at 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 @@ do_install() {
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() {
============================================================
--- packages/nylon/simple-firewall.bb 1d92b46ff50aa72c25ec3485eaba750a66a804d6
+++ packages/nylon/simple-firewall.bb a90ddc83e7c3a19a981542f010f31ea4d60f51f6
@@ -1,12 +1,13 @@ DEPENDS = "virtual/kernel"
DESCRIPTION = "simple firewall configuratiopn script"
SECTION = "base"
PRIORITY = "optional"
MAINTAINER = "Bruno Randolf <bruno.randolf at 4g-systems.biz>"
LICENSE = "GPL"
DEPENDS = "virtual/kernel"
-SRCDATE = "20060114"
-PV = "cvs${SRCDATE}"
+SRCDATE = "20060810"
+PV = "cvs${CVSDATE}"
+
INHIBIT_PACKAGE_STRIP = "1"
SRC_URI = "http://meshcube.org/nylon/unstable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz"
============================================================
--- packages/nylon/yamonenv.bb 7a2ccad387731b529a4ab507c043162d9802a0f6
+++ packages/nylon/yamonenv.bb 10d14b9388576364e48ba23d7bfbd238305ef9e5
@@ -1,9 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "Reads YAMON environment-variables"
SECTION = "base"
PRIORITY = "optional"
MAINTAINER = "Michael Stickel <michael.stickel at 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}"
More information about the Openembedded-commits
mailing list