openmoko.conf: move to bluez4

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index bd58356..6d39e94 100644 (file)
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Linux Distribution Configuration for the Openmoko Platform
 #-----------------------------------------------------------------------------
 
-require conf/distro/include/preferred-om-2008-versions.inc
+require conf/distro/include/preferred-om-2009-versions.inc
 require conf/distro/include/angstrom-2007-for-openmoko.inc
 
 #
@@ -38,8 +38,7 @@ DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
 # Some features (bluetooth, usbgadget) include packages we do not like.
 # Pick some of the packages manually.
 DISTRO_EXTRA_RDEPENDS += " \
-    bluez-utils \
-    bluez-utils-compat \
+    bluez4 \
     kernel-module-g-ether \
     "
 
@@ -47,9 +46,6 @@ DISTRO_EXTRA_RDEPENDS += " \
 PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
 PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
 
-# we want the openmoko svn version of gsmd
-PREFERRED_PROVIDER_libgsmd = "libgsmd"
-
 # Bleeding-edge developers should add the following lines to their local.conf:
 # require conf/distro/include/moko-autorev.inc
 # require conf/distro/include/fso-autorev.inc
@@ -74,8 +70,10 @@ PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
 PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
 PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
 
-# Select package versions we want to use.
+# Select package providers
 PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_opkg = "opkg"
+PREFERRED_PROVIDER_libgsmd = "libgsmd"
 
 # for jalimo
 PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
@@ -94,8 +92,3 @@ ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; ech
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${OM_VERSION_FILE}; cd $OLD_PWD;"
 ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${OM_VERSION_FILE};"
 ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${OM_VERSION_FILE};"
-
-
-
-# opkg
-PREFERRED_PROVIDER_opkg = "opkg"