From a0490cfbc9c70dfd11f695fea2d7c367d6221ff0 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 7 Nov 2004 22:42:40 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel into
 handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/11/07 23:41:32+01:00 handhelds.org!zecke
Beagle Machine patches
	-Remove bluez/dbus from task-bootstrap
	-Kernel leave zombies of ktsd for now as it was before
	-Fix up ipkg destinations for the 2nd bank

BKrev: 418ea4e0Dk7F573u9Oh_oFcBUVTE-w
---
 conf/machine/beagle.conf | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'conf/machine')

diff --git a/conf/machine/beagle.conf b/conf/machine/beagle.conf
index a209160f3d..d4051d091c 100644
--- a/conf/machine/beagle.conf
+++ b/conf/machine/beagle.conf
@@ -28,12 +28,35 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
                    ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \
                    ffffffff ffffffff d0140000"
 
-include conf/machine/handheld-common.conf
 include conf/machine/tune-strongarm.conf
 
-# Remove BlueZ from the Stock ROM
-# BOOTSTRAP_EXTRA_RRECOMMENDS -= "bluez-utils"
-
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
+
+
+# Configuration bits for "generic handheld" from handhelds-common.conf
+HANDHELD_MODULES_COPY = "ipv6 \
+ipsec \
+nvrd \
+mip6-mn \
+tun \
+ide-cs ide-disk \
+loop \
+vfat ext2 \
+sunrpc nfs \
+btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \
+pcnet-cs serial-cs \
+af_packet \
+ppp-async ppp-deflate ppp-mppe \
+ip-gre ip-tables ipip \
+irda irlan irnet irport irtty \
+input uinput \
+"
+
+
+BOOTSTRAP_EXTRA_DEPENDS     += "pcmcia-cs apmd ppp wireless-tools irda-utils"
+BOOTSTRAP_EXTRA_RDEPENDS    += "pcmcia-cs apm irda-utils"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools ${@linux_module_packages('${HANDHELD_MODULES_COPY}')}"
+
+INHERIT += "linux_modules"
-- 
cgit v1.2.3