From patchwork Thu Apr 10 13:40:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Qi" X-Patchwork-Id: 61114 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 14B63C369A9 for ; Thu, 10 Apr 2025 13:40:41 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.34790.1744292432598170160 for ; Thu, 10 Apr 2025 06:40:32 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=61957cd107=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53A1BJf3021255 for ; Thu, 10 Apr 2025 13:40:31 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45tsr1q18p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Apr 2025 13:40:31 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vj97uo0qWF603G1iv+eKRDLGnotS2QQucD49GDiEVTHIoB+3zm3HiAQitTfTGvWhOohhPq5D21CZunsha7FZ5VGMEesYAQxooT8TSC2NLQaj5olUh9Am1keinCsO1JHbCcCBTjxs6VHWc/PH4x8TaHxkn6K3jzSXCEiSl26PDrs92QzgWdDPeTCbX4pOfCTCW2oNrYfSLLI0hVxnpQY3i/fOBG+U8oWdsA+OiEbD33sXvud0y/uiBJQ2oMLAlFACsoOPPq5xw1gsrITtaWbxUjtzgwaiJstvMX6jVzLSjex/WG7JfvejNMHav31V0sYoWSF7dabhFnp9CCE0IKcb9A== 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=nFkG2UD95c+oOMnkLCmu34I0My8b82q2AnnsFwo3x/g=; b=TlktjQVmCpBOHt6Ga0rxe0Fj8lvPaEQdppA4rczbWq0Gho5tZBybVEe0TJ3Ue86Lrqy1irBJWhvgs0EptdYX06Ga6lEIvFnkJWxEs9myOV402BoEy5kiGJEQO5FhKQuLGhFmyKC6NORzlY3c8/wiVb4XVOYvtcQRJbZBEn2OUTATfp+6n3uBLKMCdpG4GQotXdQE1Y7In2Sy5vDe65a/6LmTbvzSBHlfxhfDYTELYxED8DGjS/VgtFU7hwY356qPFoeD8f1wu04lLtAjnaw6dcBqFsUv6vw2IsK8grZXQe0vwjowJawkbwSJ/JdnOHSpaQyW8qzWsntEWkFfWk+kQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) by MW4PR11MB6812.namprd11.prod.outlook.com (2603:10b6:303:1ee::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Thu, 10 Apr 2025 13:40:29 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%4]) with mapi id 15.20.8606.029; Thu, 10 Apr 2025 13:40:28 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V2 1/4] classes/recipes: remove unnecessary qemu inherit and use qemuwrapper-cross Date: Thu, 10 Apr 2025 06:40:18 -0700 Message-ID: <20250410134021.1299595-1-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: SJ0PR03CA0065.namprd03.prod.outlook.com (2603:10b6:a03:331::10) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|MW4PR11MB6812:EE_ X-MS-Office365-Filtering-Correlation-Id: 94ba2277-e893-4c15-0f8b-08dd78354140 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: ZIR61xGcYafZEuZQppN/Vr4zQ3M4G6sLVaD1DekxLod7cv/EQ0lfU14X/GggaaqeWEDV5J4cqohCWIfAEd6qXqPvstmOg++InFC9HXubp1ZIy6Mm1G5CygZIwEGSHEHfjx9NN0NMlNhO0b9Hu80ZyE6jmPczNBHggTQaUCuOZyJMUldbKKQtVQrA575cOV1Voltpgn1YtR/jDpXe2ZewcQ4IyIIcEqf8x4lvR7EPDCAzwdKID9E0wSVfqgj79CGm91O2qwVN3kQFfUqvYLI0VaVm7rML+6nUHOF3xINQiczQOVziey4XEG4/kiUrfhYl8vXh07tizX3Ag+UKrqRPMxS+Fg+7Q10GqdDQ+mZ3IMDC6V+S5vxT2Tyf4wHjW/NS8bdlerFEimFvNzkATPyn9RK7k1czF2bbWstw8o876A7BTX+4K3a5xJlVqxnJbTLox8tpzGbZ8+TfCOFfGOQETVifIRCNyGWv6CcnCohh11T5jF0r4bWXQ8hmueI48DgdmvtfMEED9K5rRcy5sfs4NC1WSgX+dbe/V7d9o5fNKq5nuiwjGK0GP0f8wKQyOD9xihpbn4dCpaGC7NOApf0pFdx6fbUXzwQMLtbl7ZsLH94HOvRyVb8+ECEs4vDNL0tvFQQwHI8n3Wv3HN0dq++ZNa6ct/PIy6DVK0IwWlOLcED7tJMQw35qMueq11L/7SO0KWoR1Mp0n2wk2+uS911TEJ697FEfC+LBDgNge84ovuhmPtRYOIu1UrTos77jCveY8Ef7L/LkAK51hvNllNtFp6HkICpQ/hFNb/HwpBUToIEmNC3BNBXGhPzBys9paCaXXISdD9ZOFYDEQTMCnApw3mkcju2qDcn+oWih06o+LLObPTPwB31fqvlRVPlNBD43JjOxglOBY1zadvCwRBbPR3A4q2KUX6DXhe6EEn2OzusU1LNTVdpZw+RRoP3vTodvVlccoUzfseuOGaIqZLDuYCoWtaiXsCDReubIEjLX1CosuCnPaxcwWiBS+i44pQWKqviNvR8bIzAdHYHt97rAGXgF0Fpp8YNNI5M0Q/jjwsWNtP5v+1qX/0kv4MwKmM2j447ygBSPIIXn5DQJLbhXOIc9/oEqsrAltNlyAOw+WmCGB0pSvx/A8bkbZrXVa9Je5UAOWAE/T+ls9D4iODw+6N4Ph6fgg/Tqls4Rklb8jezNF99cLdHHDLQZxWjIjohVGX7B7ZD4F2KmmYve8mWlUR2hm/2MaxRd7nFTNhS0qCBAci7+WW3I9PJeiQNsXEaPsNx2qNkVEm01cynZIAGg4yxRP6qILjoD0WGwgqwLqVF9F8tk/8fnCsBsmwrat3hce2l2Y8RTRCJW4lAJu+Z8eGci23qbpRaX+5SIDRD0dVxGYBRLYuAen/MBu2UD3xiPC+TcKN8tbovnBSpaR8YgBYfMncx9FzRRsmnYKm+WzCp58Abh3XgKgVKV1tEu0BF4NxgutxIavH4OG3rzRbvp6I++XgOJ32fvo3YuXGYCyjI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5602.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YRoF69EZyBUPIPzNQVmdC51sDbsPqtdG7FmbBJ5IMjYjNhFLCMTkCAsZijyQrlJmHdRNTnjZyNg8q6j/u0aLpQfvSeU6PhMTELEwxuJDcdzFXtaKXPtzRPv9f9ULAf/6YuPgR9f79qdVc45aBg+/J0LzO+N32F9p00S3s2CcMA/UtFz2q05yU3Zgbv9hvJFIsTvaTQ8Vg6vEw7d/2mybNdu/qLYTbSeOsAEgOQ+2CS+gRfQKTqiJ0vcZCXpIfXEPQJbzrzjqe8xAaKS7iXInCfwA7kDNnpru0ppDun6ODozlxWELOMm1k3edUgxoxEpOGcDMXEfs0+jzYgK/EKOVRWDEMIGlx7ARHRSvvKXsh4rVKH9PE5EDd+0TGilNQtZhFwUH62x6e8osQHWvTQCtFLb84Qf/tB6TG+K0AClu13g4EK3W6jA64xs9Tc2ehWyqjrkvOO3Nwv65VwYBAsVK5ov5uULYJNUkpMov9C7xW6sIS4TsN12vPmNzWDrR9Akf0/xHIcISUqZmumWw+KExI4uz3b2lKvUDGlHGHrZV+sNj3SZBfR4nHZh4kmaIqb0JXM8iA8cf+Nzt9/y0rqd4CPQ7Zne1mGn3wxLbIH/FxhwwpbbNcAfowC6D+EoWm72PRVsR+dfZpSgHij55TiMaJS4lQhDmxNPEuALQB7+X/QtVMI3vmtnVJxzLO2z7hCA4WPMFWhxtAN2q+CdpegRv+2TUjJf0UjQB+igEPrsh/m+4M3TP6201zXDaZqsQb8dUJCYKzRYk9kGzOD3j1FgTz4xq7sQNDivVuNoJIdSIGI+xpXBI51jeh6TK8XF5PX1y4Ekc1hkPJJ3ArUIJGcbCdaww35iZ5/jsLHglp8mAzPNAzgbTEvGoMn9PZgghHt9j0roCr6+iukJsFxnYSEUiPbXd4PhLHX9GZQn/Nn1gSR2YXZyXlWuv8EYA3nV8uoFpdvLH9VQId4V0WHriT3fCc0O7fQULUBMAoLi/vOXBn9esm695AcIBYc5bsI34J0Oh+ynIz7IVjO+5mVzzhaO0/56DQhsIGm/GdFHSy3yAwavFCOzC9jQ5AAn0BJHH0pYJ6rjLffxnDKu2AvH+ZIv6bKbaDTVi4p2hnxsRsbdIKGrAfA6M26X/c9f5E9eVXoWb0uQIKvMCvHfKfQ27AEB8ZW0wy8bqMu0Y6+X65Qqyq3S1qiOUzoSeZ1qeUgJSJmJw+nHLJTemSsqIgWldQwpZ0ID6ZtIJf84hLpttV0leqGrzRDVfhUf656tZzYWqmNIwYaRFVkbEI9JycQqa/KsSEjtUS0+oBtLmf0rt+leNgVJ/CvNcBD1DmZMw/fcyPEMVMSd0FHRnjz+L5mWBYDeaNHwCqK6ABDDJISYOJ9uSEx8OIwbdgWKYRHdSXMzgT5ni8W3c7ctBHntYwVQrtgNVwq+5jc9uZVJTHyIMutcANkqcRoKcthA0D6ZVj3VJA+1XSyUzen6a1UozFHVBg+0Kk1ITXCwq07Yibiz0hvQZK1b3MrES6XOwlCSBnygee1gxtx1wCORkZeFURX87zuh/iEzpkMHv0EH1LmXA8+hAysAv6a6rN3FnRh6x23KhLq3EWzIOUsgm2RO//OCSBsQLhw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94ba2277-e893-4c15-0f8b-08dd78354140 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 13:40:28.1934 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tuuBOfHvEN05aQ5d4vWLLqFfwHf7rKF9ufL2qtEvPET1ESY1masvxmb50GRBCH7vC4+cNWHQC2HOLZ5HXI0JPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB6812 X-Authority-Analysis: v=2.4 cv=Td6WtQQh c=1 sm=1 tr=0 ts=67f7ca4f cx=c_pps a=DnJuoDeutjy/DnsrngHDCQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=WEx28BAWv0HXPgO7D68A:9 a=J6Dv6ctt5JGYP2we:21 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: Cc6OsodaEqEXJlzYpXqmE4qtZ1SXk9oa X-Proofpoint-GUID: Cc6OsodaEqEXJlzYpXqmE4qtZ1SXk9oa X-Sensitive_Customer_Information: Yes X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-10_03,2025-04-08_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0 mlxlogscore=999 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504100099 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 ; Thu, 10 Apr 2025 13:40:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214670 From: Chen Qi These classes/recipes inherit qemu.bbclass but do not use anything from it. What they use is qemuwrapper-cross, which is needed at do_rootfs time and needs to be pulled-in by PACKAGE_WRITE_DEPS. Signed-off-by: Chen Qi --- meta/classes-recipe/fontcache.bbclass | 3 +-- meta/classes-recipe/gio-module-cache.bbclass | 3 +-- meta/classes-recipe/gtk-immodules-cache.bbclass | 4 +--- meta/classes-recipe/manpages.bbclass | 2 +- meta/classes-recipe/pixbufcache.bbclass | 5 +---- meta/recipes-core/systemd/systemd_257.4.bb | 5 +++-- meta/recipes-core/udev/eudev_3.2.14.bb | 4 ++-- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/meta/classes-recipe/fontcache.bbclass b/meta/classes-recipe/fontcache.bbclass index 6f4978369d..deadcd2fbb 100644 --- a/meta/classes-recipe/fontcache.bbclass +++ b/meta/classes-recipe/fontcache.bbclass @@ -9,8 +9,7 @@ # packages. # -PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" FONT_PACKAGES ??= "${PN}" FONT_PACKAGES:class-native = "" diff --git a/meta/classes-recipe/gio-module-cache.bbclass b/meta/classes-recipe/gio-module-cache.bbclass index d12e03c4a0..3714678c7c 100644 --- a/meta/classes-recipe/gio-module-cache.bbclass +++ b/meta/classes-recipe/gio-module-cache.bbclass @@ -4,8 +4,7 @@ # SPDX-License-Identifier: MIT # -PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" GIO_MODULE_PACKAGES ??= "${PN}" diff --git a/meta/classes-recipe/gtk-immodules-cache.bbclass b/meta/classes-recipe/gtk-immodules-cache.bbclass index 8fbe1dd1fb..585838c105 100644 --- a/meta/classes-recipe/gtk-immodules-cache.bbclass +++ b/meta/classes-recipe/gtk-immodules-cache.bbclass @@ -8,9 +8,7 @@ # # Usage: Set GTKIMMODULES_PACKAGES to the packages that needs to update the inputmethod modules -PACKAGE_WRITE_DEPS += "qemu-native" - -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" GTKIMMODULES_PACKAGES ?= "${PN}" diff --git a/meta/classes-recipe/manpages.bbclass b/meta/classes-recipe/manpages.bbclass index e9ca2f895b..f3d034b046 100644 --- a/meta/classes-recipe/manpages.bbclass +++ b/meta/classes-recipe/manpages.bbclass @@ -10,7 +10,7 @@ # by default. PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'manpages', '', d)}" -inherit qemu +PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'qemuwrapper-cross', '', d)}" # usually manual files are packaged to ${PN}-doc except man-pages MAN_PKG ?= "${PN}-doc" diff --git a/meta/classes-recipe/pixbufcache.bbclass b/meta/classes-recipe/pixbufcache.bbclass index 107e38885e..c32673df55 100644 --- a/meta/classes-recipe/pixbufcache.bbclass +++ b/meta/classes-recipe/pixbufcache.bbclass @@ -9,12 +9,9 @@ # packages. # -DEPENDS:append:class-target = " qemu-native" -inherit qemu - PIXBUF_PACKAGES ??= "${PN}" -PACKAGE_WRITE_DEPS += "qemu-native gdk-pixbuf-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross gdk-pixbuf-native" pixbufcache_common() { if [ "x$D" != "x" ]; then diff --git a/meta/recipes-core/systemd/systemd_257.4.bb b/meta/recipes-core/systemd/systemd_257.4.bb index 24aad11c0a..0f0c846db6 100644 --- a/meta/recipes-core/systemd/systemd_257.4.bb +++ b/meta/recipes-core/systemd/systemd_257.4.bb @@ -8,7 +8,7 @@ DEPENDS = "gperf-native libcap util-linux python3-jinja2-native" SECTION = "base/shell" -inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check mime +inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives systemd gettext bash-completion manpages features_check mime # unmerged-usr support is deprecated upstream, taints the system and will be # removed in the near future. Fail the build if it is not enabled. @@ -932,7 +932,8 @@ pkg_prerm:${PN}:libc-glibc () { fi } -PACKAGE_WRITE_DEPS += "qemu-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" + pkg_postinst:udev-hwdb () { if test -n "$D"; then $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \ diff --git a/meta/recipes-core/udev/eudev_3.2.14.bb b/meta/recipes-core/udev/eudev_3.2.14.bb index b3e7d092c5..a2d222e655 100644 --- a/meta/recipes-core/udev/eudev_3.2.14.bb +++ b/meta/recipes-core/udev/eudev_3.2.14.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc192 GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases" -inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases +inherit autotools update-rc.d pkgconfig features_check manpages github-releases CONFLICT_DISTRO_FEATURES = "systemd" @@ -77,7 +77,7 @@ RDEPENDS:${PN} += "kmod" RPROVIDES:${PN} = "hotplug udev" RPROVIDES:${PN}-hwdb += "udev-hwdb" -PACKAGE_WRITE_DEPS += "qemu-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" pkg_postinst:${PN}-hwdb () { if test -n "$D"; then $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} From patchwork Thu Apr 10 13:40:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Qi" X-Patchwork-Id: 61115 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 1764AC369AA for ; Thu, 10 Apr 2025 13:40:41 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.34791.1744292432908882653 for ; Thu, 10 Apr 2025 06:40:33 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=61957cd107=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53A1BJf4021255 for ; Thu, 10 Apr 2025 13:40:32 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45tsr1q18p-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Apr 2025 13:40:32 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Lyv+Xq1A/PRv6ywfi/idp9wQhKx7fvWG13c4YF67D1fuZsOH+dhK4i2Mk9+VbuAQxwChkoAxs4SU3+UbcbkKi2hokfM6jeUCx8eSuiuQb5BVsi28+pcYWEUYEyyxX2tsCKe4rT32iICaaqh1nAK+f45mL5RDlW/bk8mxt5n6JYki9bdJBfVuZUC3BEvNjxBtAcyJ2wefaPf8D8HMMbhNBE2PsM3AAJQ8c246PdkKafZpdAxiafyaF0aVqu+Zsaqbyfyr/tSNJZqH10Ffqmj0Vt0TY7RbTqT7C1oe7Ez6iGNeS77fmuaWLzJ9q6b42Uupx2xpNszKt8zSnfgGLWTYkA== 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=mNwLMol7uxb4k7e2JTCjlfog65C8AeWQeBQB9YHpbFw=; b=CaRccNom1Qnc40P8V8rNBA4eccx+IVDc/Z5qRL7aBUVROyZTyaRBRarD4imMVhz9kkdSQBVQycyiriIH9gau/ju77gi6AlSgE82DeZxhyrIQpAMtZwX1MB5LoXucFf8P04tFX7TLnYZEyEzhV3r3jMPA0vTUDK5SAyzdh0PIfmBYcuzz9YopUzxNcOKJ2AXtWf8hkks/M9t+gg7ZmoIU7Jgsyjc+8+dcezQjNS7CYS7JTLt0+XfANEL1/34cyN2Za/ks+xXvyKH/3/mbZoVDIuRr4U7BGeYGg5EDoIAuwidkprGUKGr1m1lC3+xuCmVesS3hDZLqxT/9wZsba7JMlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) by MW4PR11MB6812.namprd11.prod.outlook.com (2603:10b6:303:1ee::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Thu, 10 Apr 2025 13:40:29 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%4]) with mapi id 15.20.8606.029; Thu, 10 Apr 2025 13:40:29 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V2 2/4] nativesdk.bbclass: handle PACKAGE_WRITE_DEPS Date: Thu, 10 Apr 2025 06:40:19 -0700 Message-ID: <20250410134021.1299595-2-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250410134021.1299595-1-Qi.Chen@windriver.com> References: <20250410134021.1299595-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SJ0PR03CA0065.namprd03.prod.outlook.com (2603:10b6:a03:331::10) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|MW4PR11MB6812:EE_ X-MS-Office365-Filtering-Correlation-Id: 9e73ed34-4772-45f8-4002-08dd783541ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: 5xdzJvcsg5NX5nEFfNBbZwM0Qe2gQ1HUVdu0yVdw6mSMB4o+toOaaFJprO1Owr3pBTg1fd5nzT2tY6FXJA1nx1oF2DcRpQuSuFLPWMQb0IbmiYGyHu8WcWNxe0aJ/A1L49WXKKWPoGd/AFlmbdRZViyCbcNkdbUZbf5JufaYKcdomjA1avEa8JL+g68p3csDEqx3ACwUXFk/rRCgXVhaoWmpBWTTTvCUY5LKGVLBrWJZoBS1OUF6sIei+qWZF4pLaGtuXt0WGD6I8l9KfXKDfEKhcd9v1ZA9CkHmNGTjPugHU6xvCLJB/QkJ6MzqJqygOOf+5jxkmb8yUh24GBZLrWWLsbD9Z+iw2ZrBZJsbRkoIfOnA0New6owiq5AFoE0u/f/lHqj0gxaPZt2vvLFvO/3c0qx5l7ZZVhw2RbSaE7z1iRYWc/K/Pd57IJg3pAxwDfV5u9PBcdVe51b2Dl888a6lHLcLNuQD9pZTo09KqVgA+z7NGbqFFc95y4lcsIAAGeyEDY11LQrZvOgh2vvhZQ4w0hRx6sbLeJ1/9bYJvfq/sTiPx7l/uM8x2w/uPY1CNvzWHkbvodRzEvwPiOUCWZXR6La9UtiEyI7nUm44EZZMFpUyJXg+MauVItJj8iBjx7E3NBgt+23/xHe0qlHvyp+zJHDVyzyaWSafVbg4+vrlKUKd4zeJbB2BkOCY2iCAOJinBImphTGSsA2KzDfm1jzekxbN52b1d5n1i7r9kvh614DdYTOfwZvzIpF76DcvgiqduxC57vqtgOmJozJENzoAM7qh7dfskXHZJWIEKWoaZyLO89z0scDlHW7GK5ugxtQVW5pNtr/q5xMWDL2TL5puQnx6p3U7cwQwKzQR65Qbte5CDnAG5CDbbAKSzIAeChxxMA4w0eqXr4ZDjBFeWBw8KyXEIiFAX/CI7N+rvuIIZ+GEnFUj+M2vrXRkfr2O8cSXdaYYDNxu1YvHyaUWy3Xwn+NYIkVMpYlSIFdKy6M8gIIqhYd6dmRNGnzysqWO5Ydr86eysFt9CyqJOigycnu7FTHSkYY3NOgZ3gZ0B8Yi1iEfhrAq1GMQsfnXv9aNYmjkN/gv8bwh3Xku5ic88sq5ZqxnVEsXRpjIoDaxxV60zH/wcftwMWCLcVjd3j/RODnpH8v85QtneJtu2vEbckEvoz7hVmPpuzV6w5JguF+2X5TEeWbQjvr7ygs2xLIvmuXzXXKi28FEns+zGb6AMKzdCJZQPqYIxqQqEyO2TY/w+Lh/tlN0VrNEFBAinUO5Uo1LeigTL6V1bcZLU0JuqdWF1IunFq55MJJAJcPyXLfWDmSkkyejPt7Zdy0dE9ANr7OEgHLxy+PKolx6IBEZFaBpqovBGA70kof8WTRKqr89rJ6GkjNetAMznHdOiJNpsuwlEOhIM5DJfjirht0vUQnhPYaLxmSGgfLz7xFxKh4Pk/U7bDlst5QfP7aPQUqaFdGJ4PUjwWG75mXAL3zj+g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5602.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Hzt066s75G+ZogKWq1b0Fp1c1/ITtqTwX8T+v6wZ+Ev0n8nGLO5C1YDG2PV4WIQIXsM25si3Pq9qfz/K1F5acjaydv1cnM/DA1JrLW5Z4t3VXfxrtToFCF8jcd9vgd9paKRnhIDLkdR4TJeB5dfv4Wq8UXkJIe0pV+BOFmtIi/Y9M071Hbojw0wUGkvRDqCuIRwHMaUTywpZxcE/wOtQ+UTooF6P5L5L+jxQFkh8/3h2RYH9xlhuPl0vmOrr7bTRpBVj6aPPuwbWMZ6ilpwNqXocdVemDwH4jtYnrboJQ81zBvZZWqzxgC5Nne6Mzje07k/6lZtuczTMcN54plGXMzGc0e1z+otPvPBPrgEweN5cEL4820CAsEcPsuXpTc00fNOp/iPsYpS9jnCBTXXYTMmbUA8nmHdnHYyU2pj+VePGsMz8mK+yIOeq2MbIYUzZ6GEIKe5eaBA09Yq6DD1JRvIeIi4Cv4x7YE8GBAsQAdZSBEWG8YHjwRSV/2ueDpBFYi0W6XjE8/n1jTZbNvYHkjwhLIg5Tg8CVhHFsTcrUU6i8/zQW/5fuAS91LZC13zrrNTALPODUbvv9rXZTVyPz7AbDBea/uGChIoH30PC41bjQgszse5Bsut+GiNWN+IuF6566I5luxMoLZfCPfA8CHnuaodeB9X/0DgGrA01H5tSKG8hXLA8iwLiqh+1zmX1mAyUOyhbBXld8eyz/OCGvnhH4DTKJKkyyq5hZ822GIoICtjS3XrZ+zsMqw4/la6yEIwVnonkqhY6oU+jUKel0KFH9svPkUyE6Fqx2Cs1QFhNjFhFAaudgfFgGTh7sFtobO4ITXN+hSVhcecnVxtD5iCtjAQpFk/fh7RCylnioP/4NDvtGyogxdr3BtxPEuCSACyQsLwNJ+64+X6oX3eUgcvsgM/EQgd1NwImU3DaTO7QGoY1AZ+d9/FQwf42ZW0K17Pme+pIyVfJReFMf50yiML0sJL0N0p6XDB6E3EVjAyV6SrwP7Iq6PBaa2Hvq7n+tQIp+reRxV+tXustqe9g0ACwEYWSIKAhk1Fr10mvCiet3f4riIQvyBE+C/n3hkh+0AsmI7212hdQxALDPyKc0sNiOulaKkzpNIv1wkmk0ehMJuTczi/tA7FYLvNcBAaOYJ7YtK3c6LsdCzzOXdBAl78B6L+pA2uRm0JaeQqRJVqea2iGj05Or9aJNPvzltvf/US+eBFBFyxTQPzZC5CDZdpNpItpu8aGLuSSQcyXddX0EdTsr1iPfXvFyGuCS5x+unag+RuQjjDCRTx58VSUNaUeQKyP2sK0ZIvAIFw5nUYqE2Tcy9lkmp/WpvctZQcy6FLdggE4P6DxVfmutXmZkKydolNJsZiNuYdeJS+5ircHJTG0PzshzatIWFPcYphkPW6oRyVK8L9xQqWrjDszATQ2pJowXEaOcpxFsrhLY8vIQJ3Je93BaUvRF2Dn2YhGLnjaXi2oKkEM62R+qyrNo4+9oqDrSC0B3bVmc/6k2+9+TtXX0dzm5XLhQi3MaEaKUwiekXJnmTtxsvpTR42k4Mh6aCwQ4OSRiuPo6UL8cIT7DCcUPisXgwdNC+m/KWBdNWK0wCU8oV/rMvr8UIdqGg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e73ed34-4772-45f8-4002-08dd783541ac X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 13:40:28.8806 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qZ0tXb1TgtabLtaLRufZ/IdmE7I21HoScuc6VhpxsiY0bB0Izatr7CRDq35VdBMr2FrHf98QtCmdGtih+8710A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB6812 X-Authority-Analysis: v=2.4 cv=Td6WtQQh c=1 sm=1 tr=0 ts=67f7ca50 cx=c_pps a=DnJuoDeutjy/DnsrngHDCQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=t7CeM3EgAAAA:8 a=i6GXUCRvfqvi2kUFSWoA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: UTBafJBNr-xhsC-RLFczUC_TQwHG2qaA X-Proofpoint-GUID: UTBafJBNr-xhsC-RLFczUC_TQwHG2qaA X-Sensitive_Customer_Information: Yes X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-10_03,2025-04-08_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0 mlxlogscore=999 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504100099 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 ; Thu, 10 Apr 2025 13:40:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214671 From: Chen Qi We want nativesdk packages to depend on correct recipes introduced by PACKAGE_WRITE_DEPS, so do the same mapping just as we do for DEPENDS. Before this change: nativesdk-glib-2.0 -> qemuwrapper-cross After this change: nativesdk-glib-2.0 -> nativesdk-qemuwrapper-cross This can fix do_populate_sdk failure complaining missing of nativesdk-qemuwrapper. Error message is like below: NOTE: > Executing update_gio_module_cache-nativesdk intercept ... NOTE: Exit code 127. Output: /xxx/lib32-core-image-sato/1.0/intercept_scripts-xxxx/ update_gio_module_cache-nativesdk: 13: nativesdk-qemuwrapper: not found Signed-off-by: Chen Qi --- meta/classes-recipe/nativesdk.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-recipe/nativesdk.bbclass b/meta/classes-recipe/nativesdk.bbclass index 4e57349aa0..7ecb4c12c1 100644 --- a/meta/classes-recipe/nativesdk.bbclass +++ b/meta/classes-recipe/nativesdk.bbclass @@ -104,6 +104,7 @@ python () { clsextend.rename_package_variables((d.getVar("PACKAGEVARS") or "").split()) clsextend.map_depends_variable("DEPENDS") + clsextend.map_depends_variable("PACKAGE_WRITE_DEPS") clsextend.map_packagevars() clsextend.map_variable("PROVIDES") clsextend.map_regexp_variable("PACKAGES_DYNAMIC") From patchwork Thu Apr 10 13:40:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Qi" X-Patchwork-Id: 61113 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 134C0C369A6 for ; Thu, 10 Apr 2025 13:40:41 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.34432.1744292433601957016 for ; Thu, 10 Apr 2025 06:40:33 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=61957cd107=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53A1BJf5021255 for ; Thu, 10 Apr 2025 13:40:32 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45tsr1q18p-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Apr 2025 13:40:32 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lm7VWoB244dqil827JzsniLbRYYz/81nDuWTWJs/nE9uWnhRF1RmowxqZbFtuyczLb+1bF/BPNyNMwhVjcpFIRCEpyJHE0XI2n0tOaNo/Dn86EsCrT/g5Zz7aricX+r0DfbSWLNiodwpcD0Nf3iac436VLw1ZYgoiegRIyA3vd5GzsGM+Ti5QhqWx5w6taRE8YgX5keEtJUGXIsui/OvgeCv6W5oIpQwmliK7Sm+eJP+za6mL3rZtj4y/l6XakI3bvgCFnoNkzDIooGX7QL5QfLu64T1U/WLTFsnaiAYTpWbVudjhIQ3ZJh7rrCvT7RX8t9P2ePBjiPqStlepOx8Mg== 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=uGdYfzPUKsc8jzEn3J/UMDA+8Y8oif3arGkXt/Hh9G4=; b=GkMQe+dELWDnKGTpw6QcpmSZ0Nsx75SvRa5md7DOaJPG+94FVUqnsHqqduPf9unjyujJx6zAm2RCqEwCiemXENVJ///6KI4h7wh5x2dyge0yeTl/ZRTSF/CcGlh0Wbs0eStVgkdIU0V3euNRCFSm6ovmTOF2PMAzUb09nlkhjRMMIEkb2+6BrQKcXAd40j3w38swXiGIwtatIzZgOeHCGu8tCN5QfVtR4Lj+Rqb3I1jTtrEwmJYV2/a/eB5rsgnIaEiQJ38KiiS2+ZhhJOvFw6GhZBL4kSVYzf+5PqzZpoS+5tKOavPIk/bqnO6tQNWDzbTmlopzEp+cX8jQSwV8QQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) by MW4PR11MB6812.namprd11.prod.outlook.com (2603:10b6:303:1ee::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Thu, 10 Apr 2025 13:40:29 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%4]) with mapi id 15.20.8606.029; Thu, 10 Apr 2025 13:40:29 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V2 3/4] image/populate_sdk.bbclass: drop qemuwrapper-cross from DEPENDS Date: Thu, 10 Apr 2025 06:40:20 -0700 Message-ID: <20250410134021.1299595-3-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250410134021.1299595-1-Qi.Chen@windriver.com> References: <20250410134021.1299595-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SJ0PR03CA0065.namprd03.prod.outlook.com (2603:10b6:a03:331::10) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|MW4PR11MB6812:EE_ X-MS-Office365-Filtering-Correlation-Id: 2bc02672-d4ae-4100-4053-08dd783541f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: D3Ezl0qPK+uOQEYhmUbush1IJkVrA3Ow9ybbZ+KVMvUfzGPVigNbKYZgzWor5QIVVP8DweRtSdaE3JsSgNOmqXYbwUS2VoxD2yVmDnCZInteA9qtk/k649WTQYak5MZAJnW56981fBTNYxJ/Cx9AH1E8wCbIE7+FM9akKYosYhtWzNU0TXEwq+RzOMAkngpCDwF0TR1iR/uTC3TFgch8+eKOXTZCHU95salJn+KBJ1/Ls6r6DA+eu8cc1IM0ZRvL2M7n1OXDo8PkDpfvyqXi/WSBItzAMzvqDINcQSc7zf62pqn3qWIBZoLl8wkfHdt8tk538c/PyTRXZCWabiv4Q2YBG5vmlb0nUh9YjcCsOnThYG/5F72Mw/KQ1gFnW7SvxiLAuE9GrigZK9/nHSyrnyKXvCj0Ax3ZI59Ovedsm5hMH9N0bMj+CfTNNY9XXAA5uHXSiNTYaYHYhBsd8ZOHoo9ytTZ9/oIT5tAMtNUaxmrLZ/9AUuCh2LD0a4kj3wqtmpGLTgiM9LT8psf3Wzk88sADs7Wyk6z2U6MZDZmnVTD2zTnWm2ZXwlx8TrSnxYaI/enM4H28Rb1qdzhs8YZe801mFmZARkgbAqti6jscTmIzFp5+CRXUju9iq0DqtnR8Jnj4O+E4GuCFCn7yFVyhbtxW35OiNdVKmHIPmNCYT2rDRoJrphA2WkpGwzdY1eWeFnOZJP6Or2ZYMaXeO6zQdnx9i7dyOXh66QjuMIYBVtYz0t1rty0ctPDUbZ315VMg4qCkz9FPw40yd2JWl0oyOY80/bUXfER8NuWwcRT+1DOwxxGxXuA5F2qIeDEdedfWJ/gomGktsaBzYYhQm7QGecPTZPcHlQNDlKwDIbZxqEd8Hgrmd4zsAeLEk8x5ZpR7yGkfksZg8ERc4VJFL2neNiYyr7KXnjKA+86zjTQ27/A9QpgYzzrPvcdoHEf2gjDwXdWW7C0+6xaJ+mF63LjlHJZTBJwlE7EXhjSKYXbo2AzGbH3BYhOppTduGnGBbAfVN7dnopZc0kF6jxv47H2jxADhqPbpbBJ52gZ2k0Y6F0EfufBKT+LBxEchnj8N7rPUoUs8NeWEML97/68Xu7V4AtvNNF6+w1K49jM0t8F6t5SINnEU8QRQXo1MGCYpOMQBJ7pDBumXS7cG8WRbHpYt1OF01RHH/skxrMgavaCY6krgPm+sRb4fxC4+RrDgBxoQI2mJZGwi8g7IXCYFVcdt3YknQnJa8iZNTDztb0dtpunJQOWVO+/am1zb+xSs6T2qUzaVi8A2OdiBlzkcAdnUlVBc+iptWNrDXrDuQeXIRf7aqJ1whZiSDTLZBujzBVl5kUlMi3MZJ93EOtjEEzBDm463OjbYePYGp2bwkqmXXgCyCpbL8k63ZqJqCUkSDA8pwgThQLuUqREtML2tGUMYzd55qTY0uZgh37jCKayUTe6QDHrzp0g9OC1Ug+IPTqjqA4Vy7KJWKbITF94KkbAq0A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5602.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8H9OBz0rQNj2kyj/Nteo5cAYROvWqu2Ld5Wk/h0WWto+jqaLZepoYoRa1Kt1eOvm9aCkZ98uScOh/r03lLUOWsPux75jxQPVLaTtHRmefd22ULb6XGZMsVZO/QFhkMzqkrN/XtLtcmAER30/SlHGElGYOImNVL5a/lYt3tw8rltv+e8jpmkjH1GVB8NK/c2olY+qVNv55CUxCrN8DtSc86WehsI1CjyiOVGM1NENwYJSJ8F3FiLo/UjKgKiBukV8nUZX7xBfHhf1sZRvXbK4sCJO028LeBjdwAIppFgBxbAgTnCX+21RODVKSzt9ejBrRuY1HNrcyjrDLEnuZyyy2DM7omZzefuYmEuTY2GtgZCPlO95yb0Ghv3djAXragBv3eQfsDXCHXn4DLSk7xroJXBYnzcxYSOY1H85i9Mz977Tzrte5ql1Xa0S2USEwOvGfgoXdkS8h7BEy2cn89TQogjHZem7JNatt4M1o77JKkKSt5mPUVHpDqOStoZDjPrCEXJAQD2HHWDLWamirlptqp5ETBrO1gvqJRRVOWcXW4bNU0Zp5QuSaj07cY3skmvIuDqYFkpRwIqHs+ESRHQlGO/VgvUj9ZFjaks8dSW5d+WLJNSTvwHyIGinDDMkor9Ngqwh8ytPgq/5kBAXK6fVUvDvMlRa+tH+uGnFCLoJi/zRbfUpdlHvnTggznK0y4RW8hLHqEDhAutwKDrltL54ecnpcbHBLH4rPP8vlt9ONCATvifqeZKDiKvzG1EEHAiNk1RjFM4nMrbH7n6TXKYJRZQoEmwHcTBOlzF+pDY0iOx8gj7tK6s+CptycwUXeQeuYisZBETUrrZJS3yS0fsQ5M6JMoZ9WT4WhC2E3117FOZ5cZfXtBuPcqCW1XWoZJhOKXbFhYnE1hSu9EFib8+9YloOfKhNwHX+RmuvjGTzcctcYyh20c79v2mZWg76Mogg6e7Y68BTOQuKEDSRu8EaIeEPfzvFDPjsvz+aXa3V73sRLnF8sHHpLs6QqUyjRvHk+J3IIq77pyAADH0HdnfcnaslQ6M1dPmFmJ4GP+CzB+2X7kNFwFz159v+7AJjRXn1T8GVUIO3juuXeIckdKaBGAzhvOZdch1hGiLDUujjuGg4hUuDI+gR4cJ2OXhy5b8Dg4pvcbhcUzh3AZ8ih9dygnsVebFfLzoXXLCDeRiNQda2vEoqCT/X+uOMYqoqPMbf9pYl6KkMAEFGp1hcuHBdANGTtgxyYxzU6Bza8AWS0z0iJKpj6qNFHs5RVNTrt3H0LN3flYT6RWgBGrtcB+w/bdOUEMPN+2e3/X9c0wR/jeLQ6o2qk5lIKJ5FV4yBljwZ2Fz5w0IGoDg/PrCqEKKpGp8CQDEfRywa7QWmoc13UnA8YJAinYteJXswmx7pEBkfpNxVoNRclWT+qu8erPGg5x7WNA8Ow6tqNulaeWCseflASqXcO1a36JEIcDIn/Z02S+5g7w3dUDkixRuoAbU6gooino1mS/OsIyRiOcJ/FZwSArp6QndsbMpSS0U6fTiChVpScbOejRI3Hx0FHhc4DmZ9LYFNMRtUSnsRP6Pp5G9DkHIgNEUk1teQbsJR54+OcrLnYNp6MEh8kYQSP0a+yg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bc02672-d4ae-4100-4053-08dd783541f1 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 13:40:29.2644 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mKzbLSZiXEC/hNTSgHHtts2iFf3yscRsK/XyLyT99ODnsMGy9BLBDHh83ylbqyGlRSnspycWNki0dJ6EeUigEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB6812 X-Authority-Analysis: v=2.4 cv=Td6WtQQh c=1 sm=1 tr=0 ts=67f7ca50 cx=c_pps a=DnJuoDeutjy/DnsrngHDCQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=t7CeM3EgAAAA:8 a=20Y_Kt9r-2Gad0TaIGMA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: 4DpGHnS4jaQR189pfQJ7TowBy3TgEIMb X-Proofpoint-GUID: 4DpGHnS4jaQR189pfQJ7TowBy3TgEIMb X-Sensitive_Customer_Information: Yes X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-10_03,2025-04-08_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0 mlxlogscore=993 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504100099 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 ; Thu, 10 Apr 2025 13:40:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214672 From: Chen Qi For packages that need qemuwrapper-cross, they should have it in PAKAGE_WRITE_DEPS. Now that we've used 'qemuwrapper-cross' to replace 'qemu-native' for recipes that need qemu-native for their postinsts, and we've now mapped PACKAGE_WRITE_DEPS for nativesdk recipes, these qemuwrapper-cross dependencies can be dropped from image.bbclass and populate_sdk.bbclass. Signed-off-by: Chen Qi --- meta/classes-recipe/image.bbclass | 2 +- meta/classes-recipe/populate_sdk_base.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index 378d3bd0d4..dc4ce5c0a9 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -30,7 +30,7 @@ POPULATE_SDK_POST_TARGET_COMMAND += "rootfs_sysroot_relativelinks" LICENSE ?= "MIT" PACKAGES = "" -DEPENDS += "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross depmodwrapper-cross cross-localedef-native" +DEPENDS += "depmodwrapper-cross cross-localedef-native" RDEPENDS += "${PACKAGE_INSTALL} ${LINGUAS_INSTALL} ${IMAGE_INSTALL_DEBUGFS}" RRECOMMENDS += "${PACKAGE_INSTALL_ATTEMPTONLY}" PATH:prepend = "${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:" diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass index f111466b4c..238cb1ee6e 100644 --- a/meta/classes-recipe/populate_sdk_base.bbclass +++ b/meta/classes-recipe/populate_sdk_base.bbclass @@ -109,7 +109,7 @@ python () { } SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" -SDK_DEPENDS = "virtual/fakeroot-native ${SDK_ARCHIVE_DEPENDS} cross-localedef-native nativesdk-qemuwrapper-cross ${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross" +SDK_DEPENDS = "virtual/fakeroot-native ${SDK_ARCHIVE_DEPENDS} cross-localedef-native" PATH:prepend = "${WORKDIR}/recipe-sysroot/${SDKPATHNATIVE}${bindir}/crossscripts:${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:" SDK_DEPENDS += "nativesdk-glibc-locale" From patchwork Thu Apr 10 13:40:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Qi" X-Patchwork-Id: 61116 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 26B44C369A8 for ; Thu, 10 Apr 2025 13:40:41 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.34792.1744292434198141693 for ; Thu, 10 Apr 2025 06:40:34 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=61957cd107=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53A1BJf6021255 for ; Thu, 10 Apr 2025 13:40:33 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45tsr1q18p-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Apr 2025 13:40:33 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Nhr83X32xgtRmkN5wZjBSh5V/zcn7fzQc0Ng1vrcV4fDr3PTvE9VKX7d3qLq0AAFgxOfbku0MqhGX9VOpJzefdkqOmPy3NANY84jIMv9VMhVVx9xxtzsw6XEngAj8G3gcydZGl+QhDCFAlpMHOpRBJEQRTFTTHDi6gTux1cmph7vR8DSuRgxVhxFy9drRJH9A9+2YcjSPdiaH3Ln8VwsO/R47t69zXuzBrMzpW8+XNQuLjIm1xE48xdNHCMGW8XaeAvPCyXZIbLhkgT1GnXG87/YUG+n2ikWm5KUFrxRgMyxIq68UOnNZXC2gQUsHC6wo36ZmzK9ye0mLWdvBguCtw== 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=yZJoeTSYBJzkzB1qBIm3koGehgDLKwHf1wS8H19Va80=; b=yapMdkR7UKlZbi5pXhLd2q+lUtYyzWxwz7FF+qO6eqJAGIlryVLTS7DxKJ0kUu+ao5sHEShqusiy9PnKRMgXyxVHQxbojLkqaTnp5u8M+BTkqZTN8TsLNUedu/xLO49CZ8W4mqmhvqewGcSscxaLdyW+jdFLGOKh0Y0z+/BP4k23EVEG0Us8IQpMZ0vHRjLzfNlHCMomlRgjwgjNPvUyhP/j97Yi3OVWYqo9hQJEThud88QxpcfRd0VcuVApjDdLmtavkUi+LJhtlLuZYmDwrBsMkYha/1yVfV7SKLV3iNw0fkSQF+A99iI9l1No/4LEFZOecMcfjSBUgKl0LReX1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) by MW4PR11MB6812.namprd11.prod.outlook.com (2603:10b6:303:1ee::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Thu, 10 Apr 2025 13:40:30 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%4]) with mapi id 15.20.8606.029; Thu, 10 Apr 2025 13:40:30 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V2 4/4] lib/classes/recipes: refactor qemu.bbclass functions into library functions Date: Thu, 10 Apr 2025 06:40:21 -0700 Message-ID: <20250410134021.1299595-4-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250410134021.1299595-1-Qi.Chen@windriver.com> References: <20250410134021.1299595-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SJ0PR03CA0065.namprd03.prod.outlook.com (2603:10b6:a03:331::10) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|MW4PR11MB6812:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f5ab65a-15c8-4706-226d-08dd7835421f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: EJ8zdsiPQD4v8Ipty1sb7GR9WpH1pRnD3O1bmSzzRQPo3heA0V74uWmYg7owMRlBB4z2UkWuymtTQk1n/CovSIPxKABfh4viQGy/VRze9Rv9NebVCRwBp0br2M8oQ4REJL56eYsIuCvS6rmzEuLF5meHIJgh/Dm4J9uKJ+QAyYErDq1JEv/M02oawjCL7jeDwPUn35Op87llIJu6YkEhNN8BZZe84dCVAc6qNqvy2olNEYeMljYqD6GOPX9dlWvyYVkH44cOQ9F1Xs69f/lJCaJXWW6CSiN/GFeV8J7V9rqgrSSlwFIAzGgTRLHDlrk1y47h7oSYtBf3mIEj2YDcIGdaXqeZv41kjpmok6/l8+16Hc/oQAOvr1zAelcn1xVzYsnZRsaChTeeb/PmfM+aim7Wrza+qMLKeUUZOfjJ6/2ltMhGRu2wDKUw9yfkv2u/1wTG4myDF3AadqY5jfpOoHWsJJH0BFqdt+JmiFCEDLp1jcZZFqemrUT6QrQh27iW/nrjM0fsBPjAlk/RYO1ewAQFrTRYLkrEpO9w0bw48OFUf6snXFYxxnp+kamMtTU0YgRPI3xIIqU2/Mg+1IjuDjpcnxftrV1IOMsu95ZCH9UbwOYclxQMAu2dzRLp1BavBPpOeZPsNfwgExz3PuH/Zni2fNscaUFYkdrePlu0rBsLfeSptcdhVi9Snp7tID2WWUHhpkEp2Mvp6W5n3SqzEoAf4hSYutMsH4qEN5GXro6cTNNGRYHCLCr4atw+G4ZTDhtiTTHnfv45aYTO3vTKaIBiE9baF/WexrSbNvGCMW4lQhDX5Bw3S14GE7EBB+pFH52nVL7T3YEFwr68FF3CNFL8IoSBwFHxWLg6kF6ZVlfGXfKA9j34fBtNEKU58jLs0sOlpkmHjpUd3nuVEbQSdR0wDQugywSCi69jWjDCo7gOmqpFI79xTELWpvikfRuvQVEnHV/fVcvtoYsqoRiNJxa4XxPnsHtkXDG8bmnLjxyehRfaq3VR5PQ+NYRmxH6Vo4xSlg/EmdfSX/Hc4OWpLQRZvuuOsPMMK9j8AGBGa383CAdYrXi53EcBq10TcQcv5nFcjVETXMGtOyQZLh9RIahWZ9gdiIRhkHVsyfofM4VnXd6BdnnPkrivlfrTBBr+t8C0eEFxOG+JhYCp6LZ3XFYRHzgeZo4r057oLOOH2v0U8cQ6xvJ0Rqad7tqo3ywwCrtNnRGx2ZY0CiiO+VYFZYQRBrPrXb0EWsYYsbR+wTU46TytY/pR1vM3O5wbYuM+e6jTQFIVeA8vnjFrmk+9wrfqluK6w9GHGsykFLpq7KC4qr2Ovzyyinumor4o3FvQAf8rv351Du29SWQ3aHHJLLZxfXDtJBMoyP1ATrrXoxiY1mIDtuPACY1IpHx4aK2vMQ1rJXAagq0aQdB4QVMMvkj7JSAGoDTCDowVTK/N8JvkkD+WRVGtUTFJ8HqepH1DIgxzSBHgvKggR9mVPzeLNA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5602.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ib1TcpjIcDLimkWdEGNvfb+qgVeYVlpt0s23qYHFCp140naI6m3m8E3aKYwNBZF4957lgdbE/k1GtGNddSXa1vynoQ8KxuV4mUXKA/zvytqch+FscQxZsp/ikxQ/vBUz6JQsXdpVy8Yh2+YGgAD5XZKwo6xK+W48NLnYrvyMJT5YHvrhVUN57R8ARZwXwUNa2Mdaqt0JyrG8iTq9pNoqFAxOBampvTR4m6W5zVdNH60oGCyyIKMcjY9HVftWOf2ig3nl+qIM2ipExU0xWVAeohPLoZCKBOi6njvYPxuhfP8BBYNKe2eVd5YRoD6/cmgYir6/2eIyLwr/2tiJhR7cDE9m0yWlqNgc7nYwplmc5eaK5DGiHIbPY+BLjwh131zIEXcBd8kFwByNrP06RlrAWMlx5dy0Y5oBKiIpS+fCkIwlX9srEV1uNO2efV48OpCFPShZOBnZRhYZGWApcM9SLRoDdHPlZHNYt7FwWFJ46TWPmObplZqBkJi+wOPfUcQiR/9CUbZFl48Z9hfG8ZMSVDGpDCIZ/lQZcR2GAKRLAaMEkzOiwypxwIihKjTewuiKBO8IA8PRWbcDbn+DOjTuuYKiG3+bSyXBfOo9gqU8JQbwefP1KdmPv/I7tTZBj7SpgMdOm1mGIqKHSVk/82+4wMAiDfVl3u70dxDnzse8OSQNYdkUvKrauZod837qR3mS9uE3RF7rnhb2+Y4G0JmrBfZ53vaPwKmpfpJcdPWf40gmXoMKwVxcNDG+g3lqjo49HoClbZf9/r+qzb7VE+3W/GaBTetizwaynqs+KlyXy+DgadYaVc528RyIZqp41jRxUef0kPy/db00VbGtf6Jaaf9D9DWQMenazVctoyKSVvUxAiIf2l+pP45nSEK1SzR2eWbcHCtsnh7rkyOmD+83Nd+OYlQsc9hil1J5esJlkUmH30iD+BwrpUcnWQuR6jMXC2GP/UWikssT2n6z0JGMMZYFS7ku8XBzc7QSnFblh1ZPwwFbDyC5EApDMx3D6dZa8pxCCyL3CrGUAz5clqKiAeouAcy9j/3z+hTTua7IwWGPAtwjMtq8GiKt0rMuV/Mq2t5yHkFK1MNoXkaZsMciel15xH2ozaEh+DeeZrC2jq0Ilo/XXRgCoT6wt1NfQZRFGA4WJgpkPdKlQCQaXGylePum5A2Y/nEnefZWSPWiTg+HpH7WVD0blIfhtVxJeHVE4C3G0aI7xqldQKbEt2BFECKH21EcKsiQkW03fMTyggzGgVl1G+lxOmMnITz0m1pMfykiwZIRfUA2h9xdlTUoYAz1+4WQ8IrgS9M9aj2ob8JMmE+b/JqiODuJQFJ0rvkjqF8sE0XlN0IF+ypRWCyfGn27bWbZSREOUSYYFtwplF76j225fdH0uhFoTwhUKUXdHSfe/6RF79gxglLYWl/AKIBcA63Kovb2A5y2ZyOI0NqJprMf1tB0Tpds5ipWwcIluKv1KykX4id8HtZEfWTnmxIkIjc1S7M8oc5xZsOJjM1arAmQBJJkc0VdMhSzQu+4KJwSO+iRiNcyfUTq0ou96s/nEG928u5oJo3oAcbpTXb7Y43H+0panlgGirKlf0aBQ/OhElLJAzSBOFbZs/bezA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f5ab65a-15c8-4706-226d-08dd7835421f X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 13:40:29.7262 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yJkJdJ8m16bHoWdSo4tpTquDETT/psb6Tmv7/eR7d0PLZ8q5RaCqvjizkX8ulTHUwpqidS8rm59ESZlupqacyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB6812 X-Authority-Analysis: v=2.4 cv=Td6WtQQh c=1 sm=1 tr=0 ts=67f7ca51 cx=c_pps a=DnJuoDeutjy/DnsrngHDCQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=t7CeM3EgAAAA:8 a=05caZQWP-9MGXGHOnJUA:9 a=ILrxbXL7mD7Ha1I0:21 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: yB6xbAw--BzQETivzq4kf-uQzqIp3YrN X-Proofpoint-GUID: yB6xbAw--BzQETivzq4kf-uQzqIp3YrN X-Sensitive_Customer_Information: Yes X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-10_03,2025-04-08_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0 mlxlogscore=999 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504100099 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 ; Thu, 10 Apr 2025 13:40:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214673 From: Chen Qi Move the functions in qemu.bbclass to meta/lib/oe/qemu.py as they are generally useful. Add a deprecation notice in qemu.bbclass so that we can remove it in the future. The logic of re-definition of qemu_wrapper_cmdline in allarch.bbclass is moved to qemu_wrapper_cmdine function. Signed-off-by: Chen Qi --- meta/classes-recipe/allarch.bbclass | 2 - meta/classes-recipe/cmake-qemu.bbclass | 4 +- meta/classes-recipe/gtk-doc.bbclass | 4 +- meta/classes-recipe/libc-package.bbclass | 4 +- meta/classes-recipe/meson.bbclass | 4 +- meta/classes-recipe/qemu.bbclass | 57 +++---------------- meta/conf/bitbake.conf | 9 +++ meta/lib/oe/__init__.py | 2 +- meta/lib/oe/qemu.py | 54 ++++++++++++++++++ .../glibc/glibc-testsuite_2.41.bb | 4 +- meta/recipes-devtools/gcc/gcc-testsuite.inc | 4 +- .../recipes-devtools/python/python3_3.13.2.bb | 4 +- .../qemu/qemuwrapper-cross_1.0.bb | 4 +- .../gobject-introspection_1.84.0.bb | 4 +- 14 files changed, 87 insertions(+), 73 deletions(-) create mode 100644 meta/lib/oe/qemu.py diff --git a/meta/classes-recipe/allarch.bbclass b/meta/classes-recipe/allarch.bbclass index e429b92437..fcaa580a4d 100644 --- a/meta/classes-recipe/allarch.bbclass +++ b/meta/classes-recipe/allarch.bbclass @@ -63,8 +63,6 @@ python () { d.appendVarFlag("emit_pkgdata", "vardepsexclude", " MULTILIB_VARIANTS") d.appendVarFlag("write_specfile", "vardepsexclude", " MULTILIBS") d.appendVarFlag("do_package", "vardepsexclude", " package_do_shlibs") - - d.setVar("qemu_wrapper_cmdline", "def qemu_wrapper_cmdline(data, rootfs_path, library_paths):\n return 'false'") elif bb.data.inherits_class('packagegroup', d) and not bb.data.inherits_class('nativesdk', d): bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE")) } diff --git a/meta/classes-recipe/cmake-qemu.bbclass b/meta/classes-recipe/cmake-qemu.bbclass index 383fc74bf2..7b988f45ed 100644 --- a/meta/classes-recipe/cmake-qemu.bbclass +++ b/meta/classes-recipe/cmake-qemu.bbclass @@ -14,7 +14,7 @@ # with this use case in mind this works very nicely also out of an IDE # configured to use cmake-native for cross compiling. -inherit qemu cmake +inherit cmake DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" @@ -22,7 +22,7 @@ cmake_do_generate_toolchain_file:append:class-target() { if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then # Write out a qemu wrapper that will be used as exe_wrapper so that cmake # can run target helper binaries through that. This also allows to execute ctest. - qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" echo "#!/bin/sh" > "${WORKDIR}/cmake-qemuwrapper" echo "$qemu_binary \"\$@\"" >> "${WORKDIR}/cmake-qemuwrapper" chmod +x "${WORKDIR}/cmake-qemuwrapper" diff --git a/meta/classes-recipe/gtk-doc.bbclass b/meta/classes-recipe/gtk-doc.bbclass index 9d3911966b..28c0adba0a 100644 --- a/meta/classes-recipe/gtk-doc.bbclass +++ b/meta/classes-recipe/gtk-doc.bbclass @@ -35,14 +35,14 @@ DEPENDS:append = " gtk-doc-native" export STAGING_DIR_HOST -inherit python3native pkgconfig qemu +inherit python3native pkgconfig DEPENDS:append = "${@' qemu-native' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" do_compile:prepend:class-target () { if [ ${GTKDOC_ENABLED} = True ]; then # Write out a qemu wrapper that will be given to gtkdoc-scangobj so that it # can run target helper binaries through that. - qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" cat > ${B}/gtkdoc-qemuwrapper << EOF #!/bin/sh # Use a modules directory which doesn't exist so we don't load random things diff --git a/meta/classes-recipe/libc-package.bbclass b/meta/classes-recipe/libc-package.bbclass index c06a2ce90a..b6094adbb1 100644 --- a/meta/classes-recipe/libc-package.bbclass +++ b/meta/classes-recipe/libc-package.bbclass @@ -94,8 +94,6 @@ do_collect_bins_from_locale_tree() { cross-localedef-hardlink -c -v ${WORKDIR}/locale-tree } -inherit qemu - python package_do_split_gconvs () { import re if (d.getVar('PACKAGE_NO_GCONV') == '1'): @@ -284,7 +282,7 @@ python package_do_split_gconvs () { cmd = "PATH=\"%s\" I18NPATH=\"%s\" GCONV_PATH=\"%s\" cross-localedef %s" % \ (path, i18npath, gconvpath, localedef_opts) else: # earlier slower qemu way - qemu = qemu_target_binary(d) + qemu = oe.qemu.qemu_target_binary(d) localedef_opts = "--force --no-hard-links --no-archive --prefix=%s \ --inputfile=%s/i18n/locales/%s --charmap=%s %s" \ % (treedir, datadir, locale, encoding, name) diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index cbfc45b94b..c4e764e620 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -inherit python3native meson-routines qemu +inherit python3native meson-routines DEPENDS:append = " meson-native ninja-native" @@ -132,7 +132,7 @@ EOF write_qemuwrapper() { # Write out a qemu wrapper that will be used as exe_wrapper so that meson # can run target helper binaries through that. - qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" cat > ${WORKDIR}/meson-qemuwrapper << EOF #!/bin/sh # Use a modules directory which doesn't exist so we don't load random things diff --git a/meta/classes-recipe/qemu.bbclass b/meta/classes-recipe/qemu.bbclass index e9fe757c7f..5b5a26dfc9 100644 --- a/meta/classes-recipe/qemu.bbclass +++ b/meta/classes-recipe/qemu.bbclass @@ -9,56 +9,17 @@ # existence. # -def qemu_target_binary(data): - package_arch = data.getVar("PACKAGE_ARCH") - qemu_target_binary = (data.getVar("QEMU_TARGET_BINARY_%s" % package_arch) or "") - if qemu_target_binary: - return qemu_target_binary - - target_arch = data.getVar("TARGET_ARCH") - if target_arch in ("i486", "i586", "i686"): - target_arch = "i386" - elif target_arch == "powerpc": - target_arch = "ppc" - elif target_arch == "powerpc64": - target_arch = "ppc64" - elif target_arch == "powerpc64le": - target_arch = "ppc64le" +python () { + funcs = ["qemu_target_binary", "qemu_wrapper_cmdline", "qemu_run_binary"] + bb.warn("qemu.bbclass has been deprecated, please remove 'inherit qemu' and replace function invocation:\n\t%s" % + '\n\t'.join(["{0} -> oe.qemu.{0}".format(f) for f in funcs])) +} - return "qemu-" + target_arch +def qemu_target_binary(data): + return oe.qemu.qemu_target_binary(data) def qemu_wrapper_cmdline(data, rootfs_path, library_paths): - import string - - qemu_binary = qemu_target_binary(data) - if qemu_binary == "qemu-allarch": - qemu_binary = "qemuwrapper" - - qemu_options = data.getVar("QEMU_OPTIONS") or "" - - return "PSEUDO_UNLOAD=1 " + qemu_binary + " " + qemu_options + " -L " + rootfs_path\ - + " -E LD_LIBRARY_PATH=" + ":".join(library_paths) + " " + return oe.qemu.qemu_wrapper_cmdline(data, rootfs_path, library_paths) -# Next function will return a string containing the command that is needed to -# to run a certain binary through qemu. For example, in order to make a certain -# postinstall scriptlet run at do_rootfs time and running the postinstall is -# architecture dependent, we can run it through qemu. For example, in the -# postinstall scriptlet, we could use the following: -# -# ${@qemu_run_binary(d, '$D', '/usr/bin/test_app')} [test_app arguments] -# def qemu_run_binary(data, rootfs_path, binary): - libdir = rootfs_path + data.getVar("libdir", False) - base_libdir = rootfs_path + data.getVar("base_libdir", False) - - return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir]) + rootfs_path + binary - -# QEMU_EXTRAOPTIONS is not meant to be directly used, the extensions are -# PACKAGE_ARCH, *NOT* overrides. -# In some cases (e.g. ppc) simply being arch specific (apparently) isn't good -# enough and a PACKAGE_ARCH specific -cpu option is needed (hence we have to do -# this dance). For others (e.g. arm) a -cpu option is not necessary, since the -# qemu-arm default CPU supports all required architecture levels. - -QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS:tune-%s" % d.getVar('TUNE_PKGARCH')) or ""}" -QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS:tune-${TUNE_PKGARCH}" + return oe.qemu.qemu_run_binary(data, rootfs_path, binary) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 501808204e..b6215fd7ee 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -896,6 +896,15 @@ ZSTD_DEFAULTS[vardepsexclude] = "ZSTD_THREADS" # may fallback to using all CPUs export OMP_NUM_THREADS = "${BB_NUMBER_THREADS}" +# QEMU_EXTRAOPTIONS is not meant to be directly used, the extensions are +# PACKAGE_ARCH, *NOT* overrides. +# In some cases (e.g. ppc) simply being arch specific (apparently) isn't good +# enough and a PACKAGE_ARCH specific -cpu option is needed (hence we have to do +# this dance). For others (e.g. arm) a -cpu option is not necessary, since the +# qemu-arm default CPU supports all required architecture levels. +QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS:tune-%s" % d.getVar('TUNE_PKGARCH')) or ""}" +QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS:tune-${TUNE_PKGARCH}" + ################################################################## # Magic Cookie for SANITY CHECK ################################################################## diff --git a/meta/lib/oe/__init__.py b/meta/lib/oe/__init__.py index 3179a3f3d2..f25e7f8b7c 100644 --- a/meta/lib/oe/__init__.py +++ b/meta/lib/oe/__init__.py @@ -10,5 +10,5 @@ __path__ = extend_path(__path__, __name__) # Modules with vistorcode need to go first else anything depending on them won't be # processed correctly (e.g. qa) BBIMPORTS = ["qa", "data", "path", "utils", "types", "package", "packagedata", \ - "packagegroup", "sstatesig", "lsb", "cachedpath", "license", \ + "packagegroup", "sstatesig", "lsb", "cachedpath", "license", "qemu", \ "reproducible", "rust", "buildcfg", "go", "spdx30_tasks", "spdx_common"] diff --git a/meta/lib/oe/qemu.py b/meta/lib/oe/qemu.py new file mode 100644 index 0000000000..769865036c --- /dev/null +++ b/meta/lib/oe/qemu.py @@ -0,0 +1,54 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: GPL-2.0-only +# + +def qemu_target_binary(d): + package_arch = d.getVar("PACKAGE_ARCH") + qemu_target_binary = (d.getVar("QEMU_TARGET_BINARY_%s" % package_arch) or "") + if qemu_target_binary: + return qemu_target_binary + + target_arch = d.getVar("TARGET_ARCH") + if target_arch in ("i486", "i586", "i686"): + target_arch = "i386" + elif target_arch == "powerpc": + target_arch = "ppc" + elif target_arch == "powerpc64": + target_arch = "ppc64" + elif target_arch == "powerpc64le": + target_arch = "ppc64le" + + return "qemu-" + target_arch + +def qemu_wrapper_cmdline(d, rootfs_path, library_paths, qemu_options=None): + import string + + package_arch = d.getVar("PACKAGE_ARCH") + if package_arch == "all": + return "false" + + qemu_binary = qemu_target_binary(d) + if qemu_binary == "qemu-allarch": + qemu_binary = "qemuwrapper" + + if qemu_options == None: + qemu_options = d.getVar("QEMU_OPTIONS") or "" + + return "PSEUDO_UNLOAD=1 " + qemu_binary + " " + qemu_options + " -L " + rootfs_path\ + + " -E LD_LIBRARY_PATH=" + ":".join(library_paths) + " " + +# Next function will return a string containing the command that is needed to +# to run a certain binary through qemu. For example, in order to make a certain +# postinstall scriptlet run at do_rootfs time and running the postinstall is +# architecture dependent, we can run it through qemu. For example, in the +# postinstall scriptlet, we could use the following: +# +# ${@qemu_run_binary(d, '$D', '/usr/bin/test_app')} [test_app arguments] +# +def qemu_run_binary(d, rootfs_path, binary): + libdir = rootfs_path + d.getVar("libdir", False) + base_libdir = rootfs_path + d.getVar("base_libdir", False) + + return qemu_wrapper_cmdline(d, rootfs_path, [libdir, base_libdir]) + rootfs_path + binary diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.41.bb b/meta/recipes-core/glibc/glibc-testsuite_2.41.bb index 3a2764e40b..d5e3a2cb19 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.41.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.41.bb @@ -1,8 +1,6 @@ require glibc_${PV}.bb require glibc-tests.inc -inherit qemu - SRC_URI += "file://check-test-wrapper" # strip provides @@ -22,7 +20,7 @@ do_check:append () { oe_runmake -i \ QEMU_SYSROOT="${RECIPE_SYSROOT}" \ - QEMU_OPTIONS="${@qemu_target_binary(d)} ${QEMU_OPTIONS}" \ + QEMU_OPTIONS="${@oe.qemu.qemu_target_binary(d)} ${QEMU_OPTIONS}" \ SSH_HOST="${TOOLCHAIN_TEST_HOST}" \ SSH_HOST_USER="${TOOLCHAIN_TEST_HOST_USER}" \ SSH_HOST_PORT="${TOOLCHAIN_TEST_HOST_PORT}" \ diff --git a/meta/recipes-devtools/gcc/gcc-testsuite.inc b/meta/recipes-devtools/gcc/gcc-testsuite.inc index 3257f86907..42f7f244c3 100644 --- a/meta/recipes-devtools/gcc/gcc-testsuite.inc +++ b/meta/recipes-devtools/gcc/gcc-testsuite.inc @@ -1,5 +1,3 @@ -inherit qemu - TOOLCHAIN_TEST_TARGET ??= "user" TOOLCHAIN_TEST_HOST ??= "localhost" TOOLCHAIN_TEST_HOST_USER ??= "root" @@ -41,7 +39,7 @@ python check_prepare() { content.append('process_multilib_options ""') # qemu args - qemu_binary = qemu_target_binary(d) + qemu_binary = oe.qemu.qemu_target_binary(d) if not qemu_binary: bb.fatal("Missing target qemu linux-user binary") diff --git a/meta/recipes-devtools/python/python3_3.13.2.bb b/meta/recipes-devtools/python/python3_3.13.2.bb index 0f0505c66c..30835796e9 100644 --- a/meta/recipes-devtools/python/python3_3.13.2.bb +++ b/meta/recipes-devtools/python/python3_3.13.2.bb @@ -57,7 +57,7 @@ S = "${WORKDIR}/Python-${PV}" BBCLASSEXTEND = "native nativesdk" -inherit autotools pkgconfig qemu ptest multilib_header update-alternatives +inherit autotools pkgconfig ptest multilib_header update-alternatives MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" @@ -168,7 +168,7 @@ write_pgo_wrapper() { cat >pgo-wrapper <> ${D}${bindir_crossscripts}/${MLPREFIX}qemuwrapper << EOF diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.84.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.84.0.bb index ac5f4e9370..3110c151a6 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.84.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.84.0.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "945b57da7ec262e5c266b89e091d14be800cc424277d82a02872b7d794 SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" -inherit meson pkgconfig gtk-doc python3targetconfig qemu gobject-introspection-data upstream-version-is-even multilib_script +inherit meson pkgconfig gtk-doc python3targetconfig gobject-introspection-data upstream-version-is-even multilib_script GTKDOC_MESON_OPTION = "gtk_doc" @@ -64,7 +64,7 @@ do_configure:prepend:class-native() { do_configure:prepend:class-target() { # Write out a qemu wrapper that will be given to gi-scanner so that it # can run target helper binaries through that. - qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" cat > ${B}/g-ir-scanner-qemuwrapper << EOF #!/bin/sh # Use a modules directory which doesn't exist so we don't load random things