From bb4364365bd4109c910ad34403cf4d388136dcf5 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Thu, 20 Dec 2012 17:42:28 +0100
Subject: [PATCH] meta-digi-del: Add del-bluetooth feature.

It will be included in all machines that include the bluetooth feature,
currently the ccardxmx28js.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 meta-digi-arm/conf/machine/ccardxmx28js.conf  |  2 +-
 meta-digi-del/classes/del-image.bbclass       |  1 +
 .../tasks/task-del-bluetooth.bb               | 30 +++++++++++++++++++
 .../recipes-core/images/del-image-minimal.bb  |  1 +
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 meta-digi-del/recipes-connectivity/tasks/task-del-bluetooth.bb

diff --git a/meta-digi-arm/conf/machine/ccardxmx28js.conf b/meta-digi-arm/conf/machine/ccardxmx28js.conf
index 49e596c37..5647175d2 100644
--- a/meta-digi-arm/conf/machine/ccardxmx28js.conf
+++ b/meta-digi-arm/conf/machine/ccardxmx28js.conf
@@ -21,4 +21,4 @@ SERIAL_CONSOLE = "115200 ttyAM0"
 
 KERNEL_IMAGETYPE = "uImage"
 
-MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen bluetooth"
diff --git a/meta-digi-del/classes/del-image.bbclass b/meta-digi-del/classes/del-image.bbclass
index 9c2869a49..503e46023 100644
--- a/meta-digi-del/classes/del-image.bbclass
+++ b/meta-digi-del/classes/del-image.bbclass
@@ -7,6 +7,7 @@ PACKAGE_GROUP_del-gstreamer = "packagegroup-del-gstreamer"
 PACKAGE_GROUP_del-network = "packagegroup-del-network"
 PACKAGE_GROUP_del-wireless = "packagegroup-del-wireless"
 PACKAGE_GROUP_del-debug = "packagegroup-del-debug"
+PACKAGE_GROUP_del-bluetooth = "task-del-bluetooth"
 
 ## DEL rootfs final tuning
 del_rootfs_tuning() {
diff --git a/meta-digi-del/recipes-connectivity/tasks/task-del-bluetooth.bb b/meta-digi-del/recipes-connectivity/tasks/task-del-bluetooth.bb
new file mode 100644
index 000000000..a2427969c
--- /dev/null
+++ b/meta-digi-del/recipes-connectivity/tasks/task-del-bluetooth.bb
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2012 Digi International.
+#
+DESCRIPTION = "Bluetooth task for DEL image"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+ALLOW_EMPTY = "1"
+PR = "r0"
+
+#
+# Set by the machine configuration with packages essential for device bootup
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+PACKAGES = "\
+	task-del-bluetooth \
+	task-del-bluetooth-dbg \
+	task-del-bluetooth-dev \
+    "
+
+RDEPENDS_task-del-bluetooth = "\
+	bluez4 \
+	${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-del-bluetooth = "\
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
+
+
diff --git a/meta-digi-del/recipes-core/images/del-image-minimal.bb b/meta-digi-del/recipes-core/images/del-image-minimal.bb
index eb8463801..8dd085ec6 100644
--- a/meta-digi-del/recipes-core/images/del-image-minimal.bb
+++ b/meta-digi-del/recipes-core/images/del-image-minimal.bb
@@ -23,6 +23,7 @@ IMAGE_FEATURES += "del-network"
 IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "alsa", "del-audio", "", d)}'
 IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "accel-video", "del-gstreamer", "", d)}'
 IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "wifi", "del-wireless", "", d)}'
+IMAGE_FEATURES += '${@base_contains("MACHINE_FEATURES", "bluetooth", "del-bluetooth", "", d)}'
 
 IMAGE_ROOTFS_SIZE = "8192"