introduce bluez-utils-dbus and bluez-utils-nodbus. remove bluez-utils from handheld-common.conf and put it in the respective gpe|opie image.oe

BKrev: 41977c52ZpoMZm09rOlMH4abySOgDg

15 files changed, 6 insertions, 124 deletions

diff --git a/bluez-utils/bluez-utils-2.10/dbus.patch b/bluez-utils/bluez-utils-2.10/dbus.patch
deleted file mode 100644
index b360c4dca2..0000000000
--- a/bluez-utils/bluez-utils-2.10/dbus.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- bluez-utils-2.10/acinclude.m4.old	2004-10-19 22:34:47.000000000 +0100
-+++ bluez-utils-2.10/acinclude.m4	2004-10-19 22:50:47.000000000 +0100
-@@ -124,45 +124,14 @@
- ])
- 
- AC_DEFUN([AC_PATH_DBUS], [
--	dbus_prefix=${prefix}
--
--	AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [
--		if (test "${withval}" != "yes"); then
--			dbus_prefix=${withval}
--		fi
--	])
--
--	ac_save_CPPFLAGS=$CPPFLAGS
--	ac_save_LDFLAGS=$LDFLAGS
--
--	DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE"
--	test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0"
--	if (test "${prefix}" = "${bluez_prefix}"); then
--		test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include"
--	else
--		test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include"
--		test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include"
--	fi
--
-+	if pkg-config --exists dbus-1; then
-+	DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
-+	DBUS_LIBS="`pkg-config --libs dbus-1`"
- 	CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
--	AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no)
--
--	DBUS_LIBS=""
--	if (test "${prefix}" = "${dbus_prefix}"); then
--		test -d "${libdir}" && DBUS_LIBS="$DBUS_LIBS -L${libdir}"
--	else
--		test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64"
--		test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib"
--	fi
--
- 	LDFLAGS="$LDFLAGS $DBUS_LIBS"
--	AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no)
--
--	CPPFLAGS=$ac_save_CPPFLAGS
--	LDFLAGS=$ac_save_LDFLAGS
--
- 	AC_SUBST(DBUS_CFLAGS)
- 	AC_SUBST(DBUS_LIBS)
-+	fi
- ])
- 
- AC_DEFUN([AC_ARG_BLUEZ], [
diff --git a/bluez-utils/bluez-utils-2.9/bluetooth_conf.patch b/bluez-utils/bluez-utils-2.9/bluetooth_conf.patch
deleted file mode 100644
index 281c970f44..0000000000
--- a/bluez-utils/bluez-utils-2.9/bluetooth_conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bluez-utils-2.9/pcmcia/bluetooth.conf.orig	2004-09-24 14:13:13.933487924 +0100
-+++ bluez-utils-2.9/pcmcia/bluetooth.conf	2004-09-24 14:13:25.737585860 +0100
-@@ -27,7 +27,7 @@
-   bind "serial_cs" class "bluetooth"
- 
- card "AmbiCom BT2000C Bluetooth PC/CF Card"
--  version ""AmbiCom BT2000C", "Bluetooth PC/CF Card"
-+  version "AmbiCom BT2000C", "Bluetooth PC/CF Card"
-   bind "serial_cs" class "bluetooth"
- 
- card "COM One Platinium Bluetooth PC Card"
diff --git a/bluez-utils/bluez-utils-2.11/dbus.patch b/bluez-utils/bluez-utils-common_2.10.inc
index e69de29bb2..e69de29bb2 100644
--- a/bluez-utils/bluez-utils-2.11/dbus.patch
+++ b/bluez-utils/bluez-utils-common_2.10.inc
diff --git a/bluez-utils/bluez-utils_2.11.oe b/bluez-utils/bluez-utils-common_2.11.inc
index e69de29bb2..e69de29bb2 100644
--- a/bluez-utils/bluez-utils_2.11.oe
+++ b/bluez-utils/bluez-utils-common_2.11.inc
diff --git a/bluez-utils/bluez-utils-dbus-2.10/dbus.patch b/bluez-utils/bluez-utils-dbus-2.10/dbus.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bluez-utils/bluez-utils-dbus-2.10/dbus.patch
diff --git a/bluez-utils/bluez-utils-dbus-2.11/dbus.patch b/bluez-utils/bluez-utils-dbus-2.11/dbus.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bluez-utils/bluez-utils-dbus-2.11/dbus.patch
diff --git a/bluez-utils/bluez-utils-dbus_2.10.oe b/bluez-utils/bluez-utils-dbus_2.10.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bluez-utils/bluez-utils-dbus_2.10.oe
diff --git a/bluez-utils/bluez-utils-dbus_2.11.oe b/bluez-utils/bluez-utils-dbus_2.11.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bluez-utils/bluez-utils-dbus_2.11.oe
diff --git a/bluez-utils/bluez-utils-nodbus_2.10.oe b/bluez-utils/bluez-utils-nodbus_2.10.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bluez-utils/bluez-utils-nodbus_2.10.oe
diff --git a/bluez-utils/bluez-utils-nodbus_2.11.oe b/bluez-utils/bluez-utils-nodbus_2.11.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bluez-utils/bluez-utils-nodbus_2.11.oe
diff --git a/bluez-utils/bluez-utils_2.10.oe b/bluez-utils/bluez-utils_2.10.oe
deleted file mode 100644
index d5f974791a..0000000000
--- a/bluez-utils/bluez-utils_2.10.oe
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs pcmcia-cs dbus"
-RPROVIDES = "bluez-pan bluez-sdp"
-PR = "r2"
-LICENSE = "GPL"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
-	file://dbus.patch;patch=1 \
-	file://hcid.conf"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
-
-do_install_append() {
-	install -d ${D}/sbin ${D}/bin/
-	mv ${D}${sbindir}/* ${D}/sbin/
-	mv ${D}${bindir}/* ${D}/bin/
-	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
-	chmod 755 ${D}/etc/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
-}
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults"
-
diff --git a/bluez-utils/bluez-utils_2.9.oe b/bluez-utils/bluez-utils_2.9.oe
deleted file mode 100644
index e907bb6973..0000000000
--- a/bluez-utils/bluez-utils_2.9.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "bluez-libs pcmcia-cs"
-RPROVIDES = "bluez-pan bluez-sdp"
-PR = "r3"
-LICENSE = "GPL"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
-           file://bluetooth_conf.patch;patch=1"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia"
-
-do_install_append() {
-	install -d ${D}/sbin ${D}/bin/
-	mv ${D}${sbindir}/* ${D}/sbin/
-	mv ${D}${bindir}/* ${D}/bin/
-	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
-    chmod 755 ${D}/etc/pcmcia/bluetooth
-}
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults"
-
diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
index 5e3bafacf2..e9ceb7272b 100644
--- a/conf/machine/handheld-common.conf
+++ b/conf/machine/handheld-common.conf
@@ -17,8 +17,8 @@ input uinput \
 "
 
 # Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp bluez-utils wireless-tools irda-utils openswan"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm irda-utils"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools openswan ${@linux_module_packages('${HANDHELD_MODULES}')}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools openswan ${@linux_module_packages('${HANDHELD_MODULES}')}"
 
 INHERIT += "linux_modules"
diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index f095e27b39..941f33c17a 100644
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -1,7 +1,7 @@
 PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r16"
+PR = "r17"
 
 ALLOW_EMPTY = 1
 
@@ -13,6 +13,7 @@ RDEPENDS_gpe-base-depends := "${gpe-base-depends}"
 DEPENDS += " ${gpe-base-depends}"
 
 gpe-task-base = "\
+    bluez-utils-dbus \
     matchbox \
     xcursor-transparent-theme \
     rxvt-unicode \
diff --git a/meta/opie-collections.inc b/meta/opie-collections.inc
index 1b48c3583d..f0d05d6da2 100644
--- a/meta/opie-collections.inc
+++ b/meta/opie-collections.inc
@@ -37,8 +37,8 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
 
 OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh opie-style-metal opie-style-web opie-style-phase"
 
-OPIE_BASE_DEPENDS = "ipkg ntp"
-OPIE_BASE_RDEPENDS = "ntpdate opie-handwriting-classicset"
+OPIE_BASE_DEPENDS = "ipkg ntp bluez-utils-nodbus"
+OPIE_BASE_RDEPENDS = "ntpdate opie-handwriting-classicset bluez-utils-nodbus"
 
 #
 # Additional things for a standard 16MB distribution