merge of 497af8d916ea71b5cc3ad879076fb96fd89b3ef9

     and 4f4c1c975d8e241b60c1c145634b54180f6f1fb9

36 files changed, 160 insertions, 159 deletions

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 0cb5128e17..af6d905490 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -1,6 +1,6 @@
 inherit package
 DEPENDS_prepend="${@["ipkg-utils-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
-BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link"
+BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg"
 PACKAGEFUNCS += "do_package_ipk"
 
 python package_ipk_fn () {
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index ae87c2ed2d..8cea393b43 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -17,7 +17,7 @@ do_build[nostamp] = 1
 
 IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}"
 
-IPKG_INSTALL += "ipkg ipkg-link ipkg-collateral"
+IPKG_INSTALL += "ipkg ipkg-collateral"
 
 ROOTFS_POSTPROCESS_COMMAND ?= ""
 
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 756ce7675e..e63bdfc54e 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -188,12 +188,14 @@ IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.r
 IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
 IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
 IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
+IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
 IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ."
 IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
 EXTRA_IMAGECMD = ""
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 EXTRA_IMAGECMD_squashfs = "-le -b 16384"
+EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384"
 IMAGE_ROOTFS_SIZE_ext2 = "65536"
 IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
 
@@ -203,6 +205,7 @@ IMAGE_DEPENDS_cramfs = "cramfs-native"
 IMAGE_DEPENDS_ext2 = "genext2fs-native"
 IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
 IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
+IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native"
 EXTRA_IMAGEDEPENDS = ""
 
 ##################################################################
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 6ae65af640..1cae849d0c 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -29,7 +29,7 @@ FEED_URIS += " \
 
 #SRCDATE = "20060630"
 #SRCDATE_handhelds-pxa-2.6 = "20060622"
-PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh5"
+PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh7"
 PREFERRED_VERSION_handhelds-pxa-2.6_htcuniversal = "2.6.17-hh1+cvs${SRCDATE}"
 
 PREFERRED_PROVIDER_hostap-modules_ipaq-pxa270 = "hostap-modules"
diff --git a/packages/bluez/bluez-libs_3.7.bb b/packages/bluez/bluez-libs_3.7.bb
new file mode 100644
index 0000000000..d740bd80a9
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.7.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
+SECTION = "libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.bluez.org"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
+
+do_stage() {
+        oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
+
+        install -d ${STAGING_INCDIR}/bluetooth/
+        for f in ${HEADERS}
+        do
+		install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
+        done
+}
diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb
index d55361c63d..e76868cb6c 100644
--- a/packages/bluez/bluez-utils-dbus_2.20.bb
+++ b/packages/bluez/bluez-utils-dbus_2.20.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r11"
+PR = "r12"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus.patch;patch=1 \
diff --git a/packages/bluez/bluez-utils-dbus_2.21.bb b/packages/bluez/bluez-utils-dbus_2.21.bb
index 11decf1208..cd98cfdfaa 100644
--- a/packages/bluez/bluez-utils-dbus_2.21.bb
+++ b/packages/bluez/bluez-utils-dbus_2.21.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus.patch;patch=1 \
diff --git a/packages/bluez/bluez-utils-dbus_2.24.bb b/packages/bluez/bluez-utils-dbus_2.24.bb
index 601a3f1f0c..3e4d0d7898 100644
--- a/packages/bluez/bluez-utils-dbus_2.24.bb
+++ b/packages/bluez/bluez-utils-dbus_2.24.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus-2.24.patch;patch=1"
diff --git a/packages/bluez/bluez-utils-dbus_2.25.bb b/packages/bluez/bluez-utils-dbus_2.25.bb
index 954121c330..e4ec42f4c2 100644
--- a/packages/bluez/bluez-utils-dbus_2.25.bb
+++ b/packages/bluez/bluez-utils-dbus_2.25.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus-2.24.patch;patch=1 \
diff --git a/packages/bluez/bluez-utils-nodbus_2.20.bb b/packages/bluez/bluez-utils-nodbus_2.20.bb
index e7b5ad5f43..ebb5667c0b 100644
--- a/packages/bluez/bluez-utils-nodbus_2.20.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.20.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://hciattach_devlength.patch;patch=1"
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.21.bb b/packages/bluez/bluez-utils-nodbus_2.21.bb
index 5e1f417cc0..f1efd35a16 100644
--- a/packages/bluez/bluez-utils-nodbus_2.21.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.21.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://hciattach_devlength.patch;patch=1"
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.24.bb b/packages/bluez/bluez-utils-nodbus_2.24.bb
index b0a601d625..e2f4c67384 100644
--- a/packages/bluez/bluez-utils-nodbus_2.24.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.24.bb
@@ -1,5 +1,5 @@
 require bluez-utils.inc
 
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.25.bb b/packages/bluez/bluez-utils-nodbus_2.25.bb
index 87068c9ab1..e56fab6c60 100644
--- a/packages/bluez/bluez-utils-nodbus_2.25.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.25.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += " file://hciattach-ti-bts.patch;patch=1"
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index e71f2cef87..7eb181676d 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -21,7 +21,7 @@ SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
 S = "${WORKDIR}/bluez-utils-${PV}"
 
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} \
-                --enable-pcmcia --enable-initscripts --enable-bcm203x"
+                --enable-pcmcia --enable-initscripts --enable-bcm203x --enable-hid2hci"
 
 inherit autotools update-rc.d
 
