bluez5: backport configuration file shipping from 5.73 to 5.72

Commit 49391fdcf71b32c5fd3c7b134c1d1c45cc1db388 removed the shipping of
configuration files from install task too early. The configuration files
shipping has been added to bluez5 5.73 whereas scarthgap is on older
version 5.72. To address this issue backport the patch from 5.73 to 5.72
and add it to the bluez5 recipe.

Signed-off-by: Catalin Popescu <catalin.popescu@leica-geosystems.com>
---
 meta/recipes-connectivity/bluez5/bluez5.inc   |  1 +
 ...l-config-files-with-enable-datafiles.patch | 60 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-build-ship-all-config-files-with-enable-datafiles.patch

If this is for scarthgap, you need to add [scarthgap] to the subject.

Alex

On Wed, 8 Jan 2025 at 11:47, Catalin Popescu via
lists.openembedded.org
<catalin.popescu=leica-geosystems.com@lists.openembedded.org> wrote:
>
> Commit 49391fdcf71b32c5fd3c7b134c1d1c45cc1db388 removed the shipping of
> configuration files from install task too early. The configuration files
> shipping has been added to bluez5 5.73 whereas scarthgap is on older
> version 5.72. To address this issue backport the patch from 5.73 to 5.72
> and add it to the bluez5 recipe.
>
> Signed-off-by: Catalin Popescu <catalin.popescu@leica-geosystems.com>
> ---
>  meta/recipes-connectivity/bluez5/bluez5.inc   |  1 +
>  ...l-config-files-with-enable-datafiles.patch | 60 +++++++++++++++++++
>  2 files changed, 61 insertions(+)
>  create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-build-ship-all-config-files-with-enable-datafiles.patch
>
> diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
> index 3f2f096aac..d7283fba00 100644
> --- a/meta/recipes-connectivity/bluez5/bluez5.inc
> +++ b/meta/recipes-connectivity/bluez5/bluez5.inc
> @@ -54,6 +54,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
>             ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
>             file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
>             file://0001-test-gatt-Fix-hung-issue.patch \
> +           file://0001-build-ship-all-config-files-with-enable-datafiles.patch \
>             "
>  S = "${WORKDIR}/bluez-${PV}"
>
> diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-build-ship-all-config-files-with-enable-datafiles.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-build-ship-all-config-files-with-enable-datafiles.patch
> new file mode 100644
> index 0000000000..275ca9f493
> --- /dev/null
> +++ b/meta/recipes-connectivity/bluez5/bluez5/0001-build-ship-all-config-files-with-enable-datafiles.patch
> @@ -0,0 +1,60 @@
> +From be0e796299b0e7a73bf06c5655b56180588550b0 Mon Sep 17 00:00:00 2001
> +From: Emil Velikov <emil.velikov@collabora.com>
> +Date: Mon, 12 Feb 2024 20:02:44 +0000
> +Subject: [PATCH] build: ship all config files with --enable-datafiles
> +
> +Currently we ship only the dbus/systemd policy files and omit the other
> +four - /etc/bluetooth/{main,mesh-main,input,network}.conf.
> +
> +Outside of those files, there is no documentation what the defaults are
> +and the other possible options. A number of distributions (Arch, Gentoo,
> +Fedora) have opted to manually copy those into the package. Alas this
> +does not scale and leaves other distros at disadvantage, in a sense.
> +
> +Note: we need a custom install target to ensure confdir and statedir
> +have the correct permissions.
> +
> +Upstream-Status: Backport [5.73]
> +---
> + Makefile.am   | 8 +++++++-
> + Makefile.mesh | 1 +
> + 2 files changed, 8 insertions(+), 1 deletion(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 2b1b9acdf..2cbfed2db 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -31,11 +31,17 @@ AM_LDFLAGS = $(MISC_LDFLAGS)
> + confdir = $(sysconfdir)/bluetooth
> + statedir = $(localstatedir)/lib/bluetooth
> +
> ++install-data-hook:
> ++      install -dm555 $(DESTDIR)$(confdir)
> ++      install -dm700 $(DESTDIR)$(statedir)
> ++
> + if DATAFILES
> + dbusdir = $(DBUS_CONFDIR)/dbus-1/system.d
> + dbus_DATA = src/bluetooth.conf
> +
> +-conf_DATA =
> ++conf_DATA = src/main.conf
> ++conf_DATA += profiles/input/input.conf
> ++conf_DATA += profiles/network/network.conf
> + state_DATA =
> + endif
> +
> +diff --git a/Makefile.mesh b/Makefile.mesh
> +index ea50383d2..e4c9fa6a3 100644
> +--- a/Makefile.mesh
> ++++ b/Makefile.mesh
> +@@ -3,6 +3,7 @@ if MESH
> +
> + if DATAFILES
> + dbus_DATA += mesh/bluetooth-mesh.conf
> ++conf_DATA += mesh/mesh-main.conf
> + endif
> +
> + if SYSTEMD
> +--
> +2.34.1
> +
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#209546): https://lists.openembedded.org/g/openembedded-core/message/209546
> Mute This Topic: https://lists.openembedded.org/mt/110494379/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/bluez5-backport-configuration-file-shipping-from-5.73-to-5.72.patch

FAIL: test Signed-off-by presence: A patch file has been added without a Signed-off-by tag: '0001-build-ship-all-config-files-with-enable-datafiles.patch' (test_patch.TestPatch.test_signed_off_by_presence)

PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!