| Message ID | 20250317110519.1562513-3-niko.mauno@vaisala.com |
|---|---|
| State | New |
| Headers | show |
| Series | Support using alternative runtime D-Bus implementation | expand |
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/2-2-Add-PREFERRED_RPROVIDER_dbus-x11-variable.patch FAIL: test shortlog format: Commit shortlog (first line of commit message) should follow the format "<target>: <summary>" (test_mbox.TestMbox.test_shortlog_format) PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files) PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) 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 lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) 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 length (test_mbox.TestMbox.test_shortlog_length) PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files) 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: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) 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 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!
On 17 Mar 2025, at 11:05, Niko Mauno via lists.openembedded.org <niko.mauno=vaisala.com@lists.openembedded.org> wrote: > > Use new PREFERRED_RPROVIDER_dbus-x11 variable to determine dbus-x11 > provider. This facilitates using the new VIRTUAL-RUNTIME_dbus variable > for selecting preferred D-Bus implementation. dbus-x11 is a historical package name that is only provided by the dbus recipe and sbouldn’t be used anywhere else. Ross
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index cebd0400f4..5c4ff3094c 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -60,6 +60,7 @@ PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig" PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconfig" PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconfig-native" PREFERRED_RPROVIDER_initd-functions ?= "initscripts" +PREFERRED_RPROVIDER_dbus-x11 ?= "${VIRTUAL-RUNTIME_dbus}" PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa" diff --git a/meta/recipes-core/dbus/dbus-glib_0.112.bb b/meta/recipes-core/dbus/dbus-glib_0.112.bb index 4acf435694..e0912e5d1e 100644 --- a/meta/recipes-core/dbus/dbus-glib_0.112.bb +++ b/meta/recipes-core/dbus/dbus-glib_0.112.bb @@ -33,7 +33,8 @@ FILES:${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" FILES:${PN}-dev += "${bindir}/dbus-binding-tool" -RDEPENDS:${PN}-tests += "dbus-x11" +RDEPENDS:${PN}-tests:class-target += "${PREFERRED_RPROVIDER_dbus-x11}" +RDEPENDS:${PN}-tests:class-native += "dbus" FILES:${PN}-tests = "${datadir}/${BPN}/tests" BBCLASSEXTEND = "native" diff --git a/meta/recipes-core/dbus/dbus_1.16.2.bb b/meta/recipes-core/dbus/dbus_1.16.2.bb index 0160f403a1..ac9d73da9a 100644 --- a/meta/recipes-core/dbus/dbus_1.16.2.bb +++ b/meta/recipes-core/dbus/dbus_1.16.2.bb @@ -67,12 +67,11 @@ CONFFILES:${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session DEBIANNAME:${PN} = "dbus-1" -OLDPKGNAME = "dbus-x11" -OLDPKGNAME:class-nativesdk = "" - # for compatibility -RPROVIDES:${PN} = "${OLDPKGNAME}" -RREPLACES:${PN} += "${OLDPKGNAME}" +RPROVIDES:${PN}:class-target = "dbus-x11" +RPROVIDES:${PN}:class-native = "dbus-x11" +RREPLACES:${PN}:class-target += "dbus-x11" +RREPLACES:${PN}:class-native += "dbus-x11" FILES:${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-cleanup-sockets \ diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index 91db7ed33b..26cb588999 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb @@ -31,5 +31,5 @@ RDEPENDS:${PN}-utils = "\ xmodmap \ xdpyinfo \ xinput-calibrator \ - dbus-x11 \ + ${PREFERRED_RPROVIDER_dbus-x11} \ "
Use new PREFERRED_RPROVIDER_dbus-x11 variable to determine dbus-x11 provider. This facilitates using the new VIRTUAL-RUNTIME_dbus variable for selecting preferred D-Bus implementation. Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> --- meta/conf/distro/include/default-providers.inc | 1 + meta/recipes-core/dbus/dbus-glib_0.112.bb | 3 ++- meta/recipes-core/dbus/dbus_1.16.2.bb | 9 ++++----- .../packagegroups/packagegroup-core-x11.bb | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-)