diff --git a/packages/bluez/bluez-utils_3.1.bb b/packages/bluez/bluez-utils_3.1.bb
index 46565b8c1b..40aabaab50 100644
--- a/packages/bluez/bluez-utils_3.1.bb
+++ b/packages/bluez/bluez-utils_3.1.bb
@@ -6,7 +6,7 @@ RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
 RREPLACES = "bluez-utils-dbus"
 RCONFLICTS = "bluez-utils-dbus bluez-utils-nodbus"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
@@ -19,7 +19,7 @@ SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
 
 S = "${WORKDIR}/bluez-utils-${PV}"
 
-EXTRA_OECONF = "--enable-initscripts --enable-bcm203x"
+EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci"
 #  --enable-obex           enable OBEX support
 #  --enable-alsa           enable ALSA support
 #  --enable-cups           install CUPS backend support
diff --git a/packages/bluez/bluez-utils_3.4.bb b/packages/bluez/bluez-utils_3.4.bb
index 3b8702e997..49e6ded250 100644
--- a/packages/bluez/bluez-utils_3.4.bb
+++ b/packages/bluez/bluez-utils_3.4.bb
@@ -7,7 +7,7 @@ RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
 RREPLACES = "bluez-utils-dbus"
 RCONFLICTS_${PN} = "bluez-utils-nodbus"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
@@ -20,7 +20,7 @@ SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
 
 S = "${WORKDIR}/bluez-utils-${PV}"
 
-EXTRA_OECONF = "--enable-initscripts --enable-bcm203x"
+EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci"
 #  --enable-obex           enable OBEX support
 #  --enable-alsa           enable ALSA support
 #  --enable-cups           install CUPS backend support
