From patchwork Mon Apr 14 05:34:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 61254 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 73282C369B2 for ; Mon, 14 Apr 2025 05:35:20 +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.43345.1744608916749946927 for ; Sun, 13 Apr 2025 22:35:16 -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=61994136b9=qi.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53E5K7tb015814 for ; Mon, 14 Apr 2025 05:35:16 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2041.outbound.protection.outlook.com [104.47.58.41]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45yf58hkvj-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Apr 2025 05:35:15 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tcggvgP4ui+qJmwwFJuG4qQvNpHB21MpK9nUNsvpPAHq/tAo600PGG1CBwrUMWwl15xZ3Prt3NzrULBx4DNfC0xQSgrgTOnDpcqlfVy1GYE/GSP4mMsJjyW+c1nIQ7nVyYDOg6yTlztV9qzX5tc5/1KGy/kGcnzk88iIdtiw/saH346j7aQvIoOiUQ7Bw2mZ6UrMr8LsRtp287EpSb7gkxHaUESsD0uGdzUL9R1bOhaUZuby8xTlZ0V84Oh4ggTqY8jeIT+995Pg9eOIQ39Yn7vt0Ye9GThsgNFmxpGt0dMX5qQ21RlPqatIh1Yq/OOEqug5od2VfgdyZYzf5/jFzw== 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=eM+9hUPApbZJFfMH6gvLfT6nxSPGsrtp/VqZ6wjt2/8=; b=jWgOvOe80AQP6BBx9vGIAWxnqcRqfWVUossISsZLsAXQN/OPeZ7GtUAiqXSPiGttg//EtPoJOZCuvyl18WLdLNOyDoTh8/8iEX/cAcwQNfFa0HmYZT3Pkh8Leiyk/6TU8kwGfrFRHGrI+QWHmkQ4Rucg/vER1Ng1UjE+QGe2sVkm8wiPzv4AAvSlnSFjw/4ibUlp66yymdOSzG+klhTXE+cIrJ2XweTsKkoQjMvBV/pqgYKqlk5IkgqkwTcteHxJWIoPl5uE4EE26XU/7dJos1RhfN4ffqxcFLdc0lHO24WFbnsHbJWDhhDKFEO3NhxsCXMnnw9Q1xGMI8wo1+aOWw== 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 PH3PPF066A3CD44.namprd11.prod.outlook.com (2603:10b6:518:1::d07) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.34; Mon, 14 Apr 2025 05:35:09 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%5]) with mapi id 15.20.8632.030; Mon, 14 Apr 2025 05:35:09 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V3 1/5] classes/recipes: remove unnecessary qemu inherit and use qemuwrapper-cross Date: Sun, 13 Apr 2025 22:34:59 -0700 Message-ID: <20250414053503.1180029-1-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: PH7PR17CA0068.namprd17.prod.outlook.com (2603:10b6:510:325::12) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|PH3PPF066A3CD44:EE_ X-MS-Office365-Filtering-Correlation-Id: 54467606-8edd-4596-cb5d-08dd7b161f16 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: E4YoD6abMngVQS13JcsCrbvQO2+pnOss4g2uMjSQN4RayRM9Y9OvPr3Os8UY7STAHxRtG1a2+nC5puILcABDMtr4I9UsIczBUspmMNa3KhjSEFjfa5Kq0QooaxrneyrhlGm39j7MQQhGLEtBCCoe4XW1XSqv/GZuhrF+bcVz31ENOoNynh5jG191aGaQp+Rm5hGU2YcqZuQVmuybJZH3fe79yMBFRZ5iqLyH86PyF6nGMAc5cO65XnMY3FtZc68+P3TorVFjWET3IJXskpJujN8fMWNbQy62WrxuR/UYNC0i7+g16xqX3WJ6D70GO7qrS0enKJgnIQdccLaM3DpBfmhFy7/+iTgxPxj/Rtn+Mb5k3d+nefhErjln/0C5txfPbOu1OxA9/ZGGBUfQTeo/rvi5Hfsl0M+wIbaurzMb9kTg4MOdfUZ971DllXl/0En4xrjLPIf/5EQbh856b9LmdbVpgfO+cDLfsB/i3Bh1EAoaQ9cR5MzDhX/4lok0wCwk5/fkdVPafTimubZzKIhvg35nbZCgz1NQN9Cap4OKYks0V94PC1eJKdpiJ8GWkasNryzc+gUhXcoENaCbSuyuLzA6OWKE9W0SJeDH3GmQ+mbjHF+m2MmHWVxzXXuWV5dPuSerKNBrIxp7+6AjOUEMi7/wsEO/zXZ0i6f1MeGPeyJvioycu2srDVgTtsvSAgiXhqSggpdE67tfTeDaf29ogBdjLucaIsJEzY2cKZmEntBYrIFkBggen483CVx10WdkNLySewPq2WDAEMiNUHKQqD6P+d6dhSjJqtToigsvt5ranFGzvb1upOPotIk0fXjUl9OmigJxpOSwnzWyh7mnuPrnO9JXNn8Cev5JcE6bXVr4/YomJBRqurYBVLTV/HJDF1u0rqax9N/JTTvMm2NQtpU2GVdRx5AKDyo7pzBWhX6h6B5ah5wTKjX/qFeRLylwzgQ9WZHx2rO8Zk2eSW7vq0lvXedb9OMuHRaF4Pe5gwd2zwCSMcWAnylMO0e7AaC95S+zrJ536UvuEk3hdZjB1uqcJ8260Oa5EKTkmBPJw5ka6c6gWliTr6wc8l78JEYykhxeTayIpxUrLII6lSkmtTdK8GYMmA3ChqAqWuRnJWPfy8IzCN8d1aLioGs51aEm5mVb5pyWYqTDvT5epN9kr0X4mJvYthr3d6a3F0D1YrnDnVPXO/l4Fhe9btpPbTefBMM0/aii78Z6LP9HjdMeuGVFovq42VSklH45ZTpfZ90ntno5ZeQeOuc/CPs5PY6sBr3fruwFLNcknpXDYIKizqsh4YozxEbTeGPq0+5VBSEm3lz4gPxyS+9EQxfUuYyLa9xAd0/hVVcFt4oIOAi9HZ4sGMDuUHglf4hWvS40ogjSDmgb0JjN0cchbIngjaXGOECVEygUn760GSWlvHLY4FyncxNW6vSglh87+WdaV1CQDZqPb3d6zZWlC44u9i6ixd6Hk6MIceRgFe4jLo8Fctb2heYIgtRykJc2d4qdQfk= 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)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wx3gKN7MP9vhLv+BmNEhM3OBKqG4med91efUElKkjrsDVEt76u0ySmBl4DH4m6XIo62oPKF+SyioA+v8vQdIH6I29JPyXOUA5c+sYAMlRQikSf0flVlfNbrM8633FHxQW3icqWI2qaaA5q6d+3sjeOdBo1I4pfTk++knbM32gwgrlKTSk3Gq5mrSCAPFf/9V5f2R8Vzw3VYqn1LolBjEf+CrvStCX+izHFZdw08vKBukgU/RcxwfOSpcPrr5MBEKvwFKXqLcOqjHG4FTgtbSLhMJFwUASp+DrRTb42kAysU4VJHzRWIKFgpj2JhnpjxrHGmkCe+K4JDpnGTUPHTMouzABPnMbdymgj+E14ANXGq+oCJHkLyg5izhNRuNyZme09iBZM4CQOU4Izh9AKPj2LBq5I5du+qXIklFaytO48znIJ6KjlM5brL4YBYjCCNYja3RqpXHLiuwbpxP71wfkJRc0QP6wzFB0n+J+PhBS6HRx7Txe1WyfEQ0sTI81MLS+YWvyUavFxVhSP5Te8ItzVg+YL5znhvdY0xY83yWtQvJgzpLWh+XSL5Pj5Vj3KQwTFkXqX3kY9Hj+1gr8dnVqELFuA51wAmydQ0H7Bro6bkdDIWvBTlmoGE1LhhSClOduLd31DtmnI8lC1CVwp+cpGYLcwWQ8RHHrjgNDSnVuY9OvvhTB4n7VIfPDp4yGIg8WhBkHH/ZpG0Jdx7eM2t5ScM9/zGlCaMezF+e5pyGmOTSbK3tO5nUEIcRqtg3rrNBcxXLsW9qoTKp5u6q0yoeQJYPMSlu2ik/jGh3QGXJbNbXaVKj9583IuKBSZwNlTTUxeQ/+JsYGDfjBFMrftIyW/tE7vJrgb7SjYUivsX3mETV92QZycr2irxyAuA9WPeDrNUyRiJ/4JxLd5flGfuQ8Lu8DCmKUybaPrkKxZy0a5NNoaFhYGfe23HngSb2Z52a7m4QWcx/ZyCPY/VA5jJsoNvlYk/cZBOgBmFEZ+bPMd/33TaHIjAERrSneO0pr5ez14c3V4vLD9w6GAW8+CsJMoXy05dXiwmcUIbmBYgSL0JxhiBKOEJHZftubY7ajV+0mB/GPds6ORCtCkwojhGdSyMEqR46XdzK0XEI5UZ5xlIX8gCEmY3OJ93z+X43uEdJ4h4IPBDaImr1ZK8KH5YkoOsKA53Rg5xjW/w7iCe1BkXt9Jn/ya+aJuVoeZxO5z6iVz62/uwgP1L/+jGmNlyPfYzR4/66UCVzpSuniet/osS/15jSF59LoyIc6Crx5y05uS+2sx9uXCvzSyj0ZpRzKtJyY+g0Fs9VwyFwCfpOCSCIjp+RRMHxzy5amIZf7ygk1TjOvknm0JznaqsLiaa8fnQig1nz7e5VKcRAwkL/qoQfnLUUXgTT3MXnIFPxX0cE7qLrdlGpy6dUbIGe07fkNkIHja61rFxeI9ULIaMNpmkkdNwMX6dS3K9HZ2eAflsvpBcM8RskPA2KC1ioBWtgJTwaPp4cSke29bPfoe7ArGdvQftMCil7o5vsi0mml95TvxrgEtg783XdaguwTB8yK78I+PP7c7cZ+FPD6RQkb8myOJlIhlNcURM5YY0rqT+5aZfMFHuHyFdGf1C2WIn5kA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54467606-8edd-4596-cb5d-08dd7b161f16 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2025 05:35:09.8674 (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: +mg4SOqHI23IyxRj0a6Ltx05+pjhVukljZ0Zz24BtnIXx+iHU5+XaIYT/AEQes6dMj+isdv+Uu08lBS143HYXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH3PPF066A3CD44 X-Authority-Analysis: v=2.4 cv=UPPdHDfy c=1 sm=1 tr=0 ts=67fc9e93 cx=c_pps a=OnljjeCONrlUuPUItWmgXA==: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-GUID: H10nEu4cmK7Gamxvx60U31lPHurRinUJ X-Proofpoint-ORIG-GUID: H10nEu4cmK7Gamxvx60U31lPHurRinUJ 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-14_01,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 clxscore=1015 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504140038 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, 14 Apr 2025 05:35:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214794 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.5.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.5.bb b/meta/recipes-core/systemd/systemd_257.5.bb index 24aad11c0a..0f0c846db6 100644 --- a/meta/recipes-core/systemd/systemd_257.5.bb +++ b/meta/recipes-core/systemd/systemd_257.5.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 Mon Apr 14 05:35:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 61250 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 6344AC3601E for ; Mon, 14 Apr 2025 05:35:20 +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.43220.1744608916121395434 for ; Sun, 13 Apr 2025 22:35:16 -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=61994136b9=qi.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53E5K7ta015814 for ; Mon, 14 Apr 2025 05:35:15 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2041.outbound.protection.outlook.com [104.47.58.41]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45yf58hkvj-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Apr 2025 05:35:15 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xH7A5YQcyq2uIDfqVRxncG37nZ/X2RESy6DF7tjAM3DAN/MBresVb6qOITOI5apxMYA7azu4QzBpPVT01NihgmvFcYBIrMsM3j88ljuapNINw5UCYpXJaTFa+HchU07Ga0QbWyF5OQb1lIogRqD+Z0QppeuvrzGqYHglIwZ2/3K6Z21sV3+PVbeJc0wggfZNZiIMdJrERgTY3mgxD3evpoDxt/cL0lK/wyVjDpQc2YU9bW0Y71PER2XaRpLIH8YXAFuUBbDwVEJh7oB5BizXHeZ/lTp+ntsNBn4pHIoULWwINQDvvkqrA/OryJv5Xncng8+RBTF9a/cLz7ooC0PH6Q== 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=fgluiA3iazkC9ftPYFWE7I4GTu2G22pkeJRppis9Q7M=; b=SDLol4iILi7dU2MX/rMcn6z5hrP7TLL6GvTo3K+WP+/ctVxdv9zAfHLc/uyt7Ve3fsDCi40LtxitvFM+ABoJ34Pc+xOgdf3XrVlmKh8gP3iBQcvIDtC1Q5gv5FNg2KFT0I41nml3loHjSG9WEeI2cgsCIP9bAJS4WmxR7MlEGz+G3rp7Viii3gCXBxRyStUPXvT4e5KbwWz+xKavaSkolknjFCVTUOZAKM1upLYPoCy1maw0lZSadfZ7NxqWXY/FmFyfmSb2lAkmE5a641LjU8KNq89IEfTndIlCvh0Tvt479Nt3AbRb18BLfts1miZsLgGJI+grcRUBN7+s/Ao3+w== 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 PH3PPF066A3CD44.namprd11.prod.outlook.com (2603:10b6:518:1::d07) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.34; Mon, 14 Apr 2025 05:35:10 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%5]) with mapi id 15.20.8632.030; Mon, 14 Apr 2025 05:35:10 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V3 2/5] cpio: fix ptest-runner dependency Date: Sun, 13 Apr 2025 22:35:00 -0700 Message-ID: <20250414053503.1180029-2-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250414053503.1180029-1-Qi.Chen@windriver.com> References: <20250414053503.1180029-1-Qi.Chen@windriver.com> X-ClientProxiedBy: PH7PR17CA0068.namprd17.prod.outlook.com (2603:10b6:510:325::12) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|PH3PPF066A3CD44:EE_ X-MS-Office365-Filtering-Correlation-Id: c25dd016-acbc-4c19-430d-08dd7b161f57 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: wF7+U4qYr9a37Nw+JgVX2dfNG7jYRWOnXL4Cz26CdV+mZsPoL9oNdNGGJvnMKh7Ci5qT6FVXrot8wmlBSRYBr4OYhemAcs1VdOqvDEbNOT/U3rmdUKn7j2SM+uRtNGHO27o8UcoikPx2TjsxCYIgHj8PDw3De68AbBBgx9cd8GSigaoJeF6+SA8RcPuzshuEm6GLRJP3AtotfpoBv4ewpz7iAd4Ah5yH3y427i/x8goLCCGPLE+0rByHxFtWFUyihN4Sh1qTZKAhvr5ov7PY9tcVsaY8uWb+FTPa9fyMrNXhWgag6aX4RY64qt96MsTdpIplEW4xhKpkJGF+xzxs9BXPEL2DYZ9r7LHgzhwzcc3vAVuSeQQSxTRmCbDnzG1Hyyx0iqtztcD4S2xf5x0G9DqgLnze/D4XMMp6YfVpIdp8YoXDg2yG5QwIlq3LOR7IOSoKmHfVzCihLqyH8s8M2E0d7jrfAqgkzryJRqO/xSoBQz885bNiRFvSX6SnAAmE1EOz5xuMB/fgVWp5KqTnY70Qx4+0ET4f80/uI6hJAhJiYiZGsoxfMJoKEkPGbTcDV7TSAwnyIhRMto4ZXKK6VrFVfFn/Sb7EEAorx/j9dnjbqYw+coB70lH5sD3nQ5/Bc5pyXJdnpcwEaG8QlgPgtbMtvGPVPkEq7iSInFPmZVXkZwziDvMsRHV7zD6wbt+89o/bnF2Gv/zRUkToxoQek0XaigPCW/SKXahJLRvKZmPGlL7BOMD8PUAc5JGkoTAEArBZeFy6+ogXHaPWsY/OfdAeIqMn8yiWfY4RBvdPujsA3BKXZbC1DVQ8WF9JyehLTJJ9raYurDBXtz9UuG3LCghLb06COiyg2PH7KRta6M0+WxIKlcE1H58WeSvDd/py98ydQAYPF1AQV95Zwc5SFLTy2iIXmpslfUFQpwHWopOCI2tsqo1BIAvqEG/KV/exkUqjwiJSTmsRpmgWlXkvTanpnTxBDR4J7iXqUxi4ZIz4EWyVVG3bL2Tj+f208RB6W4fH/sWkT2abJroFczEeYXMrH1F6X7LwvDo4nK7KGd954nmmfYaYKqswZcBsF+aRhwHBJoyQ+PZR/6SkVu3oyMnI3Kgo7cSmJ6Au5UXGfxsxyGOQCDBATfSccQareyHyerI9c4SRfj91+me5gfUu2RWXsBcy/1U4NEjb/tUhZOfyQhXATqABKA5hzM+RxYgRAIppBWu+rHJqqTkteWE5vIfhdwXO39b0QIZPy5esw9WQQ0pDpylxpSKFmQeXZIKSjvK3bo3CvIq+X3a/IXdPj5JOLy6sC3LFIH/9adwNm0g/cIes/BxNLEuwBjn5mMV7MxZl2ozbVBtoLplgIneOUoemEqPP8RfqERI0V8TeDunLMlJZm+gSZrs1K2gRIUENOZF+mxKkOz4rFyOoKbmRDRE+Lp2hw1O4ucLLAVJWE/D7MYQkBwbTg5jiF2eoY2p0T1pNXNTPvakKW+SVgb3wJg== 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)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OXsWibwvymo8k2duvrzolyz5Ow7mxO5M+MNY7ysKBXxGm4XrbbQUkC3dnOGlxKZzbKkK5kZFFcoE5DU6UUn6TsTu3j+y9FIGSA7DH9o0QSyisJNknzVEHOgnVx+OQDVBSVOznPrEEV8tucsuHPCES+GVYDf2sdiTa8IMgWnl00DRCm6keE/oNrt8ylRg7jAP/8GuOXNPqpC4BfpsiDVWNGBvntJX3bnPNAHHEi29QbW3xccBROgZLGomjFYeqCT/REogOMLPzataPTyaFnSvxqCuzqa7YsxdqF4CgzJJEPRxwVOksJZJX/o5ixIpNR1lf+vSdQDtBfCaBpP8IHX3fhbUeBTwxqtM89qTKLoFqgaES1lySqvScz9RZEB3GysescXcaDsWPw5e5TMqr1N8YZ4UTjP0BTRYDSXfhCYGSno17C00CIh41/re1Ee0BhXJIe8/i9QSz/0pggZtNawaZHEFyNZUPRnsFvBuGwit54ZlvJvAkm0LeTDSVoegN24Yz/NcWQ1jDQ2KRoOuu8OZ8YXcRhbRL+c2k4JxicAiFmwrAOsI8jvqGS80VP0vTXF/hsypFSaai+N3T7he06SEoGFZv5E2yFSCxniTBLZfosir4NQKsoPHBPRpro7s6TkAym1P8X/p8aT1pCEMYzsoWSpJH9D1ev8RNkvR+0174d/SYHxriG15Yf+zU0ktqzmsE+pgqfOuL1I5oN/C+Br0cwCjXrrgW1q5Zsuai4hwy2SWZtIDNBekFsoMaCtEHylQt8KCKcQkfHYdQyWmxXva6nIs302SdTI+PtAKNvizCgH9ltXq/qSJaAMEBRUjbIoPzA/jGe+xCAMy6XqtSyyS67p2B2Rpg/o5fZzUsYK+9C5bYhsoiVKrLxZ+tTbkltju5m8TUa1EbBX0QqS0mJ3FIRPnbvxMI17QCZm3fO53M+ZasnuBRp6YzN7pXbfeOEtRmKMeOXKi99J/dYcliDeMAfJrp0qj4f3Y/Hn3DwDjHoNYm+vVO+bYxSGUyftRV9GzQifnZhN0s3VNbKfexSTwwMIxIk4PzfodWTdF4GreP3RCTzqxG7GNw4MqLYWGVizqcXPdDu7G7jKJioJWk75N6bIwYohdPYta2/82gQvQJ4gcSD1PwIRuhowavOX5zkXVh41bcAFulTEZ9RsdJ/U20uKVKqYrMbKBhPGDD3zZTWOIlGWaPjSL6kx0T4nGt46tkBq9jyJIlb0BUOiwUOW+gJJIQsH3+cYuXVyGw8am0DYl7RAeiIIObJEXFXB7YZBqeEJO75CHLRY50rkfwEZ+GATQQtoacfW55QfGjKDpFTV9wei9Yn2Ax+6NcYRwTVAbKrHtdfrzzN4I22suVe1bPSOsWy+PANavUzqy9o/Och3xg07tL96RFtJLydLJfp5nDJJjYaOxR9UfA2ALJsZQFWgRzbeX/TOtlQ/tB7BPZhcvUgkHnKBiIZ9bYE1qqanBO1IHqcHbIYZoAF5hHMjce1RXGg7Fwn0PokZRUYyk395qx27m/OL4ePTdFpyw8FB3eDIOhW5jo1wZ4Q+5IWQxLZXQCHsuSkCyUREqYgz0KDQDivMECjyC1iYw+ul+LlSZSCX0+la5VnptBFZF9L4m0A== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c25dd016-acbc-4c19-430d-08dd7b161f57 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2025 05:35:10.3349 (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: Uldm8B79gciyoMV7+FkCbiAH4YeTLuEVAfkQ76JiuPeGTAuVpw0pJe/bCq/mkwFPoXszyMCct/LIS3aWgDtQtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH3PPF066A3CD44 X-Authority-Analysis: v=2.4 cv=UPPdHDfy c=1 sm=1 tr=0 ts=67fc9e93 cx=c_pps a=OnljjeCONrlUuPUItWmgXA==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=t7CeM3EgAAAA:8 a=KwLHvCn-_DKJmQUzVCEA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: EN1IgkxoGJoTDIji8tA3Adhd0-qx4T0B X-Proofpoint-ORIG-GUID: EN1IgkxoGJoTDIji8tA3Adhd0-qx4T0B 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-14_01,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=666 spamscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 clxscore=1015 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504140038 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, 14 Apr 2025 05:35:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214793 From: Chen Qi ptest is only meaningful for target. So we need to specify class-target override to ensure correct dependency. Also, the above DEPENDS:append:class-targets lacks a leading whitespace, add it. Signed-off-by: Chen Qi --- meta/recipes-extended/cpio/cpio_2.15.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/cpio/cpio_2.15.bb b/meta/recipes-extended/cpio/cpio_2.15.bb index b081bd53db..0b13ba103f 100644 --- a/meta/recipes-extended/cpio/cpio_2.15.bb +++ b/meta/recipes-extended/cpio/cpio_2.15.bb @@ -66,8 +66,8 @@ do_install_ptest_base:append() { } # The tests need to run as a non-root user, so pull in the ptest user -DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" -PACKAGE_WRITE_DEPS += "ptest-runner" +DEPENDS:append:class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" +PACKAGE_WRITE_DEPS:append:class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" RDEPENDS:${PN}-ptest += "ptest-runner" From patchwork Mon Apr 14 05:35:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 61252 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 649F8C369A2 for ; Mon, 14 Apr 2025 05:35:20 +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.43344.1744608915545516922 for ; Sun, 13 Apr 2025 22:35:15 -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=61994136b9=qi.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53E5K7tZ015814 for ; Mon, 14 Apr 2025 05:35:14 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2041.outbound.protection.outlook.com [104.47.58.41]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45yf58hkvj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Apr 2025 05:35:14 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WQVfHcbPSk8JMDVvLwTZ9ndDvmkFVYny1p2PO0isXvUUpOzw2xkAJwYiiBU3/mHhV6iwodYj2AjTPlx//dg7XireTvyraWNYbhOFUKCbXDuum/7Gbisl98IA2exQvMvoqPmgEDjF6sZE0ZRmayz5QprVl1QxDNUxfVVFRwf5Uqvq9aBiKmutESiBwsdQ+Y68ymvaRfYPjVe8qTb+V4CuQpnf/RveuWJCK/CqVm71c17KgX6YNKD3c7KbRMz+fsqFyb3Db7oe6Rv1kUZZXjAy8eMMS1HKobYnL2pHRlIFJYdJ8tDFLpWEKYjZLs2TjjMwPi6FF6IdZQc44oDv2R1eWg== 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=pMGxO7LsKzERtBOIpUJ8/mb/Q0EG5d0Bv/BAtOqZOSgsNoSOzFa7zRtuni1CdUqdm0AJqvY1cE64ZkIbbPxddHKIJCGchiYKvnAVzSnYXbzQhFC1nFYjmBl1Ab66Jte2cy8x0oNCm36o4feLU1naeiWqqZ8Gu11chZHvHJqz7VlkqRiywtWDLIhVjob3M3TSCiavu/evUbet6RWhhC7IciJVJSjAfz7qUMbDz3Xm2nDLa2ELYu/jWmmdt72W4M03APaR9XrCX031tWL3XXLB9+W3pLMELg8U3cbnSUi0L752Lnc/McsVExCsmOUSJnXwdpkoDXBwZslWCZgCpl3Aow== 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 PH3PPF066A3CD44.namprd11.prod.outlook.com (2603:10b6:518:1::d07) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.34; Mon, 14 Apr 2025 05:35:11 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%5]) with mapi id 15.20.8632.030; Mon, 14 Apr 2025 05:35:10 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V3 3/5] nativesdk.bbclass: handle PACKAGE_WRITE_DEPS Date: Sun, 13 Apr 2025 22:35:01 -0700 Message-ID: <20250414053503.1180029-3-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250414053503.1180029-1-Qi.Chen@windriver.com> References: <20250414053503.1180029-1-Qi.Chen@windriver.com> X-ClientProxiedBy: PH7PR17CA0068.namprd17.prod.outlook.com (2603:10b6:510:325::12) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|PH3PPF066A3CD44:EE_ X-MS-Office365-Filtering-Correlation-Id: ff089ded-6d87-4b7e-04cf-08dd7b161f9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: Rc2xx+fobEmG8i/3YUvR4zXrT39aYID2rx3CgH3ZOCWCF1Lx2zMBSZEyPk8LGZ/rfIZphiLXvP5cXS63rd+LC/9jU4NchkdLw0PZZkZ/r6enQ0hepkvDO4UAmnix8QU2UMi5t2NMj5v9rlwUXpp+1U/dsMlw5a7EIuJk48ZclWp2jbTr6cz7saGmgTlp2yh1eeIfyHGag6vFSCOq52C/uFm0J9UhJS+ToOn2cOcx7kZFrL9Gv7hWQ4IxvVbh+UaP9BZq8CQxDbjP42w8uSnmONcf0wE+XFc9jAQwIIx3J+ICP7PnJ4HnQt/uaOvrwRO+sfoOvHvA2NNGBBjNqvtwHbbZW1eQH/mx9fvdaVoBpiz00VavYJPdDmLDNAv4tl0WV8PMrEU7yumbo9NPHRJl3CPqr2wU9juoV/l778A+R8f8XlFvkQjL64CrVuiqRdWa4r7VamaJpPwTYUmSDQRKfNh3Wxb1IjVcF6wxW7Xo4Of4YDo3nMoPJbg6+E4VDeYKrK0bwlXqRvelMaVeCyqnRhtitFOLd2eOr4UnHjPDIegtXunMgqTksSq3Kb9a2mdruN1kWDcR7pIcaKOiHJEDehwJt8pdBGwApUd3ov68CMlknpw4VIRxWjFQUZPHCOrAIbuoqai3EvDOWng/CuHZUODie4LqCoPFDSSAOhoWl7CNVzcmoLkau2nf4mTQ20nUAiivBZsUERHDQbB0Lw6332Je7LJbtd5xISUK5UDdzMvKT3n5EQYfKWshmXA0SGE40T8BbJAlGQ0IaCc44Q/Q9hpOat9bGjROPNCBdVoAhHtjXu7ylIdUWUA1DNG6eNAUIoZLkutL0T8r59kbuL/wKEDUSckIzufrN+B+Znrnz9nVqFlBINs03D7KCpz6hsaVypyq6V8296uvwQlFEvOaVY2wGRN4grYuwq6RAhwXJpCViFCrVAxSFnyIJ90O4M2Yft6kaEOwZbXEpSIGzZlGKJ0EDbaJMLPH3D7K5r21ie3Ydq8HfMTH8a73Hn2wF8c96wMJJ1CSZ1xe2quRC9QriJE5KepjhFj7uP3ehcL68Wknna4uYgXfGUt7ON2KV5IgiPCfC8EYts51rZKkyBvfpC47TBHbfpvxfUcdAp7HR3mJv23hLw8CVj/TplgpQBlEMfGoafjb/C3xl8QALTudg2ZizqTiyuJSmMEZKqEaDL7PZjfGS5RtZTajBoOUrtipLaTLPYTMje1DkJCRO5rxZ8+NcJKQfP7c+3HfvEcY0sMr0hObTHux72n9Bri8je5kCssr6PfITD1zCReF3hes3cyEz5KkeppclvSG/Flak8hiwU8Ar4oef8718LrKQtzb34I/e0DyeCaMp7C50csELvk2JSGKxb7VxFWsSKYh9/Br1bym7uXJNYxa0f9en5jERfK2zzmwEWtjG6wrscnAjPsfZU+5SWjX0/zz9cg0UdX4Nsx+sIU/096uja+8rrCl+csGYtG1YLJhuzNSY+/ndg== 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)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2zwn+g/yry3ZDmlV3caG3x4y9sj6QTPQcwgCOpZt+6OwU+q5UH8twv+yi4nWFkrHWQ0dXoYx9SLIQny2/Z5Tv7p3XUb3+ZdIAmTIqb2qEdViRE+PpYCvkGZBqLmqNJALEwC2xwfZdLORiNClBRzy2Vyo0+95mN+2xWROQTDlOL3byLILabaOD5znm6sdsqrfrdNZJoOAwWapPYQam4JPQz8MdqsmLZ1gnrLKsPkLFOx61LO7ykocW6aHGrF642PXEHwjF/CeYVYsMqqvZMKAxi5l0qy6C5j271KIcSl+a6et18J1loNIHQJa+xIQjqgkCERA8o4gW24X2H9+d0XdKx+5xfVLifkzL5CmW3AC9lX66iV0oQc1fp2p9A9JN+94+kF11RtcdmjAZWpPWL1ZNfKd0jp31ItdDV1QPnm+pLhFLlZnnU4l1hhPb/VKLDx8qhJ+HBkvnQc1j7WgBqIfV4BkncI/Ooln3btsbTjz2prGMo4l7kILo87VfJesPX8ForBrp3hMrwu+oNc6VpU96TPea3q/zuPWhaXFqKHxB6/sA4kiuHWDmCSdwtvgpJ6YBf5ax4q76ph6xKgE3+FZ/jXtUYVgj2iQfsSgMY5ksZY8/5xA+wmmYihHWsVdtHvA3JCLn53LW+su3FJW2qlBb1cJFC9YlthreZhQYDhAMrr77p7wQpWKFNW3lK+FtinB/3f4lPKXg0jOQ/wXsWjaNJReDCr1sGRYh1hWG1c4pzekw1V+jFm3TDETNPrhJks1f4VTD+f6yffJ62ooMH6H16moAABKhzc9KK++FA1aJN6zkOasYsKttALHFtNBeA9+KTllDcsy5TvFh053oSjRbiGcfjRqgW+19Rmny2XL593q64vFu1LKYrmCzznfKZYijOJbjs78UfnboBePgrYZqRA1MjDxzqAM4eheCe/6hJ/LQm1UfsF7ASIqHc/k1ZsYnKF/rPtNtTWcLGMbTF1IbcLmNp/ij3Sr5z5xQIKxhmBBIYSk9bPPI0liJ4w9hPkDtoco1uE8/O3figVeDMapwH/Ip+JpTdSNooQM/IhRki6Qv5Ziu/WWcNmBTJrwxa0OzOa5NWMyb8gUOy1MpBdUrFjGZ07Ox1eLTFF9lBcXEVA5gErPMJ7oe6Lc8J9+y30jb0YPYhVBVpyCcV5Yq6GsRG8FU/Dxkg2Iahks5MOMVWxnX0kLqic19zk/XQT4xitWf6ZSxLDlLMlabfBIvX23gHH7bbaWi1EeaIf6dGHUSlB9SV0GYnzBoxWZTmyJgVC0dYWmPL3AAzXyCnwDcoEP2LOy7GT3NnUdITjtZFfKGiYWkQOXOPwojVvtBjZl9MkRyDAPiFWQ1mLIZxltzGVpkSmTtdx1Vf5QaycDKfjuHMOYymqo6u0y3jLikBItN7rotYzGTJY/BTaHPXaRiW9AfXsLZHHVFVhZznW+nixWDkFGWlkzJ+NrdB6o1YLQ6DVtV6pyikjLx9msk6PJHd2OjKjA4vEmj+6WA5vI1f8K1TLCpph4HzAI1dKelsE3YopCFz5/nQp0bfqVIBuY6C/Ts1KiWW/QdQlOc9zufbop/gjiR9JLoi8FCNqKsZPCwxa6U7eZiWkecDtR0O4muJ13UQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff089ded-6d87-4b7e-04cf-08dd7b161f9a X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2025 05:35:10.7643 (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: EaKEUv0ze68ukOjRgRWhq91upQWBwYP1FCCBqjQ6rFIBSniuBHQKGfEjFx3hB6JjMfgcwaHfE68+XTSkbbY2lQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH3PPF066A3CD44 X-Authority-Analysis: v=2.4 cv=UPPdHDfy c=1 sm=1 tr=0 ts=67fc9e92 cx=c_pps a=OnljjeCONrlUuPUItWmgXA==: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-GUID: tNNjhHzmxSAJAcZ7M4wRPYv8kILC3N7C X-Proofpoint-ORIG-GUID: tNNjhHzmxSAJAcZ7M4wRPYv8kILC3N7C 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-14_01,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 clxscore=1015 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504140038 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, 14 Apr 2025 05:35:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214792 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 Mon Apr 14 05:35:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 61253 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 765B9C369B5 for ; Mon, 14 Apr 2025 05:35:20 +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.43222.1744608917318403648 for ; Sun, 13 Apr 2025 22:35:17 -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=61994136b9=qi.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53E5K7tc015814 for ; Mon, 14 Apr 2025 05:35:16 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2041.outbound.protection.outlook.com [104.47.58.41]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45yf58hkvj-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Apr 2025 05:35:16 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tdoHwKNkxsKBZk09ZXJJOVzAObi91CeYv2KdBr3wSrPQV20FivMMbHonUTWMnQeH0Foxvg5naeOL5CvL2VynNMJ6ToWxwM2nImOVojsj5IgIUqqEcwgQOsySJuT3V5wGcGOKz30vtMhtdYNLVS3SnslfS1PrHELmk9yWl9gqtzidJpxy+8iKmgz5kNprr9wYWpAt1V3yFUJlmuzKSXzmNmr4UW+iFtxNkDO03mjMahrwGjCyhoaqR2IxeSHT3nwsoox1Ra/ZEhnlRcgdG4kuDzVEFiuySHO8k5zS9+yX1HACqlaPrz65hJ/e0Br1ZGXsr9b04SfB3Js7WHHhpZSniQ== 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=F1nbOeOyC6qVsmZsD+IIKqwKA/1raO63/4CrMI1twfDC48NMa9UWh4oppt66hEyvogx8hhsHABzEhGLD0UxgvP5EGfT6pL2Si/AWxxfLtBlZuwTsc2c550FRMTSgg6eN7IpkkoWQutxHXdoNINhcfVl2Wg9YVGIXbbXRel3nMKPvC0m5u3ATR29hcrIALj9NMyhhE5Y2X9qwAMc5j4bgSgjmrBAyyKhsEdcpEa0ykUQSRxkixncVzYVhLISSrVrDXjL2Bf0putIIqBIu8KKoe/vZ2hS3+5yM7wRA3fFO9DKt67es2zTY9BmGrm2FWiPR4iSJyhnqPca4C/V/q+rezg== 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 PH3PPF066A3CD44.namprd11.prod.outlook.com (2603:10b6:518:1::d07) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.34; Mon, 14 Apr 2025 05:35:11 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%5]) with mapi id 15.20.8632.030; Mon, 14 Apr 2025 05:35:11 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V3 4/5] image/populate_sdk.bbclass: drop qemuwrapper-cross from DEPENDS Date: Sun, 13 Apr 2025 22:35:02 -0700 Message-ID: <20250414053503.1180029-4-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250414053503.1180029-1-Qi.Chen@windriver.com> References: <20250414053503.1180029-1-Qi.Chen@windriver.com> X-ClientProxiedBy: PH7PR17CA0068.namprd17.prod.outlook.com (2603:10b6:510:325::12) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|PH3PPF066A3CD44:EE_ X-MS-Office365-Filtering-Correlation-Id: be62e653-f489-461a-ae3f-08dd7b161fdd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 9LZAOxEknlH/TVDk56eb9t2CC4LsPLTgRzhMGfFEZJl+QrhiAtGEb5kHPqGTyA6XeaPtbpjkyiBoY4t6J0SA9a8B94sVXpbvPB6qV+uF/TOcybHKk77OLR8WL5px3JcywPdTFTS+SfWXRH5fSaTBNcxGTxtEeEyVvad7UxiVEDk2Z8EiFnJVu8/UkHm47HN0+6oNZW/gubqR3c5UYXlHltLyq5qeiOJnJW4ShcWJe2qDpjj8IkcCe/pnZjOx28x3PR9EntnMBTe3AV5d+b8AdqAfukYoMweZdF/voOLFZyvuKRGmk45sHxRJCQVwWSkkj0Ys+7A7275zyk3/aHzYme20+yrneb6z61x88eJEEV06+hEFSTVpo9UjyNtipaSoRsQ6rybxg+S/2ojLzn+QXXVo3caUBpzW4rjr6EQpyQokF3wxCwKDyxeqnRLrVBABEiBy8iQpuwijyWbkh93hVAKyE10h3vBHagwJrMoBpQ9zY8hqxluygp9h8c3VsdiPKNvsrcg/z7Gj1s4jlj2+tHsU3d4Y3ZTERLOpfRQi7LBtXlNFtxbs+0dPnCiTh3CcLInRNLpTdvhap8QwGVZSNdgG+oImk15BUVRqceW/6X8td7nMpF1AwUClqOGz6teGioH7pHcD/KyS6d34HBFaemuo3i3euyZfuHCxam99Bn9QPQKM7KRIbspRAPx71qRLotZu4SPNjyPRGQ+CDC++IHiC/HCgF7V5ln0PPDwu4YNtwNryE91hw3pYzB3Zheg0D3UNqkeioNewodkX/JwKxnuz3a8ypsD9qXeiCYhfWFQIgtfVySXQk4cU8iVF22RkyvNjivCd+OWCDtDmWL0PamlUxeEF886DZ550F8sQ/MP+nYPHlRx6oD4T5iXhum/kNgVIg6oi/0Pjo+RZck0Df7PpVWOBLNmvAuseUtm3LQ82Nop3rSt0QzQ4mlDMS60XEQ58fxeObrqfiAA4mQKzNSIzy2nnTl9zV7T/I2jZnZHDmv8y1UqZzptSds30GJ6CJWI7gBIW8L/AHjxBVhAtUNjCCicfBbUj2BKodXFkGhX8jAFDR0EJILtv+GJQuW9fKsBAr3DSC9Ux5mW5IojG1sWd4lchNbBOvihcOUgRe3asAMee+lZ+k7IxcchD8Pq5WUOq0cQ0+vq2laZcG1mlyorTjghtPU70jL18xbo546l999+ITVrPuer58uGEoNCtIi2F/glRzLU2IfyWx3AvS0qA3vDeNux/91FvO/8mBXLYgyNKQyBwfzZtVEcw1s+4ym+CrJsatqWUTAINg+O7IpP7IzAIHE/dx5c6EbTY2FY9LxOwSjMYASPKD9bm/tkVR5qQ4KAZ+FFwuSC8aFSmLKcZ29zJYQhfPCAuDmLRPFC+US0NcYAMaf3n2lR1E9Zhn76WoWyFCjo/N4XTT/iPX89ess2BhczCZ7FLhVgzIqPJIP6n6xPuOyvMvMejJv2OQM+AkyiONEDvjQS8k86sxw== 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)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y8qqzdYL4Vh6U0ikwd2434UV+EUhYxgQ3Q49axPHgh0ppvn9aMjJjqTuk3wqA0p6Z/tdY5lPLaPtOtSR9qaKnDsG10s2cV7vCPcri7NHOHQdq+7a8eQHG47OajwX78mtzQdtfRwNSMkQGVbmt3i2NLqa0Nwq5Ld+EU8t1SBTCNEjPX5FLh1AEgI5ipk5UqcR7+KVXQU2EPILXUp6Y/4utlQI5niOnCdMLKvKBTHkBxFUZKrHOEeLYei7F6UIqoOBtsHsRIEZuwe/jzaiiX5Rns6toge3TANl+dku0IvFoQ4g7Mv3yn8iUfjBMj8WPU+j3rkVfoNUtJ0Kfd/IL49UXkHi8PbfiQCs5XloAcs1ZZ5s3dyU//0UPA16WibZZJsfvyEWLx8HuFjr8mZ5r3igo8I6cFbvon0STDgLYH7qwjgvEjKpK8n+K+8/DmgvJpwhbdCsKsGnOOkAnEK4a2x+raZBjhi+xWvyAXgvrK4eCyUnl3KRVg9zU1kSygqbe7CifWvdSveb0c2LqIC8MS+Up/rE/xSbLPCYencHNiYrtoRXONDSH10RMLLWI+FnjU1fCiiAluIIX4eaQTq3Ef5+20kneSIlLXSrdQ+Ad9qETyLzAuX2xdyT7QzEMYyCubzFby4n/OXcSpu8a3gHyl1fRSSHptRmqgy1vTrbjTwA3buVmudPxoN96jPG033LQe3WyD6TlR29N7tDvhJmc63egHx9/2VDU7IT0gAMCFAFplCtil7PYq8UF3lRv3Fmp0vwedYpCuTmV+ehhqSbHzFquzKQ8LNSJHRai1iEHiPbTraGHuGenrjWIQbMWIBBsDDWPJSZiohv2JR0YlGIYzr86vns90l/5Hmbi9poXAHMcJpfX1m2oMf5lcbpEHcSVqYva1+b0wzT4HTJZtDcLvWH/G1O+ef18ruuyCsxWBp9fFBPv7Cla0TpH44svSrlhQmec19FmZY8MT5nLd8gQ2R6VTV6ouVRuOCcDzIfDFIBAq2bG9orloxhC7qYh7k4WrpzOE7hMXE63XTG/EWSU/Rd9fgjFxQ+dGKFAfNcWkMURrBT59Wr6He+41JFUab4u/1lA8bknE6TsSUGEYw+4HledBA2vntIjHlTn/EUC5vuzZ3msWaYYfTTUiCkxlJmkEM3zi/gnIG9FEn/nmCdz1tgm8ez9VZKbbSqG2h5NYgaDhwgEykVAn12wIslewb6zAvAtRwwu5mA3qzA5b/IkNw+QE8O5+HnasKqeni1C77j/eOrVsEHoWoZ3UGt8hpCf6RlVhUu1FD6Ge4+JkGNQ0wN8rJAQTz5WvSLFjxHVKfQqH/LPwfJNEuzuaRgDkBsNUaqIaxeyvIID/nG2HlxM/7BI550HhXltuGGa+p5uUzAI3nOwag512sjvVNyFU9yrrbiPGmUFlfpyouy4Wc8fr7y2VCgA2RZipTzyCmjnoZUEDrG/U9zGENzzurSaj4+/1IrsPqKfhbh30SYVb3LulzVssLEpAFhPwSFQGjpDGtsF++dbUecCTZO0Ljjtb6MQ0j3BsnZmT5cDzjear1Znyn/ZnEgUOb+JpVQrAgRqjnojrf10tPwf3psTmJ+iAr5dOrIW6eMBWBlqEeuNG0axY/IXg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: be62e653-f489-461a-ae3f-08dd7b161fdd X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2025 05:35:11.1428 (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: M30nyYWgw+DrDXy5BwdIC+sL+fta7of37RN5FZWAYc9ByGYlHJITNTNqk/KlSv2M7SDjJkNDR5bGC9GEpPcyqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH3PPF066A3CD44 X-Authority-Analysis: v=2.4 cv=UPPdHDfy c=1 sm=1 tr=0 ts=67fc9e94 cx=c_pps a=OnljjeCONrlUuPUItWmgXA==: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-GUID: t02p4blFMvodjTic1gUboZ2d6XiWHzxZ X-Proofpoint-ORIG-GUID: t02p4blFMvodjTic1gUboZ2d6XiWHzxZ 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-14_01,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=997 spamscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 clxscore=1015 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504140038 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, 14 Apr 2025 05:35:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214795 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 Mon Apr 14 05:35:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 61251 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 66726C3DA4A for ; Mon, 14 Apr 2025 05:35:20 +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.43346.1744608918017556911 for ; Sun, 13 Apr 2025 22:35:18 -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=61994136b9=qi.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53E5K7td015814 for ; Mon, 14 Apr 2025 05:35:17 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2041.outbound.protection.outlook.com [104.47.58.41]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45yf58hkvj-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Apr 2025 05:35:16 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IjAk1Cy5tIHurOv08UIR+PKkRxy20X/MuH+s2wFqTYnVo6xLjKpzClRaQ9E+1g0UlF6PdhvXDSoQLQXAbNHbgczNVVbU6pXrj8fCqCkeZOcENAOivT24IJOLfChozovXhTDqCZ2bPl2oV7SC0fDn8vMk0SHQH60ODeuCwmhEefL6YR6iX8XKDIBmolFZv2V2my4Zwe4oDZv85LmYExOXEPA/Sw3BBoLsvneaANG4JpYU9csLy7PUX6mWUn8G9S6YKlZ0179tgllI9QJYzefCsEGXjlBzSNJmsRjW6sEnb8SO80kCtMjIHqHOQxDMM61KjS3SlucyPt8ZFep8tCmuUA== 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=gZnaNqMprSP0zsdqUjFyH1cobSGcvHfSOryOKDcYr3k=; b=RGSnqPz34H448vRi1QTZ3nfV41obpTJa+DXolLVOu5DD5sjsoltmYflvmNJ+vc7agA8StFth/Tq2x8t+qtML2gVPF23R6iNK6YTWN+9AwyNjXGpn2yx6TvvRnzTTp4+USSlazYQ4xD0X6PN6hyWXHiliD6RajuWJbdNQkVCypoNk09dkc+TZIQIWfe7EcGzqVDDIeL+jUXJtKhxkI/U1YT08XZskGU5piVk78X2Cdk7uadFo564idi1d+CPrt6OeHuA+X8AOqCqUhuV95qYHnWBNuctNlxTgZ4bXj5JMl2rdHB4ykYKb2kLYSHindkBBwZ6Kb3iFpFdkEkfhfDuDPA== 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 PH3PPF066A3CD44.namprd11.prod.outlook.com (2603:10b6:518:1::d07) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.34; Mon, 14 Apr 2025 05:35:11 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%5]) with mapi id 15.20.8632.030; Mon, 14 Apr 2025 05:35:11 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V3 5/5] lib/classes/recipes: refactor qemu.bbclass functions into library functions Date: Sun, 13 Apr 2025 22:35:03 -0700 Message-ID: <20250414053503.1180029-5-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250414053503.1180029-1-Qi.Chen@windriver.com> References: <20250414053503.1180029-1-Qi.Chen@windriver.com> X-ClientProxiedBy: PH7PR17CA0068.namprd17.prod.outlook.com (2603:10b6:510:325::12) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|PH3PPF066A3CD44:EE_ X-MS-Office365-Filtering-Correlation-Id: 2f87a4af-6bd2-4b2e-0cd3-08dd7b162017 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 5mR9LEKwq55Q5e0UVpZft/K0uhUV0P2Flk7AKDJPhnlUqCLlZjqLAGf5vEzoMoEknz4R5C/88YXLDtjN42qPl03ut4fGkwD22IJtqSYa8+0mQ03FN9rRiPUR+QgldpJcH7MiRuNZVtYFimcL1w2G9OIZYIsl/lssf7qD9E10/soNQ+YqbFHY5mD4MRSQ2DGpnNrtB+rnb7lBBHGc2j4RWwawNi1GwK7IapOlG5QG4Pvzse5bJP4pJY5lQWG+PVeW2lCvWcwDMzSIbjT5erWzcRFeXqN7A2/enmlDi8VwEnvQutU4mLPfBqSfEA0CgNMihOE91Aha38Zfdj+dA1TsgFoQ0j1bqgMtJ3wCz+OjgP+5FPRrfxI+RDm+CtazMGFS+emBb5ExxSoDtg0fQtg/l8sbw8XSGIbq/gn2vm+pAXTIdZreJcOvQaC4gh1wLGMD4ua6f06IBZG3RWoR3SRmCEZHCEDKBy7PnXolsVW/zTAsPuqbHaHVMu4ncLz23Ru6Mt/ndU2tnHU0ECtYxrmtGRVHIJN2g9FmhqF+22FikDYv05Qt/BynD3+rtl4jJF6ALF8Wq/lWesLAcEzoIz5jwJV68pVAfsou0mKoEA0dgf5p7cs13+QTElKBfoubg1t+1YZBYdTkJjbZqy8G+jS7G3ycbS0G1WpELvOXl7EojaI7JWx4S9Nyw2FoZy2U8we/b3X2oi0JVQ55KkSrmdneMltfZuSFQyw1/6MORaYAXf+Fy5ysRemFNJ2AN6WU9dwQg8JetYeQY1fqP4A2N2+RVSf3NbVDZw8BIx4PZ5WrffjGUltnu6AhuTJukQUY+q4YEBduxXgzoP9Eol7lAqvLP//HfNjQwWv/wyGGoaZpb2ZffxKu5ckBhUHx9WMa5CUtPQ5oKwIW1lHdD3ISC4QINoSrRH/0r44p4fvG+rkIOEtdzHcrl5xCzb7V1Cmkh612BpopY2zfW3UIzIkXeLckkZ2kkVFBzFHdstG7H/qIFwDGbrt6mKNl6RPt74gyU+SrwFTIUBe+ejOqta6dl7XIxs1zmqgGxK3zJTWc0obbH+pb0T3qJv0dpjG/GA1s0XdCWETT4x3TrZkgH5i0dAhW/ucG611bLnq36vOVYAynX081HvaakP1glJ9b6K7lKoZamNEzozXPGwGp0fBh+oMgrCDMVrL+kI1spvj9Y72G65uMMrrvAGDJk3V0AtlW61bS5hjGtE+Eie4wZyUIiSTQB9QxMG+kiADtWzzMhG0vav5r7yvNROCdUq52Owb9w2YNUUGA7vuEge8jQz0vEdQYDlrHOn+oIQgCJQkAQQz7nVSSYZ7kHGGKmpw7wwMrZW6bOt5Cjpz648roGRZ1B01MMDtXmvuz9HX0OWfsAnzMb0NXKz5UC+PCY4qXQeFSI630aTNLyzphjh35bKgFbLfcEpxDN3Jd5x18AVlTkgWVFEgI8lvFRJ4bwbO89vPtVa4A8bVrTKf2GZR6IW7gFSfTbA== 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)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yqi2kDHTUt1p5dOLegwKqqZ5yWi9795RN+lcamUxeGVum3lZgRcHyNB2vqScG3aKnXIH548KwmSSYCACKQZO5hSrYOfJqpkLMVf2Z7Oe1Da1BXXT4FZbKPwyR6Kp6cr4a41tOeI8hKg8MZalafzCo5cGBvRxdlyFahaDMWuqCtQrOMm4Q9O1NmfUgtRULuOxjDMVbzPZUQ1NTbuwzu8CBiGKrNA1dZSQMi6cxItIpC7tfapZzGBpog2bEL7JF1a6Q9pymydN0fCmYfGpQ9IoUhVztBJZPDW5VzepQHA1KItoRepuPlsZ27X+Qh7DLvW84Hv/B+AOaPzd5mlVZIpMs6oXvcfdtziHT8sfjFrOyYsUCl3uGdHvGED55grUuKLYPshZNPLP25whISsIwTOvSW+exxW4psCBBFEoORUmBaeW0pMyY7YkK+Tw11rOugEAhmJIep1zBew6kapPMn9h9WPFXiEIsUfaCQknjhmxpiAxnznSpYFDPJm0FvodirHQodEU1+szw2M3OBY6b0vnMroGRZdCrdTSWyj5L1/dttANOTVB+wWtvpjQs8K7jobC/e8dOr+gx1vL9A6YqRsGiqcawdd4qox465JVDyKrclZTBvDxQLskuY2l5vpWe+qYGcCNBt3syU3LUgobqj+2Ww4R1aeRxrhedGfoR8z1Sy6hj5t3MkZ/ZiKQC5vgcNLIYfSQEF1q3byT6ygiTA4DJynwH9fP2VE1VpRuHmJwJVSbN5sF7hontap4pQPoz25QGAH4bmqtGf+JDEIrWS1xw61UNwgJIqyRNwSANy4CZtFjQTIDbwVgD33eY/nGGdGV1fu3u2vjGSi0FXtAXe/EUzyhYD0zJL0HtdE6GRTT3D90OJCv08+8oWPvCattVroUuIVQTt34KktiQZSUnX2LSBshao/DmBAEZwuZ/Y3w47VM1XVKM/V2MiG+s0EJsFSxs0ygARPqu9PBlCGErplqc5xZ9pfNkseQy+4T2h0YrdMXqkwGa6b/oSXB4YGRoyL1fMW8LvFO/GUqqEoHpNh5sh314weCZrMTrJKHaBGDAm9fbagNYzbsoIs7XY3v3v6inMeS8KeN4fDe0wcQfiemrU2biDCl9a9gr0bP22t9ydRUixWn5aNfBreAEaj7Yvq+yMesi/OPy0gfSFTcHJ2yh+s40WJukJmWp0PL9OznrFFL5nymwhar9qFHp8ApPVMQzIBcwUG5Cvhqa9TW8vs8K8YK294w+BQ/3VVDL3QC+pyWjTH+yAuqfBLe6TLyAOXI1md8HpOhPwv/out0TLAC6raxv1wdWCsZC6RvuVpr6FrUDktKIys/QGHltz5KVn90YCmXQkhQ2nl3ZpNxj4EldqU5nTLbSQOdCGYSF+WcRrVwGAR70lGhmMAFuYqwZTVjdhkmbLPBuWwMiQ8YfhUwvYILWdNtGVjD7KbL86kDFskwdsfbPecG+TIO2+6iahAqa2S0SZdXCBt4BkJFTOE6Xg/WUsLiTF4Kz1na1p9yjAzZGI+ywj1BRb2RtdG3HrBBEtVi4pwCX6kIF4gL20IDOdO4TKW9k2Y/A2mQ5kpdHkVWbBD8mCoJk5Q3/UXRD1VXayNODKKHZIz40geh+j00jA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f87a4af-6bd2-4b2e-0cd3-08dd7b162017 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2025 05:35:11.5389 (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: H7Z5nRdQ7gBLFNSIoOlIMMpPCMzAyxqlh0aT6gXjSjDiv//C61JqCu11qv8hNDVUkroa+R1EiwuH7jt4oZfPbw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH3PPF066A3CD44 X-Authority-Analysis: v=2.4 cv=UPPdHDfy c=1 sm=1 tr=0 ts=67fc9e95 cx=c_pps a=OnljjeCONrlUuPUItWmgXA==: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-GUID: GD1oj5q6vL4qOt8uzB5vYKaHTkRYBEvS X-Proofpoint-ORIG-GUID: GD1oj5q6vL4qOt8uzB5vYKaHTkRYBEvS 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-14_01,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 clxscore=1015 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504140038 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, 14 Apr 2025 05:35:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214796 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 a55694669d..dd094a874a 100644 --- a/meta/lib/oe/__init__.py +++ b/meta/lib/oe/__init__.py @@ -10,6 +10,6 @@ __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", \ "cve_check"] 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