From c20e72263624e6c15f0ebbcc5c87d18a247e0192 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 13 May 2024 17:36:12 +0200 Subject: [PATCH] bluez5: adapt bbappend to 5.72 This is the version of the recipe provided by poky in Yocto 5.0 scarthgap. Aside from updating the verison number, explicitly create /etc/bluetooth directory during installation. The creation of this directory was removed from the recipe's base do_install() in poky (see poky commit 55692591227eaac2d50ab339eea87ddca395f6df), so we need to create it in our bbappend to be able to add files to it. https://onedigi.atlassian.net/browse/DEL-9011 Signed-off-by: Gabriel Valcazar --- meta-digi-dey/conf/distro/dey.conf | 4 ++-- .../0001-bluetooth.service-add-Digi-customizations.patch | 0 .../0002-hcitool-do-not-show-unsupported-refresh-option.patch | 0 ...03-hcitool-increase-the-shown-connection-limit-to-20.patch | 0 .../0004-port-test-discovery-to-python3.patch | 0 ...Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch | 0 ...hciattach_rome-Respect-the-user-indication-for-noflo.patch | 0 .../0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch | 0 .../0008-hciattach-Add-verbosity-option.patch | 0 ...009-bdaddr-support-setting-MAC-address-for-NXP-iw612.patch | 0 .../bluez/{bluez5_5.65.bbappend => bluez5_5.72.bbappend} | 3 ++- 11 files changed, 4 insertions(+), 3 deletions(-) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.65 => bluez5-5.72}/0001-bluetooth.service-add-Digi-customizations.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.65 => bluez5-5.72}/0002-hcitool-do-not-show-unsupported-refresh-option.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.65 => bluez5-5.72}/0003-hcitool-increase-the-shown-connection-limit-to-20.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.65 => bluez5-5.72}/0004-port-test-discovery-to-python3.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.65 => bluez5-5.72}/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.65 => bluez5-5.72}/0006-hciattach_rome-Respect-the-user-indication-for-noflo.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.65 => bluez5-5.72}/0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.65 => bluez5-5.72}/0008-hciattach-Add-verbosity-option.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5-5.65 => bluez5-5.72}/0009-bdaddr-support-setting-MAC-address-for-NXP-iw612.patch (100%) rename meta-digi-dey/recipes-connectivity/bluez/{bluez5_5.65.bbappend => bluez5_5.72.bbappend} (96%) diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 7ccce5354..c9b9b6df7 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -57,8 +57,8 @@ FEATURE_PACKAGES_dey-wireless = "packagegroup-dey-wireless" # Our layer only provides version 5.41, which we want to keep because # it was used for Bluetooth certification. However by default the newer -# 5.65 version should be used, which is provided by the poky layer. -PREFERRED_VERSION_bluez5 ?= "5.65" +# 5.72 version should be used, which is provided by the poky layer. +PREFERRED_VERSION_bluez5 ?= "5.72" # There's a generic opencl-headers recipe in the thud branch of # meta-openembedded, but we should use the package provided by the imx-gpu-viv diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0001-bluetooth.service-add-Digi-customizations.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0001-bluetooth.service-add-Digi-customizations.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0001-bluetooth.service-add-Digi-customizations.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0001-bluetooth.service-add-Digi-customizations.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0002-hcitool-do-not-show-unsupported-refresh-option.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0002-hcitool-do-not-show-unsupported-refresh-option.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0002-hcitool-do-not-show-unsupported-refresh-option.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0002-hcitool-do-not-show-unsupported-refresh-option.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0003-hcitool-increase-the-shown-connection-limit-to-20.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0003-hcitool-increase-the-shown-connection-limit-to-20.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0003-hcitool-increase-the-shown-connection-limit-to-20.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0003-hcitool-increase-the-shown-connection-limit-to-20.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0004-port-test-discovery-to-python3.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0004-port-test-discovery-to-python3.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0004-port-test-discovery-to-python3.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0004-port-test-discovery-to-python3.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0005-Add-hciattach-rome-support-for-Qualcomm-chip-QCA6564.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0006-hciattach_rome-Respect-the-user-indication-for-noflo.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0006-hciattach_rome-Respect-the-user-indication-for-noflo.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0006-hciattach_rome-Respect-the-user-indication-for-noflo.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0006-hciattach_rome-Respect-the-user-indication-for-noflo.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0007-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0008-hciattach-Add-verbosity-option.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0008-hciattach-Add-verbosity-option.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0008-hciattach-Add-verbosity-option.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0008-hciattach-Add-verbosity-option.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0009-bdaddr-support-setting-MAC-address-for-NXP-iw612.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0009-bdaddr-support-setting-MAC-address-for-NXP-iw612.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.65/0009-bdaddr-support-setting-MAC-address-for-NXP-iw612.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.72/0009-bdaddr-support-setting-MAC-address-for-NXP-iw612.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.65.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.72.bbappend similarity index 96% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5_5.65.bbappend rename to meta-digi-dey/recipes-connectivity/bluez/bluez5_5.72.bbappend index 8d57c5773..5a9a085d7 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.65.bbappend +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.72.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2023, Digi International Inc. +# Copyright (C) 2015-2024, Digi International Inc. FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:${THISDIR}/${BP}:" @@ -28,6 +28,7 @@ SRC_URI:append:ccimx6sbc = " \ " do_install:append() { + install -d ${D}${sysconfdir}/bluetooth/ install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/ sed -i -e "s,##BT_DEVICE_NAME##,${BT_DEVICE_NAME},g" \ ${D}${sysconfdir}/bluetooth/main.conf