From 6345d46ce1bba1f937b61f1a15dc61a1f22fc53d Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 13 May 2025 13:19:47 +0200 Subject: [PATCH] bluez5: remove btconfig binary in ccimx6 platforms poky commit 3c9b461dd0d26a5f6941000d839636ad32cd6f29 added this binary to the bluez5-noinst-tools package, and it has the same exact path as the one from our dey-examples-btconfig package. This causes a conflict when both packages are installed in the same image. Judging by bluez5's btconfig sources, it's merely a skeleton without any real functionality, so simply remove it to avoid the conflict. https://onedigi.atlassian.net/browse/DEL-9612 Signed-off-by: Gabriel Valcazar --- .../recipes-connectivity/bluez/bluez5_5.72.bbappend | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.72.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.72.bbappend index 5a9a085d7..ef5e3e391 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.72.bbappend +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.72.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2024, Digi International Inc. +# Copyright (C) 2015-2025, Digi International Inc. FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:${THISDIR}/${BP}:" @@ -72,4 +72,8 @@ PACKAGECONFIG:append = " health-profiles \ FILES:${PN} += " ${sysconfdir}/bluetooth/main.conf*" +# bluez5's btconfig binary conflicts with dey-examples-btconfig. The tool +# doesn't seem to do much anyway, so just remove it. +NOINST_TOOLS_BT:remove:ccimx6 = "tools/btconfig" + PACKAGE_ARCH = "${MACHINE_ARCH}"