From patchwork Mon Mar 17 11:05:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 59240 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 499D0C28B28 for ; Mon, 17 Mar 2025 11:05:59 +0000 (UTC) Received: from AS8PR03CU001.outbound.protection.outlook.com (AS8PR03CU001.outbound.protection.outlook.com [52.101.71.130]) by mx.groups.io with SMTP id smtpd.web10.49556.1742209556295276925 for ; Mon, 17 Mar 2025 04:05:58 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=Hibuli8R; spf=permerror, err=parse error for token &{10 18 spf3.vaisala.com}: parse error for token &{10 18 _spf-dc57.sapsf.eu}: limit exceeded (domain: vaisala.com, ip: 52.101.71.130, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fo6G0JbYQJGDgM6Ur81qLjD96q9lfQ53mP0+oiv4+oevHcHKlM9HG5PDYUi2yXL+ulHPia9tp2HbxRaGnndd0xNsGpL464U5C3xs1ACCqPWA5fDAhB6r/TtwrHtOxTlqQXsVh2OJ8349ylxl2UG53vh9JCI6u7sOm1Cnrnhzwbe9d3yrmdh0kCUpreu9Wt67+8bRAEPP17OHVWJE8AsN5uxnCYnOUUoIYwKTe0T7Iha7WubstDW5RnU8UvYeqSvRwIaxJlKl00dXI50iAnlVIH6hh7Eivbtq/a+vQzS361CA7X+Rq9V06gZbv74cbUeWPeI5dCVCZ6+ccISHvPFp+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9YYj8M6Fww64vnRyuqlyWv9/XaApwCLwHqL/pFws8Wk=; b=WtepicqPK1dtWLV9HThSheu4ehrVAA7vjmb4Q+FLFaI6Z9R5o/ABO9g5fPe00XqBkn9I0UeGtNyb2E8AWhgYO6bNBwcAIKzD7CAhYrP16z8YhzYzRZIrlAdOBCVrZP4MmiGuy26S5il7iEy9ga6isDwCynXU/3+N2KmtIJ0RxNfoQsWl41Xu2VE/CGoRalujxplb/Bov6pxYC8KCSYyt0FOLVEC5rlbpUZZfdRWOGEbrfTeOPu6wColHfJRTBWUzoOu3tehIpLHtOg23AVkaCUEH17Ym9BX5w8fy9KB83gvYknawMdyaL9HgyJmm8aN/bKru0sPRy57jfW5RXUFpBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9YYj8M6Fww64vnRyuqlyWv9/XaApwCLwHqL/pFws8Wk=; b=Hibuli8RCRLR7B+uahd9WLg7aYotlQPPsT0RczVO+W143o0GB03NRyhLCCztn+2lojub87e9WojCwt3R70vWJUfLS48gPX0lYxXt/DYfJ1y/FOj8Cy3/fQ2vfPGobCUqwODmoo7V1Bz4+kmjGEcNpsWaow74ERqNRQ0Y1trD2D4s+nnhffEFY3mM3mgoFBQ+JQ5WioowakKFgcE9hlo5zhW5bH5/T8wD5gKWJTZ+SIB8lv8N6hbG+koCQY+TmW9cBKh1wZiyd701f1xBwhU7BP/1l/QstCe0MQDMrBAn1dHzqbQryrqHkNOIa5OVe+g7oI4JEj74DaWWqFSi4VQi6Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by DB9PR06MB8485.eurprd06.prod.outlook.com (2603:10a6:10:36f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Mon, 17 Mar 2025 11:05:53 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc%5]) with mapi id 15.20.8534.031; Mon, 17 Mar 2025 11:05:53 +0000 From: Niko Mauno To: openembedded-core@lists.openembedded.org CC: Qi.Chen@windriver.com, raj.khem@gmail.com, Niko Mauno Subject: [PATCH 1/2] Add VIRTUAL-RUNTIME_dbus variable Date: Mon, 17 Mar 2025 11:05:18 +0000 Message-ID: <20250317110519.1562513-2-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317110519.1562513-1-niko.mauno@vaisala.com> References: <20250317110519.1562513-1-niko.mauno@vaisala.com> X-ClientProxiedBy: GV3PEPF00007A87.SWEP280.PROD.OUTLOOK.COM (2603:10a6:158:401::614) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|DB9PR06MB8485:EE_ X-MS-Office365-Filtering-Correlation-Id: 6fb70820-5781-4ffd-9288-08dd6543af65 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: P4UtMqt68++SqQjtjiR3tIukTX6DaUzxFpnP2e4MEojkgdcYlSFboJix5cS801ZpoJ3LNnavg/Nzt3N32QGY1uvhJl9GgzDu+PlTa+Xiu4ZDrVB3s3SebkMRraptlTuQWVpUU8+t9LKTDRmy3MCpGGjIHCmeUQc5CNCGHzjsJTu079lkSKmbIqae1qVOu3WQMx+SiqOwjHjNMmezPIYVUBCrhxjxpNfxZbLXTd8wfv+l5zeg9jiPavT6q5nXr3wgyflh92tiyFwZQLRbzFXCTXMlOm/x+V6F07s/qu+YuEefJPXC5Bb5s1+ARzxY8R1id7sfM4+0ciVSt4jpW+xBbjAfl4ZrnajuDTpZZCI/JW55u7CrQFD0HHqLDPFDZ/JpGsP4D/3+nb9/JlogIbmhNruDb3gCKkhHJn7a+biamqatWmeoICPyZH11qoCE9yojsH6itHp7R3+IWCKrvfu3zvpZ3e13IjP0HEbs5JiCiYG9dUvmU8yLRuQ7wWO4HuJ44Ej4P7RpjbUeTjKOXnmXVqb/qO3dBqQ+xczigRQnkVh+fiWTWEdVBqHfUTqGMY+M/TLjywuQo0xYz38QTfcAX09ujMiREGXqZlBiwN/D8KnpnU1E9An/LfLt0aS/J89d8QklTC1ql1lLXP2zmq5oH+1/+cUqb9g2u5u6tK/p/EGH6m5PnxeaEhKN98ZSTEL/+SxcQxfviOHZOkrrbXJQ9KePupphY3D1GIt7fBeDMbG77LGWREAsqu2KANQOlQDZoT695WnmiC8lewgeO9091btOXelXJISGE7L2O+iO79Mo9TVzPm3vKUe9A8hPRQyNSmiIaDhnYmoLR/dk0Q5Jogw6zS4bpFkQm05ggHtesRelhG53BfrIMdWkjYatExK+vbYzyyZIBQq8rS4/4dTVlFbdh0zLdoklWINPfApiNx6UlZ7z0akwQCoP4orez+FUjPNyVnigcdmSlqv0RnGYezAWok+4mGNBcZ/S5gyqal5SGHXsgZg5FZWOWHRs6iiOGF6hMK/AkKVmpf/XHQmBqC0eCZ32N7x1XJwpAJs8hVnAWYxNA/oYp8xma3psjyLvpnZ1YUsJA7qiAcKzVDp3TeUFnyNGJKCkcLF8KGw0jWvggKTCnC99Q5clzEEIu2msDxIJwu77fTC/582TT9EraxhN+oeasaZC6ZqRz8KIR0ORCcgfj1X3QuvW1dXEFmfEHOJBsy08fJN84GySF0hz1pHKJT7dyQsinA3J/RgwYiO1gQ3ANOkleuiWoKXLKO71xdr3ud1eE7zu0nOveVMZMmjNjR43HnkFn5qeqtnq5CiMcAfrsNdzq1sG/BbGyPr1IyEvFRxbdnk+uNVcvwHW4qvtoctp1kKVFjSCvcKszIfVQbDqGziB7sDALp85FuK27nMRI3litB5aZNXUdK7vLuPH7Cc55nZJx1D0oGeNCE/OZWhGTneRqRaR/XcAqzd7 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KLp2U5Y4eC0UV+OHVcuOmCojyNwXUyrusWZuk+O9ZTH2ynQN030W5bu5fW1kNh0dxXYhZo1rXoH4+EubQWYpGECqSkQV48X1x2byU+sF6WN9WF/p8D4XUzewS2nUXPCZ+EzsWuw9GbjUzEYIfUWDMrDYL2a/+5lqs/5goMH/7metmusm55AAN5Q9abuVT8SU0NCi6pVGNsAHaSw/AqzR1yhbN5I0M9TUpFLVrE0aATBasG70Hyp/85LDCOj04svsZyaSrVcnyQSi7XyA+gQewI0Gdm1lAQPJYdwUSa7viohLIi5HpeJhjzm3XK3qAF7XtXPShBlo6tadoXz9+m0cvm+cnpv7riSgeXK2O2IOaQCtLL2VfELY0jH9TkT+t36Gf7Bmh28w4y9nFT8Yf3g0nh0E7rBe1iO5goH683zK1IvVDFrdgqnNN2xRurbck4RmW53FMdE4fZgKsgjeMA2pmQOhkAKIAoow3Vfu7KdfEFQbKyK7wnXWTh9n9M+dNYSs1gJmGMs4IsiqgC1o+S5AcGNiA1M1FJTMw4VoOoH4KkbxOm9n7ODlhY/N0mw520C6hwoHRgVREGuF4Mo6/F4oJOAkzYovmj8obiLpjv3uqu0wn0688L4sf62pXeDmrRs79udjCGc1hRb5e1NrdyyE/jc013PyAu+j85rPObfxPafCgwOTcWRR6PKnbpR/g0eEH+qeoTsh+HpOyAplP2GwotqYYlLAL8b4BaHDP/0lud13u7HjktNmYko+RvO8LdqVoBtkoDOTz4t0TBMpvtyd5uIH2ym3my/FPWCFAuRsN/wwpFGvMto+UdR2x7TYf0i0kkcgnHBWipPoYqE2NqCba4y1izxZYs5DGWRMbXFQycvdaS3VMZsZRQCQG+Qc1j6RSbsHeTBk6YGiMeZwCLIo0LhfR0PSfvnnvTO795/MVUqsONKTC0WRAAzzE0h89p6mlNUwfIwVf0Nc3mkrdiabkbsbUF0KskbfiHCLMhCwlg/ophFUNHrH1owNbLxabaj+D6JXv5o/OlCrQC9K0Sqcl694Dz0spca1Chyk0T+saVQZLfF71rl2xL99D4LUIr0Gt0utQ8XzdTRtf+1Kxr3cMfesg45wCZDZmZsQH9xsAGqWCSTO6fsVFS5Ypl/uVZBn/7Dabe2KRRbdwwkD3sc/nenFh6Qzq5qFie9/20WhFDqOtMC/tSgkX+PGoJBidBIm43biufgTWIIPiJOkF6H18mCnYlNqTKDBjqbwXUJTjuPxy+P3lIU+aYzoJWgxPHpdXTCj5itkrj3eKDBZPvI/O8rEQ9kPbZZHVMLmrE7n2i25SoB8NxmBqwWFp45P+w8Uc7Zn9bCjaKwnS1KccCrpxXI8kyKhvn0G0/+qWXULjkgxz/1QzgcWulezLqd0BYsiz5G2ig9fVi7E5Y5ouY2NNxrAp4l/9fRjizIinsHuUKPKNVCRgTRVdVxVKhSDR2X+IhtEWghy9LdwkHEmQzBz7HQDRRuOtlWNLsMHs1qjVdnTt6HucWeYQ9RecfowDNFepdStTDRvt36fjzfkC1KM1me8FdL/aRVJdT+rDsu/QODow8MTj4COo9oQxBg84PjX6nzO2YlNEbGj4Hwnlp2ynw== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6fb70820-5781-4ffd-9288-08dd6543af65 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2025 11:05:53.7486 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JR933zJauNStsJmK6d7c1ldnKLgFj3U3opfyoY3tgNZTCnqFL5BWjlIbL7/FZLuPDaxKH+0yeY6UHiZk5xvc5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR06MB8485 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 17 Mar 2025 11:05:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213071 The default value of this new variable can be overridden for instance in local.conf file like VIRTUAL-RUNTIME_dbus = "dbus-broker" to use an alternative implementation of D-Bus, recipe for which is currently available under meta-openembedded/meta-oe/recipes-core/dbus/ The functionality is accomplished by changing references to 'dbus' in recipe RDEPENDS and RRECOMMENDS to '${VIRTUAL-RUNTIME_dbus}'. Signed-off-by: Niko Mauno --- meta/conf/distro/include/default-providers.inc | 1 + meta/recipes-connectivity/bluez5/bluez5.inc | 2 +- meta/recipes-connectivity/connman/connman.inc | 2 +- meta/recipes-connectivity/neard/neard_0.19.bb | 2 +- meta/recipes-connectivity/ofono/ofono_2.14.bb | 2 +- meta/recipes-core/dbus/dbus_1.16.2.bb | 4 +++- meta/recipes-core/glib-2.0/glib.inc | 2 +- meta/recipes-core/systemd/systemd_257.3.bb | 2 +- 8 files changed, 10 insertions(+), 7 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d3eefb754b..cebd0400f4 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -31,6 +31,7 @@ VIRTUAL-RUNTIME_base-utils ?= "busybox" VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock" VIRTUAL-RUNTIME_base-utils-syslog ?= "busybox-syslog" VIRTUAL-RUNTIME_keymaps ?= "keymaps" +VIRTUAL-RUNTIME_dbus ?= "dbus" # # Default recipe providers diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index d31f4e2295..76d8d9ccfe 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=0ad83ca0dc37ab08af448777c581e7ac" DEPENDS = "dbus glib-2.0" -RDEPENDS:${PN} += "dbus" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_dbus}" PROVIDES += "bluez-hcidump" RPROVIDES:${PN} += "bluez-hcidump" diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 133e8616da..fa546ee872 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -119,7 +119,7 @@ RPROVIDES:${PN} = "\ " RDEPENDS:${PN} = "\ - dbus \ + ${VIRTUAL-RUNTIME_dbus} \ " PACKAGES_DYNAMIC += "^${PN}-plugin-.*" diff --git a/meta/recipes-connectivity/neard/neard_0.19.bb b/meta/recipes-connectivity/neard/neard_0.19.bb index 94df1ac3d6..3652d3aa30 100644 --- a/meta/recipes-connectivity/neard/neard_0.19.bb +++ b/meta/recipes-connectivity/neard/neard_0.19.bb @@ -37,7 +37,7 @@ do_install:append() { fi } -RDEPENDS:${PN} = "dbus" +RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_dbus}" # Bluez & Wifi are not mandatory except for handover RRECOMMENDS:${PN} = "\ diff --git a/meta/recipes-connectivity/ofono/ofono_2.14.bb b/meta/recipes-connectivity/ofono/ofono_2.14.bb index 9a91afaa7b..400b5611fd 100644 --- a/meta/recipes-connectivity/ofono/ofono_2.14.bb +++ b/meta/recipes-connectivity/ofono/ofono_2.14.bb @@ -41,7 +41,7 @@ PACKAGES =+ "${PN}-tests" FILES:${PN} += "${systemd_unitdir}" FILES:${PN}-tests = "${libdir}/${BPN}/test" -RDEPENDS:${PN} += "dbus" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_dbus}" RDEPENDS:${PN}-tests = "\ python3-core \ python3-dbus \ diff --git a/meta/recipes-core/dbus/dbus_1.16.2.bb b/meta/recipes-core/dbus/dbus_1.16.2.bb index 9475e55b57..0160f403a1 100644 --- a/meta/recipes-core/dbus/dbus_1.16.2.bb +++ b/meta/recipes-core/dbus/dbus_1.16.2.bb @@ -104,7 +104,9 @@ FILES:${PN}-tools = "${bindir}/dbus-uuidgen \ ${bindir}/dbus-update-activation-environment \ " FILES:${PN}-lib = "${libdir}/lib*.so.*" -RRECOMMENDS:${PN}-lib = "${PN}" +RRECOMMENDS:${PN}-lib:class-target = "${VIRTUAL-RUNTIME_dbus}" +RRECOMMENDS:${PN}-lib:class-native = "dbus" +RRECOMMENDS:${PN}-lib:class-nativesdk = "dbus" FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" RDEPENDS:${PN}-ptest += "bash make dbus" diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 9d50a95c40..67860ddef0 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -162,7 +162,7 @@ RDEPENDS:${PN}-ptest += "${PN}-utils" RDEPENDS:${PN}-ptest += "\ coreutils \ libgcc \ - dbus \ + ${VIRTUAL-RUNTIME_dbus} \ desktop-file-utils \ gnome-desktop-testing \ tzdata \ diff --git a/meta/recipes-core/systemd/systemd_257.3.bb b/meta/recipes-core/systemd/systemd_257.3.bb index 64fb8fe69a..24aad11c0a 100644 --- a/meta/recipes-core/systemd/systemd_257.3.bb +++ b/meta/recipes-core/systemd/systemd_257.3.bb @@ -752,7 +752,7 @@ FILES:${PN} = " ${base_bindir}/* \ FILES:${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" -RDEPENDS:${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck util-linux-swaponoff util-linux-mkswap" +RDEPENDS:${PN} += "kmod ${VIRTUAL-RUNTIME_dbus} util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck util-linux-swaponoff util-linux-mkswap" RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" RDEPENDS:${PN} += "volatile-binds"