From 53744b0ffd779b7923a4edf4f8665e18726fafc6 Mon Sep 17 00:00:00 2001
From: Bruno Randolf <br1@subnet.at>
Date: Fri, 15 Oct 2004 15:27:54 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 null.(none):/data/mtx/oe/oe.write/packages

2004/10/15 17:27:21+02:00 (none)!br1
mtx-1 and nylon updates

2004/10/15 17:25:12+02:00 (none)!br1
autoload hostap_pci on mtx-1

BKrev: 416fec7akNTy9S4XNbGWyEzJ1NRUZw
---
 meta/nylon-feed.oe       |  3 +--
 meta/nylon-image-base.oe | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'meta')

diff --git a/meta/nylon-feed.oe b/meta/nylon-feed.oe
index e394e57e92..398bef60a9 100644
--- a/meta/nylon-feed.oe
+++ b/meta/nylon-feed.oe
@@ -7,6 +7,7 @@ db3 \
 ddclient \
 dhcp-forwarder \
 dhcp \
+dnsmasq \
 expat \
 gdb \
 glib-2.0 \
@@ -65,7 +66,6 @@ zlib \
 "
 
 # TODO:
-# linux arch/mips/Makefile: mipsel-linux-
 # ksymoops / binutils
 # strace: SYS_read?
 # gdb-cross: install paths, sdk?
@@ -77,7 +77,6 @@ zlib \
 # mrtg
 # ipac-ng
 # dyndns: http://ez-ipupdate.com/
-# tinc: MTU patch
 # pptp
 
 # egrep -i Pattern matched against "$Section $Package-Name"
diff --git a/meta/nylon-image-base.oe b/meta/nylon-image-base.oe
index 87e7f8ef6e..708e211d77 100644
--- a/meta/nylon-image-base.oe
+++ b/meta/nylon-image-base.oe
@@ -1,18 +1,22 @@
 export IMAGE_BASENAME = "nylon-base"
  
-NYLON_COMMON = "base-files base-passwd bash busybox \
+NYLON_COMMON = "base-files base-passwd bash busybox bridge-utils \
+	dnsmasq \
 	hostap-utils \
-	ipkg initscripts iproute2 \
-	modutils modutils-initscripts \
-	mtd netbase nylon-scripts openssh sysvinit tinylogin wireless-tools"
+	ipkg initscripts iproute2 iptables \
+	less \
+	mobilemesh modutils modutils-initscripts mtd \
+	nano ncurses netbase nylon-scripts \
+	openssh openvpn ppp rp-pppoe \
+	shorewall sysvinit \
+	tcpdump tinylogin \
+	wireless-tools"
 
-#update-modules
-
-DEPENDS = "virtual/kernel hostap-modules \ 
+DEPENDS = "virtual/kernel hostap-modules ntp \ 
 	${NYLON_COMMON} ${BOOTSTRAP_EXTRA_DEPENDS}"
 	
-RDEPENDS = "kernel kernel-module-tun modutils-depmod modutils-modinfo ncurses-terminfo \
-	hostap-modules-pci \
+RDEPENDS = "kernel modutils-depmod modutils-modinfo \
+	ncurses-terminfo ntpdate hostap-modules-pci \
 	${NYLON_COMMON} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
 export IPKG_INSTALL = "${RDEPENDS}" 
@@ -21,6 +25,4 @@ IMAGE_LINGUAS = ""
 
 inherit image_ipk
 
-ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*"
-
-export FEED_URIS="nylon##http://192.168.0.5/feed/unstable"
\ No newline at end of file
+ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*"
\ No newline at end of file
-- 
cgit v1.2.3