Merge bk://openembedded@openembedded.bkbits.net/packages

into home.hrw.one.pl:/home/hrw/zaurus/oe/packages

2004/11/05 13:26:33+01:00 (none)!br1
unik-olsrd: add version script patch for libraries

2004/11/05 12:16:32+01:00 (none)!br1
nylon updates, split base, standard and extra image

2004/11/05 11:49:11+01:00 (none)!br1
added mtr 0.65

2004/11/05 11:47:07+01:00 (none)!br1
added chillispot 0.98

2004/11/05 11:42:27+01:00 (none)!br1
rrdtool: patch to build perl-modules

BKrev: 418bf93fxy3gt7AnsYZJ3xtQYZ1bmA

14 files changed, 103 insertions, 19 deletions

diff --git a/chillispot/chillispot_0.98.oe b/chillispot/chillispot_0.98.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/chillispot/chillispot_0.98.oe
diff --git a/chillispot/files/init b/chillispot/files/init
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/chillispot/files/init
diff --git a/meta/nylon-feed.oe b/meta/nylon-feed.oe
index e0521f1754..49721aceb8 100644
--- a/meta/nylon-feed.oe
+++ b/meta/nylon-feed.oe
@@ -3,6 +3,7 @@ base-files \
 bash \
 bridge-utils \
 busybox \
+chillispot \
 db3 \
 ddclient \
 dhcp-forwarder \
@@ -38,6 +39,7 @@ mc \
 mobilemesh \
 modutils \
 mtd \
+mtr \
 nano \
 ncurses \
 netbase \
@@ -45,6 +47,7 @@ netperf \
 net-snmp \
 ntp \
 nylon-scripts \
+nylon-statistics \
 openssh \
 openssl \
 openvpn \
@@ -74,7 +77,7 @@ zlib \
 # strace: SYS_read?
 # gdb-cross: install paths, sdk?
 # screen: sgttyb?
-# nocat
+# nocat?
 # pptp
 # meshroaming
 
diff --git a/meta/nylon-image-base.oe b/meta/nylon-image-base.oe
index 4f33369165..fa09de961a 100644
--- a/meta/nylon-image-base.oe
+++ b/meta/nylon-image-base.oe
@@ -1,29 +1,23 @@
 export IMAGE_BASENAME = "nylon-base"
  
-NYLON_COMMON = "base-files base-passwd bash busybox bridge-utils \
-	dnsmasq \
-	hostap-utils \
-	ipkg initscripts iproute2 iptables \
-	less \
-	mobilemesh modutils modutils-initscripts mtd \
-	nano ncurses netbase nylon-scripts \
-	openssh openvpn ppp rp-pppoe \
-	shorewall sysvinit \
-	tcpdump timezones tinylogin \
-	wireless-tools"
+NYLON_BASE = "base-files base-passwd bash busybox \
+	ipkg initscripts less \
+	modutils modutils-initscripts mtd \
+	nano ncurses netbase \
+	openssh sysvinit \
+	timezones tinylogin"
 
