From patchwork Sun Apr 20 04:05:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Qi" X-Patchwork-Id: 61600 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 72F51C369D1 for ; Sun, 20 Apr 2025 04:05:58 +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.3042.1745121949692612426 for ; Sat, 19 Apr 2025 21:05:49 -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=6205c0d41f=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 53K45cBa012818 for ; Sun, 20 Apr 2025 04:05:48 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2040.outbound.protection.outlook.com [104.47.66.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4642t8rqsk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 20 Apr 2025 04:05:48 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PrWiUmQ2jgjk3qPOOZOpexvFXU76B/R4mI5hMxopmHL+MspIvjXfI4sML5LV9q9NCgJBNF/3l5Dwn6ExlDqfB2sxWcOeT7fDEK+JMTzSsjTrKtdpDhRS6kQL3IOFM/SAiADVBegdellwqP6Rwtm+r4yCnEm7dTbrkY2C2q8/CeHfaJvTer6JmAOQroRl5jTmYlPT8Gb3xBUAn43QZ/Pwl4dh7pQFDF3R//M08vz0OrJwO18GB8BFTKNdff8qbg4B1ayAAPwikFoZEFFXISA74fJpX1XVVk5cjdhR7Y8jV+fd2vpyT9P3rAEHaF2HE/+xWKMXZPOW30Gxc09momsHZg== 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=C7w/pe9MhG2x891uRxeOcSuhQFjAatoOP9Sn39jt71M=; b=uJXP/N/9N1WLuJfiV4CxBKFsC/RsERi/SxnPEi1YukmBkH8YMfTHboOOoN9J8sovVchj9U9oM60VxKLToRl4i473pi4ZGmI20zoqZKnBR8kz1MKpH3Ovl20luFxF3mbpH9qVx/0b6Rike5G9L1EdJ1yrULa8O3VEpDip1Vi1AJZwwGCd9oLL90DiCXrpNh8MTRY2oC8PwTltLMJ4qaT7YANzyYLbLPailQlRrd3mImVIM/72jJlyNStmRQY6BlOcgtvrloehHsiI4x3kJN7VddaS4d/BPGTl39iJe67TxPpVKShU9+ilaDlr//I5iMJE7lRbmtXGh0qo4bho1iCyNw== 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 IA3PR11MB9424.namprd11.prod.outlook.com (2603:10b6:208:583::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.35; Sun, 20 Apr 2025 04:05:44 +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.8655.031; Sun, 20 Apr 2025 04:05:44 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V4 1/5] classes/recipes: remove unnecessary qemu inherit and use qemuwrapper-cross Date: Sun, 20 Apr 2025 12:05:24 +0800 Message-Id: <20250420040528.4012613-1-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TYCPR01CA0198.jpnprd01.prod.outlook.com (2603:1096:405:7a::19) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|IA3PR11MB9424:EE_ X-MS-Office365-Filtering-Correlation-Id: e6491802-b6d8-4299-a271-08dd7fc09f64 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|1800799024|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: S+JOwfYtfqsaXgc2NsVovVA17dNYjqVJjeO5so8/fWkGYH3Hl8GS1w7EgVFBI9nWbO96HZuVXXeN3bDJ9kvVM/3zc7pP4GdvMDcH9TXjPjsCbN/gLge6ekUXHe4A723Y0J1+n0lw0IrVXhK/F6vqOHYG9cOXKFS10eOwnbn2c9KIKF4eUcLGUGSicBvCIJcyRa7FPfp48GtvQpAD/E99fquL/NQTrFYAKI8zVfJ4s5EcoBWWm+/DQ/guYvyPutcs6qY748QHCpvcPGox4vq/2tw5MwRaWCB57lcFBBcrzxb5mtBXLIalhGfVSo6hB+41p5NEloWHnnHLLeQPtpFDiX5Umgs18y/scq6GH+wHCvp9v396RhOMR4CGq4CB6F1NTNNycQZzJ9S/k4ZtwGZiVzQr1ipKAESDs0qKE0e3St0BSrBnZTVZKMRp61I+e98HITGe+Q6F4feC3EToZVqmWx7JXiRs1phlzrzPq8SXNodQ+2IwhNi6FgjbAhBRy9PdQBMlmxaHtgoFhbrT/lcRYXQG6jpsWa22FLlPASzMimPEYj8I/C7XcSWqyD9ZdFb7ljw7dQPIh/xG20JtFX8obRjQQeFFRajYn2sDrWEdUagNbncAZY/SErj9Ar1slFjJKG2KhT5OQCrlxo3s7nbRyh9cdHF+VFsVrx9tjTiwuATH83cndCoAZ53BeZtYVd3bAZ96Bo/lIx4vDsw4+5c3UvHpSoUoM5xj4OxBVlsfL4dVfZkDkhWwsbeixb+fpNXAMzDSn0iPpOo8EZykQBBQ7d02AMHRcoyT1DBqLGhwHX4vuFrS8nUjBh/NmMeIDg/M3lThrcw3scdtzK1DIq/zoQNHe8lq7XtlTMnaygTO+OwHpc+7IiNg9WR+JZzhZHkm52XLuBYWepPWzASF6wP9ERniTQjYugfSqHKWM6/LOrlMLt0wcXRD/bpSQsKjWmrWIrL4JOfkzxvggexmd7ZxJvHwe+tVPsZySo+TfVCtcNNut7hSXuQHyI7v4a1PvrjaT1cLhohN23Es2yYVtfDB+6WJAc3EG8VwzNQ9NoyYUZrsKk1FOStAQpuQ2Alxd+6wua2DNLjv/5Zvu3ueCSwo198aOOckDwARcXR97HEuS/KdyazLyMES/Q7lpRURoqmZZ7By5r+QboKeFG1S88c7FJucTkl1Vr/sHErTutIhxOKQp5NhO5cFuscx5zd2eihQq4w9ntyhol4jNa29m5IaNmePlniRaiHg4qozH3UMcr9IBAEBU2gPpqwINX45xHXqkXmbF0Hsapw8w4Gwci2Wtm7zrLlfyLQ6Xzw5gJzIfstGGk5j23aYqPuiZvd8n28gSiAYLrYgM65hKhiAXYjngJf/IzCLVWF50SPo7hULE/DY/yke4EDIstAhxPwmcokPLoduOfOseDiwmr14SyxiUDh32YikLsW7+DsZbziG7AzWd6Kmt5odbE04ESsOSr2nPSXsljUWTd55/CM7gztezZUhXeYpg3UAGl/jirMUp+I= 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)(52116014)(1800799024)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0utQwNx7fm9l8Xp/ix3x3+gFcAUs7qXS4AACOubZ9Puq11Nd3Ubq47rup4v62RxRyWQ5RM2wNfUol8LFaBbBaNfqQuDOwjY8cinBDuvzeUklqkNKlUlH3bABrC2mWF84l5301asTVQY+dR0rNq3NqUgxhIKnY4PVU2VqcyD6LSF7LpUJEKI4NXMvuwt7k40btdSW+DZlfzOd3Ia+Zl2ylXWpxSZj72bFvG/1vC58cqzCJlmHLFk6s00ilY9yttCfl9nBo5u9HtHN2Jo34+m2iZl5OvSJU0iIAX+JVXDKm+U+sg7d4keVgwee56K5vNp7ooNmPs3mfVTqz5w4WzEiwPF4QbuBisqh52CdvzVY9Z+3kTJlSRgseyuxXAFb0GjNEWKVWZHmLDD6dp34nDOJu/CfaRcaeunCBLO02DOJzG9fgblI8ycnfNIZ0ym3MAv8l4PMoKJF3xXOHdyT4V9ygwMumsbt9eYrcsswubE+B1DMLMSkusx/I+pmovMVk0wF8U8u+vAxmr+HmxZmYcBd6wsvNCLVdDN8AAFP2Wl4pLWGOnrQXvb9fW27/jnaXKUSpPFT8SN1LQa/43q7GJ3v/GxlXhXCeABnXT/xvmhLLfAQXhNVFTVpSzMisLbqJnT/68URNeL0w3Yo+XSCExK0/45nRq5OxRx71YBQIsoSm0yCwcr2a7Ee/tVUzQ1UyiT6p1jiOhDz8qNEH/kxKHBkSDmSbPvoU65ukvbY3anIr3JelAGycbArs4IBze+bd4hr3vt5u7vdGMhegHGrTaIHJZeOQudd1OLXKAJ0s2gNQTeo3fVc54N/8fYZxQopMnPOfZz8gKFnjN3ZFP7wSG3jMB1z18Q2xgvFvUcx+JpvVrr6JdTdiLiVjLwJIoskcV7luO8CbJdVipFbkj4+YvHu+Q2ipoRpkoal/C5fyPUot//VyDEZs+F33aTvSL0pMiF/BYyk1vkJZf1En9mJxVwiJHnb7nWuSNjDV0ec17obsSAwnQ/hhST2b5UA+R4brpvje1m8/yjOSkuTRGXj6UgePvWSjHIRs2nYKgTGgO7IvyhgMuLbwEpGJn3f9xWi2QedsR83fXHfMOw/721g60LmI6YXN4IXyFAuNlzczkg/+El4/kKZiopMzZE+kHdBe0r3Kb1CkTdIUye8KL+eI/c8K9L5rokx8zwE2Oj6qDagPF42ekdgIe12mUdt/dBxfiLmazsuS4PYtIIfDWGU60lJVApJFNKaD5AlHoXUop1nf+z00dJeqUVNfY76fdLx78OE48il2E9vqGudbeTfNj8XrwsCyyY/9Pxx+7mZV/ZBxe7EktwaXJjGdVIjQTjbJAuZEXuVQfSUTGdiM6zrPCjE11OLmKm+yZSM4kDhVoe+QKLAKkdwtWJFK2EfgN3fC8TBLoYB4SC8P6OaoRibg6csL6oCfYrRQ9+82aKQrouEHAZJ5kkcivJA8NdRRsN+7ajwAoGAD9AHle9PaBg8tOA4QEM/kadmGsNS09jdZIcsXbSyDu++3y5eEAqbqQ/rZi2IdMALFBViBpZeASF0QUT4PpyAZG8NlAoqOBJb1YJyET8tDcOo/X7mYtcCKZ7TY6Nc X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6491802-b6d8-4299-a271-08dd7fc09f64 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 04:05:44.3478 (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: pGpHK7/SDLuAZXNj2AitCGoBxOlrqj7KpiC5tErYc+muJm+adC+/mXAxolGKwJ6+KmT8egm9mIbEsWx+ZOcN3Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR11MB9424 X-Proofpoint-ORIG-GUID: 3GEfCDAWY-lnLbDUN-1_l-fmmteLEPkK X-Proofpoint-GUID: 3GEfCDAWY-lnLbDUN-1_l-fmmteLEPkK X-Authority-Analysis: v=2.4 cv=TJ9FS0la c=1 sm=1 tr=0 ts=6804729c cx=c_pps a=+kc2f53xTGsvuL7uaCOpcA==: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=QMWXZvJJMeQF5stC:21 a=FdTzh2GWekK77mhwV6Dw:22 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-20_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 phishscore=0 impostorscore=0 mlxlogscore=999 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504200031 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 ; Sun, 20 Apr 2025 04:05:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215145 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. Also, in meta/conf/layer.conf, exclude qemuwrapper-cross deps for all arch recipes that depend on it. This it ensure allarch recipes have the same signature across different machines. 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/conf/layer.conf | 3 +++ meta/recipes-core/systemd/systemd_257.5.bb | 5 +++-- meta/recipes-core/udev/eudev_3.2.14.bb | 4 ++-- 8 files changed, 13 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/conf/layer.conf b/meta/conf/layer.conf index 6a70cb63a5..e19431e724 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -89,6 +89,9 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ adwaita-icon-theme->gdk-pixbuf \ adwaita-icon-theme->gtk+3 \ run-postinsts->util-linux \ + cantarell-fonts->qemuwrapper-cross \ + liberation-fonts->qemuwrapper-cross \ + ttf-bitstream-vera->qemuwrapper-cross \ " # Avoid adding bison-native to the sysroot without a specific diff --git a/meta/recipes-core/systemd/systemd_257.5.bb b/meta/recipes-core/systemd/systemd_257.5.bb index bd57f1f5a5..1379b21889 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 Sun Apr 20 04:05:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Qi" X-Patchwork-Id: 61599 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 70BB9C369C2 for ; Sun, 20 Apr 2025 04:05:58 +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.2979.1745121950242878618 for ; Sat, 19 Apr 2025 21:05:50 -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=6205c0d41f=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 53K45cBb012818 for ; Sun, 20 Apr 2025 04:05:49 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2040.outbound.protection.outlook.com [104.47.66.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4642t8rqsk-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 20 Apr 2025 04:05:49 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tYP0WzhuDr4UWOMKf07ZlGPqyDa4pFjEple9IMPZfcPL6nhUOyUhsbqS9eW0/rmuP4TqZA5Tln3PGL/24LGns72b4gO+lrJ+c9UEl6IJEMkuPzbYskBsPlRqE67gk60Ej0+Bo1C1ZxhEA4oYfYRqhmm7YsfBgwwnlRkAJycZtAMcaq2WpUvz7BJtIxvR9mo/0I7X77RgfA8yWICMk+QECvxM3war6Iwv9BsjJfyBoJhAF7dAxzZOyItI/ovmNJzZwppVu/po4Hrxk4Wb1mfIEnK+w1TKnUfTlBs0tQm31eChR9SwdWK++Fej8thtsYbvIz/CC+1ePKbeyjk4pff9fQ== 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=oITGZO9cScOnEbi4kTPvfVQGQ0fOVmlXHdEeqbQ0CdI=; b=Se/8ZAepIXnZYmCohmcwYM6y6IlE4BC4yhAUooy+cYr1uQqIgXAt7y6hz5AH3BLoZZcn4UhJ5utM25N2Nx4le5QlVTd0JaSPsQt9ytJKfKSx+eAvLLbGKbsRpA59GIn9o5WupOlRJU4OV3h6qXdNbAIrg+YhGUzeutIMVZMKxzxCzQwMYp6DiLsXtkXrn+MpX6gE7JQDY3Ja+22dGIEnlQ86A/BNmny1LkPIqnuoYG82P/MjbbyuVz8CIlVQLUHQrwx5qGO1sR8H8WE39OGO5pEjkxJK7Nto704p89CB0Aw84nBFUjbyORTbChyVU963iQvHH1xZvzPTUG4mjrwChg== 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 IA3PR11MB9424.namprd11.prod.outlook.com (2603:10b6:208:583::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.35; Sun, 20 Apr 2025 04:05:45 +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.8655.031; Sun, 20 Apr 2025 04:05:45 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V4 2/5] cpio: fix ptest-runner dependency Date: Sun, 20 Apr 2025 12:05:25 +0800 Message-Id: <20250420040528.4012613-2-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250420040528.4012613-1-Qi.Chen@windriver.com> References: <20250420040528.4012613-1-Qi.Chen@windriver.com> X-ClientProxiedBy: TYCPR01CA0198.jpnprd01.prod.outlook.com (2603:1096:405:7a::19) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|IA3PR11MB9424:EE_ X-MS-Office365-Filtering-Correlation-Id: 184935be-2d9d-4e7b-8deb-08dd7fc0a007 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|1800799024|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: NkCo+Bbk8tjVDspXDl5o/B7cvjVLMToXpRiSc8OrpR29MdesmFS+LiPJU978nG78lhRqj3ezkFr3ORskN6rXrPrl0UhchDhKEnpCz9F2HogUgwnEQzwR/Qp4z0+SiggDwB+72HhPB9HIIq9dxfH1fuSAdLFrN+3He/IWv+w7aFmyxwirB+YC6XlgFx/HWMCd4wSRExpIGY8upQ+YzB3gsdsjQdJjO0F2wEW4j04pubq+f2Jna6MSLhgerHa6evuSanwwNNCk1lJyqFR7Loj6oLoN2QeOESTgIwcRwUQHC8192T74Ksu1/yqdmkf1QO2ylMgFYB3jrUWnjxH4VPkgxwIqQeIHOcuX5cqIHYKar4cLvCWcKkIkfjMzuy+umNbGamZIfo6e36YG01P7D5U9855zGaVGYC05irT++m9JXkBTu+MtGspYyrfZo0M8OH9SlnmcnpfOt2C/EQ0lq/8zk6AwOoHS6EVDKL1hsSVCohxoy8sEvjOW6js42zuDiN6H3I5acx2s5RF54iiKT/uaU7I2QiLtMoIPu3IgW9ntroJvUH6UFmfdzkHJXvv0xyDNMOdGeUBzWoLtceSz01WAyYCejfxRNsKHnJPsmo8Z31laf+WfM0CKkixtloFg636+I6wj4kb8DIudsh/fSfzgiwfwFsyCcALZkXIPBo6XnfTLog5xkVwMLzk8PRF2qC3bV/roqUZAkzl7vDxskZunIsclIjRpkg6yKTAKhnsHIaIcWlAMjUodYzgQHfTorjXo9dv/Q+4A9gWmvBHLfb5uDF9YJD6RE4lFftLd7+cXVC+Oc7sQbWf7ilJa9j4Al7cgpcEbe7FtppkbDnzKLHvgF/WxK2Bd33PQiuo9yf9ok5K52UzL/PcA/upUUZquDWeOFtXkXw6jcbQLmnHz2nrEDuPfDsmFS1N7ZjlKBQt2KOTvKylAa0WSZ8xBhNgXU0Mb0BX6VofEryjs5qBQXoIfcFu+AHrI2v0BJqfcefcS1t6yIhNCu4SDkP41MGnDN8zRvsDrWsqQ/lmQhcFNXpqxdNroMck0OVHsd2H6mB+T8OP/i7P97a5trrho6AsfYr7nfSh/GnXUxpuoc4X8AbBqBIQR1x8+KybeUUqXAcfKmOdsyuFhMQqNV3JVp+p93PkZssfeWzmvLfPBr8eGTqlIF3HX3Gq6MZDZ8XRfqNWNTYTJ1Ktrjuyo4sd/jdG4w/w0Y6NzgsEA3r6JHYItSJGssB/UPmni0DQAZg4h9dW2crX8nfnsu7B4/F0V9OODUwSOohldRGLwPQ7vRM1JDvkg8fzMfrHxLJUk0O3lUdt2DPHhCdAUUmgGAksDi5QZL72aRjprBJ/MCtNPpvYaFGPP38jw3GVS6nIvBrW+HkCAvLKlTpLXNvJ0b4oNpTbwtXLnKDsDI7zrH5d5IUGImQ5Rofm1X7cJSI3StNqhtFwQO2momTXzDHFJKrf76HObqD944ZvQtskofzpLaAOyB6olpw== 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)(52116014)(1800799024)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vXQo59qhucaKzE5WbrYUSdcz1enuzSJdDXA3D/thXrtOS6bOJ0+zTCQ1KEN41dEPXkdyRbcOoquaal/gGgaUWMnskA6K0KWHbtWlwbSfHfkU5TY/eVpn8BCCKind9kf4/JmFuteikmJtQ1JNwiq+Vut7YUJamR3xwg4TOt9c4mihviSWhqCkhMh2uF8HxvamCY66vLEV5vIsSC+QGBVg7W+M0yw/y5cxM3xDlsuFG3rE/BQjz5V+EAYVq64fgbnwmhrEcUsf9IvU1Y0qunHePLrWHXeij2vsO/HQEiS41hy412bCmI+gtY1T/yLR44dWjBrgxjXCOAkq449FhbvoONU7wBwnS+jdbz5T1VRBVEweAXdyMSik8lr492ZvH2qVIvKKbYmupbT6rI+zk5gbjTi/x7VLzqHTSOIxoeqrrEktU9+EDxPP2yMzHzOz+9yVRXoNALg8TozQrKHaw9Tcbcy5kR74bK43GoWwRGoccXG4pzrF6s88HZ5+hIL98c4Uxm0BUPPSlJUM9t3APshZesIxOJbaItiQvKKk4eg7S86RoPMC+nXirdqEFVDEWUx/kYE1rXvppn30maE8cA9pufe8aMGNkJlYKGLR9QJQaQRD3weDz8Lk31XmwCLVyU7j746C3Oc7W3T5+Ku3/Bl+lMDBU84ihemK4t2CikPOMSGNEM2NXgzeeoAml4IkQrEzJrkpxdZGFb2ELjqe4tbIqcNaEt51kpCxDbTAAL2TjutoduE+qHentvsxHEqI9ibQMYN4oixMnreLtH1bDEhlRJfpS9hLE+fUiLXwMaVKQE/h4uiq9WxbmMFP1bq/4KdGTe4RaDnIjNThwq5D7Kkm2oGshNyZeuCo/Js5yi9Qp9a8jUGkgc7eJAwOQsK87m3dU1/cFpHwLYBJhG26PYU5yF8J1hZ6LvO4KhBmKZRTz0LJoNiPAB0sbyFoXl+rkS+5Ea0QuI5+SB9Xa4mHe1xs4VPEY3PZbdVHpaQe/S4D3FmmZGBsQejVyaiFDC4RaXCQPtCmWK8lmP9miwhN3FalyndUXsSS2kN9u+L88nigErfOR0qH8gX6aGtTl5cO8oP6W2231aP713VzXzeHSuFwg83tjUffF0qCpRHWUj8xP1FoyHXh+FX+kgT5uM7JjR1sWjqJjGbs1GKFCNfa7dS8pvMmsUVJZJALZrs6c4T6sJ3WIYwfaPlTEe0ga7j+rx8EIQlrTAkb20KXBaj4s9RckNhkInR4gO+Ja7xX5jANZQdkrlAMIWroXyrGjWFqVL9Pk7T2U7TghBawxTkLWoJzLHfBsTXTPE2xTaTUmomupkQ0sKzK4wVZG6CB8lXpqrAA68eqTSbc52Ll9aKEvgjjHWZOM8Uuhkwa5yP2zWG4neNInEyBZgM8KMifO6mRBgKQCBiang7HIoT/VeeFWO1nlhVgAyCZWJftxL/MfveSvKBHZHx25ULHLe3WXiTs0BhsrwnymOB7/dhRP1PyvnjAI/mN8jEICm/m12Bze3gtwFVPzor6Z60CORjcXMTJLga2sguZssgJjkcMiEFuilUAuKPUNz7iYAO2hKCgmDzskvWdfx8Br0rIioz5Pq4uaksX X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 184935be-2d9d-4e7b-8deb-08dd7fc0a007 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 04:05:45.4661 (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: jOUtivjCz6wqPrDYw0xroT8vbSD5yXhM26II1JCAc3+kqkh+PskXsPtRO3AN1Bs3SmI6TF7F5GFzSfGqGA984w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR11MB9424 X-Proofpoint-ORIG-GUID: QKxSXG2KU4CvZauE54I_igxtcdwFU0WL X-Proofpoint-GUID: QKxSXG2KU4CvZauE54I_igxtcdwFU0WL X-Authority-Analysis: v=2.4 cv=TJ9FS0la c=1 sm=1 tr=0 ts=6804729d cx=c_pps a=+kc2f53xTGsvuL7uaCOpcA==: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-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-20_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 phishscore=0 impostorscore=0 mlxlogscore=718 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504200031 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 ; Sun, 20 Apr 2025 04:05:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215146 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 Sun Apr 20 04:05:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Qi" X-Patchwork-Id: 61601 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 841E5C369D3 for ; Sun, 20 Apr 2025 04:05:58 +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.2980.1745121950850403358 for ; Sat, 19 Apr 2025 21:05:51 -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=6205c0d41f=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 53K45cBc012818 for ; Sun, 20 Apr 2025 04:05:50 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2040.outbound.protection.outlook.com [104.47.66.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4642t8rqsk-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 20 Apr 2025 04:05:50 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PDFLJ1w3nJ1ozIHyD2K40zZ4GsFyhR76dDoONAmgqpQ70RMknzUXSZVS3/0mknTF7ti6cIfbDsn7vVJOnLVwlIj5IZGEb20gmc4pLU1//zT4dKWk+8LgeyXsWFFN0dU1QMzssXXQFpiLp3k0/5So3Gi1hkRYe8NizKmfqLd2zRFfqRt7R707OFdyhZhltZKvpYET0FfzTfFo3UZEjwnH8CEgMNcPj6NLc6jcWm8SJJG16YUPEbtUOW1BFrrKym+lKo0uE7OrAe9GAJ4a2evAQUGzPKCJFQlZDtGR8A23jAKAJSNqTsVmg3J5DTyw6DtLUzKlhq+ubEISrJysJYizBw== 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=qnEqko4LgkK5KfTZb4611ZXD71BxKVWuNja43npYnSU=; b=JKUmL13QFhwGt72VD7dL/UPCCix1NIAQ714eEa0l6f/EcVWLl7fyYCQ3viUaX1dDHUD8spwdH1ptFQ0U6P7KMqWWHt6QveutgUIER3CvSjpFQWLMHyNSEUf927WvWcx4x2i7sVgpX3FoF97cNXj4gD4LBw3EPgP0iYuQeCaupWADjzmQjOfAUxd1aMMjLAgYFTrIbY0uv0uuljG/UKfS7X93xx4GHGqBY3erXzlSsroPTzUFEWj4u8b2xU0Uv2BIfm/JQHG/J+cEdb7Y42FAUfOIAxzdO37kuXsIAvr9PmF2gESZKuTzdMuGuZwtuspeDXG8ym0VQaNGQ1cqGgIrKQ== 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 IA3PR11MB9424.namprd11.prod.outlook.com (2603:10b6:208:583::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.35; Sun, 20 Apr 2025 04:05:46 +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.8655.031; Sun, 20 Apr 2025 04:05:46 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V4 3/5] nativesdk.bbclass: handle PACKAGE_WRITE_DEPS Date: Sun, 20 Apr 2025 12:05:26 +0800 Message-Id: <20250420040528.4012613-3-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250420040528.4012613-1-Qi.Chen@windriver.com> References: <20250420040528.4012613-1-Qi.Chen@windriver.com> X-ClientProxiedBy: TYCPR01CA0198.jpnprd01.prod.outlook.com (2603:1096:405:7a::19) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|IA3PR11MB9424:EE_ X-MS-Office365-Filtering-Correlation-Id: 38c7f83c-ebdc-452c-06b5-08dd7fc0a0ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|1800799024|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: v5FcdW6GQZ7ZDm+LAxA01PwD/RZOXVOVBT1Be5LqFH3Rq2gqajVGCzFCNgLGj6pK6z9eNQSSM44+DhKmnvJPkREtBVjG0duCoqD8Ow2Au5Lykz6r935/pcRCEfwAf6X9Lmn8/oxJUH1tHn3GsBqOqal5xhC8Ua6Oa1fa6ENX2JcFDa+oE8lluUmSBlC1sMhO7te8M4jahxwiacMJ/NIf5WhCIPJPLVVdGq9wX4qK7pEb3UlokMoY3ErZBr94HAReJHyS6yRFIvjPmXl5J24bIufmnh4QXjxllhV+dq6I9ssQcNHJkNAGg0s6i0G4vQ0n/4TCmWH+ueqQENX+8kCU/ladbDCXRbOSt+eKxBFYsWQktXljCztj8jtR4VNA+SMdRM/mIhwuKzc2Bk2x4XJQN31dtL48MBSZ7UYlapEGvrU2Fub94LYI0y/5vmMe/JbuWQ+a6FqCdlEN2/FBPxzlKnYn8TV47F9ogaj3NQwgezASwh1SNRV6xQ12tiswyEN78k8oiiwo1T7s/ilDpnWdf4K8YgdUJizhkf+x4AodR9DWrMa47v43nf6Mp/PTuv8ltIrybX/TKLyVZn6ltBIX17zfekfCs4t2J2vCRgJHbpmnp4UeUPK/rdvHj37eHRNWpVQUyRv54sBkUK32ptbKxdBoIuS+qGLGFTsljnxU3SskY+/eOsnPcJZzS4bDSN2JDjiZG9zzxPT+3z9Pp7aaI3Z0NgNIfDRFXK+e90QBXOiSQeVIPSGKLL6EjtfRu/OwW9V5VtAdmf/Ed7wG7WknCiwa8VVs+2SptUehnhoaHcQvjHziKr2r/pO/VdJP2SKPh0BOMOLjDDdCRSKvE/7OFSdrs5cir9f3+Z2imS2N57XPoJaqQ6EjJ+6SoiWncsZSpl/9H/g6ZQvOiIcVrNDYTV0gRzYPXpa2OmbmJvgWpvG2Fl6J+T+qdumIFyQPhbbnMDdi8abJF5w5EiRW3X6V4H2BpaTBko+6OViwzUflxqbSmRjGpmD1cx8GcWizNLKc3mFt3JoEfnhLaUP/MxIfU4puqSUgLCmG1AyDNNUjIZEm7sqdZILqfxd95Sxia3WIdcGz2J8w4VOzVNEGHJzLhswoUnPOt7vSunfcQgFc8UE1cSqbFDBtJcMMv/D9fyWfwfQqnOp+UZw1M5UEnbAzBEU0KjYRMCuA7u14+9ZonVcuNmfVtDeA+bjklRnrhmhtDa9ZvC2PYaclbz6OGIapSrHczFLCnXwcYrv+BgUrCMCZPS5c/zesvwsVxr2A1OrRComHEKpBekxT9fad8qxSE8q/bw9eUSle04dYNrdqqnlchtlinVQIaLqS7aBAJzM5/l/SMqGF/ZyThhd3OTfkmMGhWH/2m5uDZzy/WQNyH/iF2Vno+cTpBDt2CwRMy1v1luJKZaiF/1J7BoHGDVcnazfYE38bhe686Lgc0LlRQUqLf5ydhkY0kVLcorNHGwOlCzUUgA30EJy+ApUV90Q1zw== 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)(52116014)(1800799024)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kbrQNTL6fUDw/9wwYt1FdamRk4gYB92XIb17SBPKZ2m8/3j/XPAq3kpjM9jSLzyzlHmnuvECP6S4yJmdOmXfIFvCDIyMDuLn9prsZ5oqjztY9eDwvEmO/e+WWBB41mwllWVvrJ4mBjxzKUyIhsXaqUSblpe9Y46aror70gXNELMopsP1+NccehVU7gY2WvOeIivg7hW+mPWtaCfH3CfphqiTWsIKoBmBu3sf2uiZP3QoEmGkiB/2RxOkVPcLuMbx7ZWXlj9HTj0RYJmxfgD20xaDgT1y4kcr7ihVqoPaD+k8JF33vr9ewD2m5sr5WacEXasnSQtElOQFBxv7T7eq+4jm8hflNw52LBMGIXUeNfOGzNif5xixnMX9+feVV9Q05WsfNh898XKjzqZSFjC6MKHO5BrfgYUb+kAIMSMOekruMkZG6p7yJFuHlfc6fryml+jJ5YYG3J6NJXB2INv7vRpUasN4ZDrqr78u9EnhIZEVABH8yMY3EvTjzLFPAWakqMoUKcIFDIrDxdoNBtR+3tVNNUPfxuJoNgGl76Vsw3eiEB9RUNW8/iNGYqd8CqupvoCV/rhEZVVlXkRaYKGLb4NCh9YEjh3RATbbgi9C//LLkhxiQTLBC3aSSXCyhdnX3Vx+Qqjc7msHs7vHMdSdMJaEGaNWuuPByRgo100ezuXaxiQNzAH216wuus5pLHZTx0Q9CWu3TF7LAXiMKs2VctEFrccUh7bJL3hnPt7nmBKUzh0OhtnNZlvnlCwjUyKovDU7ZfgkAGchzudfux34+erw78BYV5UqayQQezyCpx08/+x7NBDfdPeb8jLE5stMkkXi/SG2WO3eI+VwIxMLGHEr+GgYbwlGVdSGBzhT/9U0kZVrnIq3Qz/UE4gFSD8yrTkt1s9aTiBM0R9+KvlrTr/Slz6hoaRfueXy0fZSkOWm3rOGLkrIZDFggTn7mWcoHzY+1kmox6NTocB2M3yTKvo8kEH5rN3lYOZMl38Uxy4pgHMjT6eqmJYyKajiVnYxg0ySKhTeKqIHeyLOox7IeXszoFe2GYabi6T/p1c4Pfi5gOYHF8rUEYiqTaZzz+/REY891t3ic/bMl8e/TeACpf/MOpABWEhGoNRaZAuuuFSODciQWgf/z7wbNeIN2nEksKNqc/eYbysK2jKKCZAiHoEkhhzhZPchP6pw92YdBAPBB4PQJYDXV8JZ4zZsPNDpq36GOlZnyNlPqJSkZm+JzVDMG+Ose1IrbqqjktQPcGLbVXAKKydotbvI6HA0wonWZmJjuPKbq4HfRNkgFsla2sH+gmGCIfSq1/xccyQsamsRcTtkTdF7iYHahzNo7DJlyh4aQ99vkV35ysRSg7giU9b/yp5t+R8ARLtMhlL9eeVXJG+PsE2OpGcketK5vNcMzlaHcAHRD/lfBmQ/ydjmsQKsoXi9Ur0h0cdcH8J+sTeBqonvdGw8r1kENvKhNl+3OtTYYXIS7aTe+c6c87As1kbm2PMDpl/ky/YmQ3nZLQ4GCR3FgpNWW8YR+nouWsK2FqlLUcplMHxhoAzYMe9dyD+3OfJEkYKzUxUHsmalArLAXEiwuIhs28SyZT0GlKCJ X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38c7f83c-ebdc-452c-06b5-08dd7fc0a0ae X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 04:05:46.5055 (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: Cpoczjk4MfGbWzTnI3fiCyQmL1yiGOZn2llvder9ywIiaMoUKJP00A7ymdPxbTHSvMuOJgK9K5QAAJe4hQicOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR11MB9424 X-Proofpoint-ORIG-GUID: MK8MrthkEwu1_GFhWy2PNHFj7rEf94Lf X-Proofpoint-GUID: MK8MrthkEwu1_GFhWy2PNHFj7rEf94Lf X-Authority-Analysis: v=2.4 cv=TJ9FS0la c=1 sm=1 tr=0 ts=6804729e cx=c_pps a=+kc2f53xTGsvuL7uaCOpcA==: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-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-20_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 phishscore=0 impostorscore=0 mlxlogscore=999 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504200031 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 ; Sun, 20 Apr 2025 04:05:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215147 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 Sun Apr 20 04:05:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Qi" X-Patchwork-Id: 61602 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 879C3C369D6 for ; Sun, 20 Apr 2025 04:05:58 +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.3043.1745121951529799547 for ; Sat, 19 Apr 2025 21:05:51 -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=6205c0d41f=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 53K45cBd012818 for ; Sun, 20 Apr 2025 04:05:50 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2040.outbound.protection.outlook.com [104.47.66.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4642t8rqsk-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 20 Apr 2025 04:05:50 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ISGCpl0tBc02Ximf/SSiSsGoBwfO08+y4qQ98xSzziGOpsu/TFrtUf3yvxW5bQLn708cFy/oLztIfX9Py177DGctE3T5+x9UBZzHg//sQaKTn/rDBlFBRybu9yttmzuukgKluoat5CEuxgacQWGenYm5cmATGp4AVRt+PNE0GZxSsZNQ+eyS5lMapTeks6D2zn1u8AkLh+nNcwNo7x9AsBJgqrEMiMIg7FZqJ2FPCpXPC3RsEb7YaKjsMzfoo0foi3EWuWx2FVIh3hohLtAq+zCzDELlBYJbnhtVfzPE32mQ2wmmIJh6UMxKVgGfXaTrz/lehUSlNpIwoXjzXhFiEQ== 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=QHlrPOC6TyVCDsJD/oRWmlD4Z6SGM83uGkan/UyBgY0=; b=ovZJ3nHwBaLVLoqf3hmEaFlNpzxQEkI6DxpNqPCT/RoZOxfaPx155hrYJFEpq6Ed42JNkMX1RBTFI5/K0AJA8u1aG3zWmPmwASATBuHBcJIilE8wXberxnjI0S9FPU53Cf8IdpjQ2s6aCclMTA46IL/5UiZrN/YK02loY7oBcddZHSvmGDRqL8U8BK6zT75AMZcqRqUx5geNgG1gj1GF3F0sZwqiDt4J56C7UHirY0oI5IZRDjrJijmnW0Wt6pkBZapH+UUC9jYLieg55u6VQDvdZ+rKbn4tTuWkq+rB0WDsnZT+gkHOGCIq5N0BV3svIl6KkCtGk7WYGBBfBZIcUQ== 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 IA3PR11MB9424.namprd11.prod.outlook.com (2603:10b6:208:583::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.35; Sun, 20 Apr 2025 04:05:47 +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.8655.031; Sun, 20 Apr 2025 04:05:47 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V4 4/5] image/populate_sdk.bbclass: drop qemuwrapper-cross from DEPENDS Date: Sun, 20 Apr 2025 12:05:27 +0800 Message-Id: <20250420040528.4012613-4-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250420040528.4012613-1-Qi.Chen@windriver.com> References: <20250420040528.4012613-1-Qi.Chen@windriver.com> X-ClientProxiedBy: TYCPR01CA0198.jpnprd01.prod.outlook.com (2603:1096:405:7a::19) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|IA3PR11MB9424:EE_ X-MS-Office365-Filtering-Correlation-Id: b3c532d1-baf8-43e3-1e76-08dd7fc0a14e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|1800799024|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: QJFIEizs+RQb/zfKTUj1Xz59KhjZT9VavCRpbYhcqM61AB+3uQiIVbkF/+0kgaDdonTMsP8m77zSWnsaWBeIUv1as3GMXiUsj5gxH3+VHzMMhkA6uw8B8u8uXEGrztDh4ugz2FL3ryEBY/Cjzu94vcFFbQ03rr4tfEfHSHaJO1NkVq18irsm60I9RixF6ZCTdgZhAFkcS2d06MXlh1FL/SeNmNLMinlGRu9YtLWjEg3P/Pmu5gC4qlDgzKBNeAyC/H0ROzgKr1C2HeRkYxVh9a5puC4bc7OP1q3+Xi2R2SZun93W9vUfYuBm5PRV+l/xC1AyxUeEvgHp9YHarBTSCwkgyOiHPfehCjs8ztYqIrK9jfgrK1uluJviKLJkdezHbb7c0j3nhYmB/Llt+QOnDtYbq5iMAxfP/8nhOhF17IG2xw8cqXlPwEZ59JTQkms5HW4PZI6uJnRSmWrFuD/w0Ln+HwyWcgZ69Jm2IVW3Kzg6fDp2DRAMIVTRjWgHbBlUmUbzDPGVQMtPS2VSEyw2kQth/TKRRTBFyVsVfHRfXGx3xnNM8EVd+Cc2A8Jvw3XE6pWXTMku5PBB1lEhhx3crMBwIVPbfc7mLuBbr1uSHw7nj/sy/jS8+2bVMb+5VZuoow+Q8NGgeug8GLQR+BrWQWoUE3k4DUZaGg3bi92KGQF0q4d0kWdeU82tIlV/guUH2mOolqqPMixJd5tjWM7Cn3NxandC/MMminkW8jgB5i5Ov8kAj0ZcSD0bFpWt2VbtyArHsEPvUf3aq961KojM2pd4wupI6VfrPv6BDD/3XJEC5Bd46I4tad4Dc093m4QCi00P79JuyoodPMaGhUSP6XBwFe80pCjzWVVK/UNp+H5bxlUSfGh0OG7N73d7dfIQoP4o6uU8M5+oIRNh/UB6CU7qan4ttP4lHbyr7FQX8p68hO9IA8hAuMehrni2sU8CL5Jqi6pBxa+3iFalbbk/2shUGVqvQziNVavqq/oguTU3UIeBF4O53pPTu3rFaVLC34SsgT+E7hK+zEW6qkE5H6HupzJu255yKPUC1YsPgkA4mxJZYcpQoBdhhSwC43ngewtHldUHy00GXq2oh3XJnmqgxnWDSm9qaxbc/JsHub4CeB6k714wQcI3UuKwQtP5/SL//Tn0wXl9ixNUkS2htTLxsnH/86qqtc7agzr24kECqGqsmGao7rkGuZLwhVz/q7kZdB4A1yDaf2A23pAW1UQ5rZemeKS/5CmzFot18Dsg6C7auicvQln+SstCkTbwjtyOxddQMEhycadTPMw34AxJ75ES8DbQu/Atvu4zLGk4A3DI4ftxsnFDTt6Ktun0uzm0pQkbe5jNHIa6sXGlleKBW9XO6gpUR77FDucts5rHFR1nqIU55DTn+6Qkqyd3GadBAE9/LkTObl0i+4D9HqocfIRieyDtrew3DyXm2WK+R9x5e2dOuKWHVyQOytAQnsY29hRR0yYrvTDhekWK8Q== 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)(52116014)(1800799024)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1TSiwaqXierrRGCyCFC0ccd9Jfjr/hZ9CBYFCgnHXLGA7kVEm3StOwi2cBkWdsT+MGQzw7qRioEsBkyv37d+/cUsEzSGrZVenFd/ZAXBPntLF/NXkgMS/t0y7MhIAXi08er3GCodzIQ1lfwOIVuZYrT2GSkZhRpUVscMcQ6VqmiFFAuLtTS/JTY8oFkezxLcYyx36zdI0GY41W85gKLzgscyGBGQ9HSeptSvhgiIRgl9v3af6ptdgAmUjgo503jACPgvNeVR8Pw3Q8hJcjsnAg9gkCMhl/MZyWov6IIH0w0iGky+ss0bIyFG7QfTAXtx5hVoVTzYbhTmj0YxhjLvtdq9zKR4OOAK4KlHd5VO0D6TYSc7umBtLrvrYnYk4iPvWbVAizoyPL7YUzDTUIjUc3QXRkH85viFblWLhwHcVz/TtLmV7TBQo99+Rj/fyhDD2tF1Gx2soQ2/Cz56mnKDRFlFoNNXQfullVTpqhOzZBeXSuIfgskRe+cTY/3W5Dt+46zXB8RPAY1jIst0+B17Kk9+ve382GGO+qdV+j8xQx4wQMU7G+LQ6BYMRoGsrauBSNhOhBKHNoQ21grw10thiXUNWK2mfk7BGTf479Qt+bu2Rc0VNs1yYfHLmwzsPQK1mHoSDxjjdVBAFcsZ36pMVAnCVj3DXunkL60zwji6zxGUFNQyJ/NpTyNTNWcB4bKXKV90EIqwSuPOCMuD1X/i8/Eibe8CB9+gNwvSaqyZco367Hy/G6qqniL+csczJoQgh3aFQ/Ekhz9dxTy+PDKWqttylWdy3OFRQak84NcZN5iAVRWaB1DbO4WWqO7FhdKH4VD5LYeVw4fdCWDzdzQRcoDJmJNjND8Z/DcXjWh13cOXE01Xl4C5i3fhe6/kG+l+p5X2JwTWtMeoE/Sf9yNdm+9uRnYTini6w6CdvX2dTYRwwTFipSCjj0e0L8KCeMEmsXRzUnLURBUXyrP93n/zc/WakNeuKZR4boUB/yoCxNgqxxcZBoqwntHzKMJxjkOkPvk5Ah26AQ3viHLEiEOfwim/08syURWG7oBH3SxWqX/Z7QDD+aeFn5zaa8pqoTLtb91fS3BxwCx2crdk2RB0rXqlb6sFEwpv6OFtLmV2MKrQm9nrKOBluUkvz7wQypOlA19aNb1aW7NWmta0qfHOEB8JlpR+tbmVoqnHnqlYgmdVFtQIbUpsAgbZcLM3zxU8K7Ndfune4qmEBBZgS7yCkRv3hDtO2SEgQxyIukBxICI3MkQwobe6Iy59MFm1ZQzFQlA5zlpambIssW7Taw3QWjm8A1q/bk3xyAC4PngO6Nn7wIIvhpW4GKbqS3l3HxGbgPzCWNkFuc4TE1rlLNeNkrC8u5Vk1jGlWJyaTbO7Zvop9Egxkg1IuD1Dm/jcSfD7DkptCfWKT0cI9wRMgNGfEKQm1ezOGIIQD89JC3KZ3VqwxUN6PLQ8DnxayHL8M6yh+KGjil0Lv2wumj31f6n7JbwkBq7kDsa+pYNykLZHvU0Po5UrC4tap96iCMHwUvpqFxpIlOBH8hC45hjClvhMehKyGV3bPUosf/kxICbZ9xXl45BM7nQRLz2u8hfikMhj X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3c532d1-baf8-43e3-1e76-08dd7fc0a14e X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 04:05:47.4883 (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: unmJhMC3Amcs5QNTzcDxzzeJ3PE9Z21lB/xuT0p/5t39VD1N5DYH+PRbeykArUJsiVVhPe4d5lqY3icOGPd/Xg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR11MB9424 X-Proofpoint-ORIG-GUID: CsdpapCOPFyero7tOGoTK2MsYJxhnnZl X-Proofpoint-GUID: CsdpapCOPFyero7tOGoTK2MsYJxhnnZl X-Authority-Analysis: v=2.4 cv=TJ9FS0la c=1 sm=1 tr=0 ts=6804729e cx=c_pps a=+kc2f53xTGsvuL7uaCOpcA==: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-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-20_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 phishscore=0 impostorscore=0 mlxlogscore=999 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504200031 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 ; Sun, 20 Apr 2025 04:05:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215148 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 Sun Apr 20 04:05:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Qi" X-Patchwork-Id: 61603 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 75304C369D4 for ; Sun, 20 Apr 2025 04:05:58 +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.2981.1745121952264153048 for ; Sat, 19 Apr 2025 21:05:52 -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=6205c0d41f=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 53K45cBe012818 for ; Sun, 20 Apr 2025 04:05:51 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2040.outbound.protection.outlook.com [104.47.66.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4642t8rqsk-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 20 Apr 2025 04:05:51 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M5Gbe9SHb6c+T3J/e56Wir9BQg3Y06F8beHVHPAyWDvZyziRdmN20G1mdwYV1EorZ8HYc6/qx5ybID0B/C1fWqp6NqT0wYCMsPYp3TiHWmo6/4NaJ81eeB1vnudxr53qfeBb6Ekw10GwHXt7GFCpggDeUjqN3+LANwiGVC1u63o7/N71DnPfMLOJos/TS25hvF4raWurtmmeuqmLYqRtzWNHZ8ST9vFCvqzkgPJIfDMPsqjWyjTq3fsXWxgM0Eh1gs5bfFAFHjS8DzncVB33X4JIrrOOLNmVljIMYeJ0BPAPybk6fOwObVsDvaNNSM7rE5bWqyriOYP47rSAdcmmiA== 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=tUKqp0NlbmY3B7/7ntg5HLgwfk+CxV6xUPfCf7z5nA0=; b=WHVEyTWrasoc+jOItBeF8dZqOW7Y9yJqlvK7pNCJvRvd33yZsQ0k8A+iuRAnlcMv/MY9yxl3GXcDGqtOcW7bIMGLGmDjKmmXEI8oXL0yHUSxBwmJdmb3ngvNHCyDJHGFoiImWR1kgtHqpgFICB6fvRRGrV6xPFuPvGXLLgEd7InnCm4gnAJtLDqHBYR7v2NFCwZlS5D/KsnBCm6ZOwSuEiVpjc0HOvhjXUq3Pxg6wpGQv2GcVmpiph7BfS+I9nvB1tbeEaKqRmBNjKbJ7ZvE7jSEMHzUhZnB67ig2vzrC9btpclWJwesYXlKRYpLitoKo9av4BgjbeOP2NQnbDzWxQ== 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 IA3PR11MB9424.namprd11.prod.outlook.com (2603:10b6:208:583::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.35; Sun, 20 Apr 2025 04:05:48 +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.8655.031; Sun, 20 Apr 2025 04:05:48 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH V4 5/5] lib/classes/recipes: refactor qemu.bbclass functions into library functions Date: Sun, 20 Apr 2025 12:05:28 +0800 Message-Id: <20250420040528.4012613-5-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250420040528.4012613-1-Qi.Chen@windriver.com> References: <20250420040528.4012613-1-Qi.Chen@windriver.com> X-ClientProxiedBy: TYCPR01CA0198.jpnprd01.prod.outlook.com (2603:1096:405:7a::19) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|IA3PR11MB9424:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f98ce77-d796-4ed9-2ec5-08dd7fc0a1e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|1800799024|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 8geKtNR3Kg3e5RMaFBhA1FwHyKWqaa/gfCqAeGsecjljsz3kf5p3JnKcKBkW8zjq+aze5SMmekSM7dJal9bdX0a36kbNz3VYFluhtNcc4jkxxqtIiR5l/VTbHFxwEyw647AS+g+d3yujRvOsaWGuRqKOSC7H8H68ONsqvcrr9AJjZf+DuXq/JtBXguCxaTeHQz6m91BYhocsXd4jcPEj4FqerhWBHEwoeZ6xBnVccb6332d/Kygj8bK7VOh9QGPdDeNnAh/IO6EWJew8OlTcRmTaJVfSQnhRpAS9DPcc1AvaCmCuwDrcfLzObSuR3e4aCYC9smmvLjgcaAFFe6ph9bTBifeO5np4marWWxuqHMjdXYKwgPDOd670ekxZ/g+Q9GT84snuAem3xkZc2Dc2lFjZ3/clFiu2mKUA3wLZV+fflksS8D0jxCiuNMSe+Gk9am+DgYNOXpA/NKGvGxDJXhMgTiiRNbBcZhXyGyrJhm+9tGXvp+SzbyC5TBYiz/K5AuYUicfqGkjYLxmSPkQglw6PkXVfJMDKUyC/w4cq0wKRWi4SPe/xer8PqBKO23Kge/lR+ub/QMckuytHLeVkMjm4YX3eS3djL9gAvGNnUf9F/Rvmasy2ouV4i5KQe+C94NzNe2damlBsbCplHiTtLL12LggqrbXGD8TFeG66Fk5QtPNfqJVUNJ08IBepfxbKHczgHVEpRuONzwglf8ZO8xFZzifpatKYb5vFaRvPxQKVdNC2gWLu5/11Zobbxuk5DAWPYWqnMkW4wSgHYqG3gvPOZJxB37Dc3xxEedyr0dtzQA4STFI2SXJibfy/iF9MRmAY8TOIggdfDYcAY2zk3Ll59g3hFZJLrZMuSg7pp1HbB4zLbju57xkX5/REAJAfFWGrvu/wSc9MURXlOQ1s1ObjHbn2t6JJD4jgI6/xSGYX6IHPE3Vn90/KZJfyTG4u7Z0ofAELPFT4T0FcLI5jI6YVQGZ6M/SqojsH6c4SQxYzstBsEdtUb3h+bxUaULgvt5G06egzPeDGs5tJ9IMpvi/EzKZWQ9C43ZE1s/fY11WpbXWGOPSGuZvmjadU6wT3Ost3QeVtbU3whMYVDWoG1j2WE0db5Vlam7sZstT+HiApSG2KZVlmjwfZ5cA4dLxLSIUX0fYVyXNqX81HMzDq+L7x7tpGlualo514fO3TYJfEoxnnO4AODhiMl8a6zY2fNHUSoLkGgpLwAKbLK9Z9z37tVcXvcg5P89YvRuwnO1oLeI2d+QQDUP+Ko4zaiLugipV8Ff5umiGBQpxrJS7v4G25rsXJHEaXyui6Gj9ZdEB2Xy3bxbj4B2EMirfdKWoh1eoWaYuXptlBeWn8bcrk5SgeAC5Y4QQEpcO1xzFImmw6F6sOKSl+HMgL9SijYAAu/728QuGBV00qZzCOGBgyi4fWdJyS7ZLN7g2F8HqyPjynXlExwbBrrAMn1bhDOBEfPQANEcSYavyTod+3FlAxPg== 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)(52116014)(1800799024)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: L0EsQMV72jBkuSm8Car2z76gmGmfNLLuRN6UBlVeJBXi9CFxNiB9P8NSbm1dQ0Ao/VrZR60ewwLXAQg8+Xce2N6DTR0ABZK9kmgKC8M8mEpGnf7nzhUH1P0cDg7Ay1uszCeqVwnEXrG+xdu6+LxBmLINY4dXmYgs46xyA1klKA5mvOTs8n3RIBiDDOSd0y8c008bVJP4xAQ9Rn+fFOCODrJx84asQD16NvX4fJfGGCNoscDbTr+SDJLby2PbXjNYy5Houu78Yb/4wB+h94FmIUFicgEDdAC+brZNLWeYu+Nurnz6vY48djMSll5ejPsKgEfEM2Dv7guCEpj1C8xxThhelnmllCcAHUrv0RIW8WFXzUm+rgepKUReLAQLjKQiyqhWNO1Qx7xscNYEnxZEHJlHPXg/gNPzHAD3XnNw7I63cDX7iFMzmVJMVtqxWJVQfS/vEFfkLLbnaB0bwjYFIgno75ufFKZ+eATkLNlCPEo4seSTAi69DwGIS3dD6k6VhfmqpzjzCnADmKqaqvQ7cgPMj01Ay53eKrKckZ8kpe75UKlLbyxks4+FDPPwAX25lZ2/vo7hKqcbYF1sDsNKtb95yyPkQeIaSk3a4zGP6ZZ5WX6QWggSbOLf0oc7AufRmNHn7TnmDFt2NqTRYfb5FPM6+pfmRS83dS1BaVpnwL1b13vo2kkTVTkGjZPC4JeLVP/V+beXvViUHGRijx1/LH1c7PzNXFWmggiYmMlqrX8I5l/ivz+v0wUhw7y6oeCmq/wwEfNV/b11dNLo1Mv4/k3ZdWXL4h5cgguMo2dnuN24sQ/2JcInvTp163SxDtukX0b0BUaXYcmrvomCd8MBr7Gxuh77+RblBs5xkPqee94Qv0djl4Kl4PWafsoe40bl4QIfNJ9GKOpx7pj11AES/V+v6xJx2HTf/YmotTmsEGsePvVGsaguD+MFlaJxHvAEdGSfvvoJvdTV+LFG5ahagfHIFoO/oqHVxioFgAETR2O3zMX7pvzamGryKDgcqKRD1FKpQQEZZQangu4AxWmkenMfKgHSnJcuNGixbdquxkKvOY0wcfju12ZDTMBiBlAM4s87ZQ2azb1DsWnS6+xcnogzYSBBEbpSjBNhWBUFOFhqHXUeMhwBOjwKl7EL7cBNmgy4bEhphEzDos6vab+A8pJSKj21a2S/aoTNyBAXB9sopn8RdP0qDo4PRhIObJZKXpxA9VailrBNZNmj/soHjWAdk2W+WjpgWmnEDQO6DH/6C/u8mOnbnPaJzhiGAuZPYHOAxl8LlFBWENq0X8zcGWCUTDm+BYjaLyvJ4FakHz0WItVwM3sNlel1M0f4H4pDW12dUt9hgrXpx4DlmVPatAUe6Bof3IgabUehQJxB/U6F/7rY6i746EL0Ilgzh1DQwVon4FGOVhTLjpJUkE0zgujO1c9AaXr7qN3gQUF2vAeVUr6lB6720HSOiirpAqVtn2F6ApxxVv4A+raejUbMNjKt7W+u//L/n0YnjWhizVQJHA15m5mT2gV1dpUbiLBz7B192+MKmUDd1y34GOOWbg9UG1qoPTDiMaDN9BYYuXPkbF3c50YxTxogKIi9X7Al X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f98ce77-d796-4ed9-2ec5-08dd7fc0a1e5 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 04:05:48.5910 (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: OBzsODgStrAIDwjF9xFLYu0gZeCr/XtHDPhSwUz2clbWBxS3AwWO4XUxJbFGz7+WRZDzqlOqfj1i3TTSyeRuaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR11MB9424 X-Proofpoint-ORIG-GUID: fRvK55nCC1SZqOnOcybF1lQICNfWZO4t X-Proofpoint-GUID: fRvK55nCC1SZqOnOcybF1lQICNfWZO4t X-Authority-Analysis: v=2.4 cv=TJ9FS0la c=1 sm=1 tr=0 ts=6804729f cx=c_pps a=+kc2f53xTGsvuL7uaCOpcA==: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-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-20_01,2025-04-17_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 phishscore=0 impostorscore=0 mlxlogscore=999 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504200031 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 ; Sun, 20 Apr 2025 04:05:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215149 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 re-definition of qemu_wrapper_cmdline in allarch.bbclass is replaced by re-definition of the write_qemuwrapper function. We need to do this because we need to have the same signature across different machines for recipes inheriting both allarch and meson. Note that we cannot use vardepsexclude on oe.qemu.qemu_xxx functions conditionally in allarch.bbclass because python module functions currently do not support per-recipe vardepsexclude handling. Signed-off-by: Chen Qi --- meta/classes-recipe/allarch.bbclass | 3 +- 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, 89 insertions(+), 72 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..0875bbed0d 100644 --- a/meta/classes-recipe/allarch.bbclass +++ b/meta/classes-recipe/allarch.bbclass @@ -64,7 +64,8 @@ python () { 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'") + # Avoid write_qemuwrapper to depend on oe.qemu.qemu_wrapper_cmdline. + d.setVar("write_qemuwrapper", "write_qemuwrapper() {\n false \n}") 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