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

diff --git a/conf/machine/beagle.conf b/conf/machine/beagle.conf
index a209160..d4051d0 100644 (file)
--- 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"

diff --git a/ipkg-utils/ipkg-link_1.6cvs.oe b/ipkg-utils/ipkg-link_1.6cvs.oe
index 6d6de84..f39d0d9 100644 (file)
--- a/ipkg-utils/ipkg-link_1.6cvs.oe
+++ b/ipkg-utils/ipkg-link_1.6cvs.oe
@@ -4,7 +4,9 @@ CONFLICTS = "ipkg-utils"
 PV_append = "${CVSDATE}"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=ipkg-utils \
-          file://fix-ipkg-link.patch;patch=1"
+          file://fix-ipkg-link.patch;patch=1 "
+          
+SRC_URI_append_beagle = "file://fix-ipkg-link-beagle.patch;patch=1"       
 S = "${WORKDIR}/ipkg-utils"
 
 do_compile() {

diff --git a/ipkg/ipkg-collateral/beagle/dest b/ipkg/ipkg-collateral/beagle/dest
index e69de29..5a08526 100644 (file)
--- a/ipkg/ipkg-collateral/beagle/dest
+++ b/ipkg/ipkg-collateral/beagle/dest
@@ -0,0 +1,3 @@
+dest root /
+dest flash /home
+dest cf /mnt/cf

diff --git a/linux/montavista-sa_2.4.17-mvl21.oe b/linux/montavista-sa_2.4.17-mvl21.oe
index 1cc774d..84b42fb 100644 (file)
--- a/linux/montavista-sa_2.4.17-mvl21.oe
+++ b/linux/montavista-sa_2.4.17-mvl21.oe
@@ -4,7 +4,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
 MVLV = "${@oe.data.getVar('PV',d,True).split('-')[1]}"
-PR = "r6"
+PR = "r7"
 DEPENDS = "cetools-native"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/montavista-sa-${PV}"
@@ -21,7 +21,6 @@ SRC_URI = "http://www.vanille.de/temp/linux-${KV}_${MVLV}.tar.gz \
           file://apm-hh-merge.patch;patch=1 \
           file://beagle-sound.patch;patch=1 \
           file://linux-2.4.18-list_move.patch;patch=1 \
-          file://ucb1x_kill-zombie.patch;patch=1 \
           file://pcmcia_preempt.patch;patch=1 \
            file://defconfig-${MACHINE}"