From ff08db0c2f041a7699844357b38e473ad8e426f2 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 24 Mar 2020 15:33:47 +0100 Subject: [PATCH] zeus migration: bluetooth: remove bluetooth class support Bluetooth class to support the bluez4/bluez5 distro features, was removed due to bluez4 was removed from meta-oe some time ago. This commit simplifies the requeriments adding directly the bluez5, instead of the intermediate bluetooth class. https://jira.digi.com/browse/DEL-7013 Signed-off-by: Arturo Buzarra --- .../packagegroups/packagegroup-dey-bluetooth.bb | 12 +++++++----- .../dey-examples/dey-examples-bt-gatt-server.bb | 4 +--- .../recipes-digi/dey-examples/dey-examples-bt.bb | 4 +--- .../dey-examples/dey-examples-btconfig.bb | 4 +--- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb index ad8f336cc..c2c551455 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb @@ -1,16 +1,18 @@ # -# Copyright (C) 2012-2018 Digi International. +# Copyright (C) 2012-2020 Digi International. # SUMMARY = "Bluetooth packagegroup for DEY image" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup bluetooth -MACHINE_BLUETOOTH_EXTRA_INSTALL ?= "${@bb.utils.contains('BLUEZ', 'bluez5', 'bluez5-init', '', d)}" +inherit packagegroup + +MACHINE_BLUETOOTH_EXTRA_INSTALL ?= "bluez5-init" RDEPENDS_${PN} = " \ - ${BLUEZ} \ - ${@bb.utils.contains('BLUEZ', 'bluez5', 'bluez5-noinst-tools bluez5-obex', '', d)} \ + bluez5 \ + bluez5-noinst-tools \ + bluez5-obex \ ${MACHINE_BLUETOOTH_EXTRA_INSTALL} \ " diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt-gatt-server.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt-gatt-server.bb index dfb5fa273..b9b502dfc 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt-gatt-server.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt-gatt-server.bb @@ -7,9 +7,7 @@ SECTION = "examples" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -inherit bluetooth - -DEPENDS = "${BLUEZ}" +DEPENDS = "bluez5" S = "${WORKDIR}/git/ble-gatt-server-example" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb index f992ca759..0218e53c4 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb @@ -5,9 +5,7 @@ SECTION = "examples" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -inherit bluetooth - -DEPENDS = "${BLUEZ}" +DEPENDS = "bluez5" SRC_URI = "file://bt_test" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb index 3b4c56161..3ee512319 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb @@ -5,9 +5,7 @@ SECTION = "examples" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -inherit bluetooth - -DEPENDS = "${BLUEZ}" +DEPENDS = "bluez5" SRC_URI = "file://btconfig"