diff --git a/packages/gnuz/.mtn2git_empty b/packages/gnuz/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gnuz/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gnuz/gnuz-levelmaker-native_0.1.1.bb b/packages/gnuz/gnuz-levelmaker-native_0.1.1.bb
deleted file mode 100644
index 4fec8271b3..0000000000
--- a/packages/gnuz/gnuz-levelmaker-native_0.1.1.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Level maker for gnuZ"
-SECTION = "opie/games"
-PRIORITY = "optional"
-LICENSE = "GPL"
-AUTHOR = "Lukas Fraser"
-HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-DEPENDS = "qt-x11-free-native"
-
-SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz-levelmaker_${PV}.tar.gz"
-
-S = "${WORKDIR}/gnuz_levelmaker"
-
-EXTRA_QMAKEVARS_POST += "LIBS+=-ldl CONFIG+=thread"
-
-inherit qmake qt3x11 native
-
-do_configure_prepend() {
-
-	${STAGING_BINDIR}/qmake -project
-}
-
-do_compile() {
-
-export OE_QMAKE_LINK="${CXX}"
-	oe_runmake
-}
-
-do_stage() {
-	install -m 0755 gnuz_levelmaker ${STAGING_BINDIR}/
-}
diff --git a/packages/gnuz/gnuz-package-native_0.1.bb b/packages/gnuz/gnuz-package-native_0.1.bb
deleted file mode 100644
index d67553a877..0000000000
--- a/packages/gnuz/gnuz-package-native_0.1.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Level maker for gnuZ"
-SECTION = "opie/games"
-PRIORITY = "optional"
-LICENSE = "GPL"
-AUTHOR = "Lukas Fraser"
-HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-DEPENDS = "qt-x11-free-native"
-
-SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz-package_${PV}.tar.gz"
-
-S = "${WORKDIR}/gnuz_package"
-
-EXTRA_QMAKEVARS_POST += "LIBS+=-ldl CONFIG+=thread"
-
-inherit qmake qt3x11 native
-
-do_configure_prepend() {
-
-	${STAGING_BINDIR}/qmake -project
-}
-
-do_compile() {
-
-export OE_QMAKE_LINK="${CXX}"
-	oe_runmake
-}
-
-do_stage() {
-	install -m 0755 gnuz_package ${STAGING_BINDIR}/
-}
diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb
deleted file mode 100644
index 476b9ff5a6..0000000000
--- a/packages/gnuz/gnuz_0.3.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "gnuZ is a Lemmings style game"
-SECTION = "opie/games"
-PRIORITY = "optional"
-LICENSE = "GPL"
-AUTHOR = "Lukas Fraser"
-HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-PR = "r2"
-
-APPTYPE = "binary"
-APPNAME = "gnuz"
-APPDESKTOP = "${S}/data/"
-
-SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \
-           http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3-1.tar.bz2"
-
-S = "${WORKDIR}/gnuz"
-
-inherit opie
-
-do_install_append() {
-
-        install -d ${D}${palmtopdir}/apps/Games \
-                   ${D}${palmtopdir}/pics \
-                   ${D}${palmtopdir}/share/gnuz/levels
-
-        install -m 0644 data/gnuz.png ${D}${palmtopdir}/pics/
-        install -m 0644 ${WORKDIR}/gnuz-levels/share/gnuz/levels/* ${D}${palmtopdir}/share/gnuz/levels/
-        install -m 0644 ${WORKDIR}/gnuz-levels/share/gnuz/*images.dat ${D}${palmtopdir}/share/gnuz/
-}
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index e6f7aee181..f2e4a7ecc5 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "GPE session startup scripts"
 LICENSE = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
-RDEPENDS_${PN} = "matchbox matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
+RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
 
diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc
index 16f471356a..0855da8f4c 100644
--- a/packages/matchbox-panel/matchbox-panel.inc
+++ b/packages/matchbox-panel/matchbox-panel.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
+DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
 SECTION = "x11/wm"
 
 inherit autotools pkgconfig gettext
diff --git a/packages/omnievents/.mtn2git_empty b/packages/omnievents/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/omnievents/.mtn2git_empty
+++ /dev/null
diff --git a/packages/omnievents/files/.mtn2git_empty b/packages/omnievents/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/omnievents/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/omnievents/files/omniidl-cross.patch b/packages/omnievents/files/omniidl-cross.patch
deleted file mode 100644
index 3afb2bbf0e..0000000000
--- a/packages/omnievents/files/omniidl-cross.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- omniEvents-2_6_1/config.mk.in       2004-11-16 18:04:42.000000000 -0500
-+++ omniEvents-2_6_1.new/config.mk.in   2005-03-29 08:38:08.023579809 -0500
-@@ -65,8 +65,12 @@
- ## IDL compiler.
- ##
-
-+ifndef IDL
- IDL         := @IDL@
-+endif
-+ifndef IDL_COS_DIR
- IDL_COS_DIR := @IDL_COS_DIR@
-+endif
- IDLFLAGS     = -bcxx  # <--- backend selection should be omniidl's first option.
- IDLFLAGS    += -Wba -Wbh='.hh' -Wbs='.cc' -Wbd='DynSK.cc' -WbBOA -Wbuse_quotes
- IDLFLAGS    += -I$(IDL_COS_DIR)/COS
-
diff --git a/packages/omnievents/omnievents_2.6.1.bb b/packages/omnievents/omnievents_2.6.1.bb
deleted file mode 100644
index 827719ed20..0000000000
--- a/packages/omnievents/omnievents_2.6.1.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-PR = "r0"
-DESCRIPTION = "OmniEvent service for omniORB"
-SECTION = "devel"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-
-DEPENDS = omniorb
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/omnievents/omniEvents-2_6_1-src.tar.gz \
-file://omniidl-cross.patch;patch=1"
-
-S = "${WORKDIR}/omniEvents-2_6_1"
-
-inherit autotools pkgconfig
-
-#do_configure () {
-EXTRA_OECONF="--with-omniorb=${STAGING_LIBDIR}/../usr"
-#	oe_runconf
-#}
-
-do_compile () {
-	export IDL=${STAGING_DIR}/${BUILD_SYS}/bin/omniidl
-	export IDL_COS_DIR=${STAGING_DIR}/${BUILD_SYS}/share/idl/omniORB
-	oe_runmake
-}
-
-do_stage () {
-	make DESTDIR=${STAGING_LIBDIR}/.. install
-}
-
-#do_install () {
-#	export EmbeddedSystem=1
-#	make DESTDIR=${D} install
-#}
diff --git a/packages/omniorb/omniorb-native_4.0.7.bb b/packages/omniorb/omniorb-native_4.0.7.bb
index f9addd997d..be729fe6dc 100644
--- a/packages/omniorb/omniorb-native_4.0.7.bb
+++ b/packages/omniorb/omniorb-native_4.0.7.bb
@@ -11,6 +11,11 @@ do_compile () {
 	oe_runmake
 }
 
+# Ugly hack so libtool does not find native libs when building cross packages
+# We really only build this package for omniidl anyway
+do_stage_append() {
+	rm -f  ${STAGING_DIR}/${BUILD_SYS}/lib/libomni*
+}
 
 #do_stage() {
 #	install -m 0755 src/bison ${STAGING_BINDIR}/
diff --git a/packages/ossie/channeldemo_svn.bb b/packages/ossie/channeldemo_svn.bb
new file mode 100644
index 0000000000..d64464ade7
--- /dev/null
+++ b/packages/ossie/channeldemo_svn.bb
@@ -0,0 +1,19 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Demo channel component"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/ChannelDemo"
+
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/components/ChannelDemo/trunk;module=ChannelDemo;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/xml/ChannelDemo/*.xml"
+
diff --git a/packages/ossie/gpp-device_svn.bb b/packages/ossie/gpp-device_svn.bb
new file mode 100644
index 0000000000..dcd58c73c6
--- /dev/null
+++ b/packages/ossie/gpp-device_svn.bb
@@ -0,0 +1,19 @@
+PR = "r0"
+DESCRIPTION = "OSSIE General Purpose Processor device"
+SECTION =  "apps"
+PRIORITY = "optional"
+MAINTAINER = "Philip Balister philip@balister.org"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/GPP"
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/GPP/trunk;module=GPP;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/xml/GPP/*xml"
+
diff --git a/packages/ossie/nodebooter_svn.bb b/packages/ossie/nodebooter_svn.bb
new file mode 100644
index 0000000000..34d6041e6c
--- /dev/null
+++ b/packages/ossie/nodebooter_svn.bb
@@ -0,0 +1,14 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Node Booter"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/nodebooter"
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/nodebooter/trunk;module=nodebooter;proto=https"
+
+inherit autotools
+
diff --git a/packages/ossie/ossie-demo_svn.bb b/packages/ossie/ossie-demo_svn.bb
new file mode 100644
index 0000000000..df2d98ed9d
--- /dev/null
+++ b/packages/ossie/ossie-demo_svn.bb
@@ -0,0 +1,18 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Demo waveform"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf channeldemo rxdemo"
+
+S="${WORKDIR}/ossie_demo"
+
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/waveforms/ossie_demo/trunk;module=ossie_demo;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/waveforms/ossie_demo/*.xml /home/sca/xml/TxDemo/*.xml"
diff --git a/packages/ossie/ossiecf_svn.bb b/packages/ossie/ossiecf_svn.bb
index 31a43ef223..d286ef4aa7 100644
--- a/packages/ossie/ossiecf_svn.bb
+++ b/packages/ossie/ossiecf_svn.bb
@@ -15,3 +15,6 @@ inherit autotools pkgconfig
 do_stage () {
 	autotools_stage_all
 }
+
+FILES_${PN} += "/home/sca/xml/dtd/*.dtd"
+
diff --git a/packages/ossie/rxdemo.bb b/packages/ossie/rxdemo.bb
new file mode 100644
index 0000000000..566397c72e
--- /dev/null
+++ b/packages/ossie/rxdemo.bb
@@ -0,0 +1,19 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Demo receiver component"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/RxDemo"
+
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/components/RxDemo/trunk;module=RxDemo;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/xml/RxDemo/*.xml"
+
diff --git a/packages/ossie/standardinterfaces_svn.bb b/packages/ossie/standardinterfaces_svn.bb
new file mode 100644
index 0000000000..46b85f80ef
--- /dev/null
+++ b/packages/ossie/standardinterfaces_svn.bb
@@ -0,0 +1,18 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Standard port interfaces"
+SECTION =  "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/standardInterfaces"
+
+SRCDATE = "now"
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/standardInterfaces/trunk;module=standardInterfaces;proto=https"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
index bc4cba379e..b4b17e4e18 100644
--- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -5,7 +5,7 @@ PR = "r5"
 
 PROVIDES = "virtual/xserver"
 RPROVIDES = "virtual/xserver"
-PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100 ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100"
 SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
 DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index e2e3cd6a92..4b9d820075 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "tslib virtual/libsdl libxkbfile xproto libxdmcp xextproto xtrans libx
 
 PROVIDES = "virtual/xserver"
 RPROVIDES = "virtual/xserver"
-PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100 ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100"
 SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
 DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"