-DEPENDS = "virtual/kernel hostap-modules ntp \ 
-	${NYLON_COMMON} ${BOOTSTRAP_EXTRA_DEPENDS}"
+DEPENDS = "virtual/kernel \ 
+	${NYLON_BASE} ${BOOTSTRAP_EXTRA_DEPENDS}"
 	
 RDEPENDS = "kernel modutils-depmod modutils-modinfo \
-	ntpdate hostap-modules-pci \
-	${NYLON_COMMON} ${BOOTSTRAP_EXTRA_RDEPENDS}"
+	${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
 export IPKG_INSTALL = "${RDEPENDS}" 
 
 IMAGE_LINGUAS = ""
 
-inherit image_ipk
-
 # we dont need the kernel in the image
 ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*"
+
+inherit image_ipk
diff --git a/meta/nylon-image-extra.oe b/meta/nylon-image-extra.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/nylon-image-extra.oe
diff --git a/meta/nylon-image-standard.oe b/meta/nylon-image-standard.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/nylon-image-standard.oe
diff --git a/mtr/mtr_0.65.oe b/mtr/mtr_0.65.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/mtr/mtr_0.65.oe
diff --git a/netbase/netbase/mtx-1/interfaces b/netbase/netbase/mtx-1/interfaces
index e69de29bb2..a7c6da5752 100644
--- a/netbase/netbase/mtx-1/interfaces
+++ b/netbase/netbase/mtx-1/interfaces
@@ -0,0 +1,29 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Ethernet
+auto eth0
+iface eth0 inet dhcp
+
+# wlan interface 1 for clients
+auto wlan0
+iface wlan0 inet static
+	address 10.0.0.1
+	netmask 255.0.0.0
+	wireless_mode master
+	wireless_essid cube-ap
+	wireless_channel 1
+	
+# wlan interface 2 for mesh
+auto wlan1
+iface wlan1 inet static
+	address 172.16.0.1
+	netmask 255.240.0.0
+	broadcast 172.31.255.255
+	wireless_mode ad-hoc
+	wireless_essid cube-mesh
+	wireless_channel 11
+	wireless_rts 250
diff --git a/nylon/nylon-scripts_cvs.oe b/nylon/nylon-scripts_cvs.oe
index e69de29bb2..113470dbc6 100644
--- a/nylon/nylon-scripts_cvs.oe
+++ b/nylon/nylon-scripts_cvs.oe
@@ -0,0 +1,34 @@
+DESCRIPTION = "This package provides the mtx specific init and configuration scripts."
+DEPENDS = "hostap-utils"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "svn://meshcube.org/svn/scripts;module=${PN}"
+S = "${WORKDIR}/${PN}"
+
+do_install() {
+	(cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf -
+}
+
+pkg_postinst() {
+#!/bin/sh
+update-rc.d hostap defaults 15
+update-rc.d ipaliases defaults 16
+update-rc.d firewall defaults 20
+update-rc.d routing defaults 20
+update-rc.d dummydate start 50 S . stop 50 0 6 .
+update-rc.d emergency-ip defaults 99
+}
+
+pkg_postrm() {
+#!/bin/sh -e
+update-rc.d ipaliases remove
+update-rc.d firewall remove
+update-rc.d hostap remove
+update-rc.d routing remove
+update-rc.d dummydate remove
+update-rc.d emergency-ip remove
+}
\ No newline at end of file
diff --git a/nylon/nylon-statistics.oe b/nylon/nylon-statistics.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/nylon/nylon-statistics.oe
diff --git a/rrdtool/perl-make-options.diff b/rrdtool/perl-make-options.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/rrdtool/perl-make-options.diff
diff --git a/rrdtool/rrdtool_1.0.49.oe b/rrdtool/rrdtool_1.0.49.oe
index e69de29bb2..4af99fa192 100644
--- a/rrdtool/rrdtool_1.0.49.oe
+++ b/rrdtool/rrdtool_1.0.49.oe
@@ -0,0 +1,22 @@
+DESCRIPTION = "RRD is the Acronym for Round Robin Database. RRD is a system to store and display time-series data (i.e. network bandwidth, machine-room temperature, server load average)."
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+HOMEPAGE = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool"
+DEPENDS = "libpng zlib"
+SRC_URI = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-${PV}.tar.gz \
+	file://perl-make-options.diff;patch=1;pnum=0"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''"
+
+do_install_append() {
+	install -d ${D}/${docdir}/rrdtool/
+	mv ${D}/usr/html ${D}/${docdir}/rrdtool/
+	mv ${D}/usr/doc/* ${D}/${docdir}/rrdtool/
+	mv ${D}/usr/examples ${D}/${docdir}/rrdtool/
+	mv ${D}/usr/contrib ${D}/${docdir}/rrdtool/
+}
+
+FILES_${PN} += "/usr/lib/perl"
+
+DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader"
\ No newline at end of file
diff --git a/unik-olsrd/files/lib.diff b/unik-olsrd/files/lib.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/unik-olsrd/files/lib.diff
diff --git a/unik-olsrd/unik-olsrd_0.4.7.oe b/unik-olsrd/unik-olsrd_0.4.7.oe
index 90133dadd3..026693b648 100644
--- a/unik-olsrd/unik-olsrd_0.4.7.oe
+++ b/unik-olsrd/unik-olsrd_0.4.7.oe
@@ -4,9 +4,11 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI="http://www.olsr.org/downloadolsr.cgi?file=olsrd-${PV}.tar.bz2 \
-	file://unik-olsrd"
+	file://unik-olsrd \
+	file://lib.diff;patch=1"
 
 PACKAGES =+ "unik-olsrd-libs"
 FILES_unik-olsrd-libs = "${libdir}"