From patchwork Thu Apr 10 04:11:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 61087 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 E6874C369A2 for ; Thu, 10 Apr 2025 04:11:47 +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.26468.1744258299540673555 for ; Wed, 09 Apr 2025 21:11:39 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=61957cd107=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53A3e2I3016715 for ; Thu, 10 Apr 2025 04:11:38 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2048.outbound.protection.outlook.com [104.47.66.48]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45tsr1pdg8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Apr 2025 04:11:38 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=G0VV7Qk65hr5/MQclmwWw+a6hZ6httf89l9/6E5ZpLT6OL2VA4WieCaDcEvXNlkyk7moXW8KsdvjrO3gRzeL+iNhlWNDOS00cDEpFS/SCHipT9DjbAiE8a0hKXzeJiE+lIIRsRxxPowsDRkIpAxlDBKC8tV4qW9z5IqhQLhBnZOiJbZlgtAO4UbIJ6xFztT1N/nqMiefTtrtrvWSsX0Awj36gg0BHHXVvZ7drTD8hYStgkndCdid0wUB2SxRugliDKMQlMq/4+Work+AqeNqW0Vpl0bpeaMWJ3S+MXubPW9HD4AIafYXxfaCIlG/6p7CSyro8BRW9IvsTCTVoDGJNA== 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=otmsB7ljc6FTWo/iXZk49uv4b1bx9peC9di/fMHv4tQ=; b=SwJRTXenPkQ16ovqKCkeeu2pwGeAiFsVp57cWZg1q/fPzURZfmNVf7MPgSHir57BMGLxV1K0H4AhsAQQ9EduJaMs6q8P/HYnV80iT7e52nFnmNcR5VM4WbXfc4ovKMQQorfgQB4ERzd5oLxeyYP7RDwVwnVgiaVl2eLKW7VH9drUAkSjrvfcSKTfGlNUEIpq1GiZIvu+T9K1KYnEAJmZpcxdaxdrJ3gaaM+A73pyh21Js3Vw8EecZtpmcwhh92jAaUMtwRA9mvmKErzZwRNiDdsA4vEYf/RQ44zRBWQdhoN+atnxS2F08b3nzd0lM/lxloCD0vqbum+jjOjVSlDwsQ== 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 CH3PR11MB8185.namprd11.prod.outlook.com (2603:10b6:610:159::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.22; Thu, 10 Apr 2025 04:11:35 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%4]) with mapi id 15.20.8606.029; Thu, 10 Apr 2025 04:11:35 +0000 From: Qi.Chen@windriver.com To: openembedded-devel@lists.openembedded.org Subject: [oe][meta-oe][PATCH 1/2] recipes: adapt to qemu.bbclass refactoring Date: Wed, 9 Apr 2025 21:11:28 -0700 Message-ID: <20250410041129.1486824-1-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: BY1P220CA0020.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:5c3::7) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|CH3PR11MB8185:EE_ X-MS-Office365-Filtering-Correlation-Id: d8b662ba-deb7-4024-bd3a-08dd77e5c8b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: d02uEtX67juSwxX9ycn80LFrz1PmCko+oTI3nfCMOEvm22f6KLpD+6XL6sZDFwOmqHQszl7F+Dlh+7PcS+0EZt1jtUXSDNOtPWabyHPURHCYNoYijv6+7dNgO78DdVlFNvNR8ZVRNpD9jYTXuFLMF75agOrpcbpBsOVqTjNsqFAVpfVkBnQMC8Jv/iDlv1bBivSB8/BkmEE1K4MYkAX6ZXx3d+wmiZq7oqW9HP0U7Zv95hBREb/E2p8g8Dl6qfnmaV92tc+TCfmOVq4tC2LTSFr3BI7Whk0eRaP+wSXqW6ZmQmSqqxDnYiweZLYH+7puVjuexlXlpSob6hnNIHr6OAdtWYUBL2I1bg+Xf7m1MeWWwXjvld4wxBvsCuXgxOWp+w27LKCGBTogfO5TdCSDA9SVWNHM24aQ5tnUIF+oVZ0mfOMrV8sVUe+RE4UuqrYaactTjOn0pTt0HHTZmHQZpmz/+bpvC7UR6WdpDyNiMc7f4J1lM5ZBXF8Kwws5ipozsQmPLR0BZeN3Vxvt96v7+uX7a7BHZh62GPrBQLSGS9TOPokG15Y2cL8Xuvy0nJYG7dCF9c8g45C3yGA1iOoucPIiWnSb2G9ivTtNXXVPl6GsMLZKUX+uvUFpRxZuEbN23Pe9q7WHm/Q9ItqfcvtJaYWtC262K+/0c4esHyR9tswYuNo1HKemQcUwCI1UXprW60Wzun7zRE/Lp8jBNeqTO5bMN9knkIYKcHU/PCUiLTIXiUED+Hn1qNy+hRLfsDxeQNH3SJs5WcN/Lv+1VFkevHtWTEEzgkIZrmeftFE2an7E3dR1BMNOr6hBl2bzJGkrAzDEfua9LdnKAWxcd/5ZgpQRR1eMNJAPNjFMC/24yjSeKpK7JYA9pkGBASfOlZzBJVY0SkZKA+4ItZVxrDvF7Y8Io9+ac1jYJCpOm3IT1tipaNLvT1j4YOD/RnhBC35OCehdVr6fej2zONarzw+w6Cgx+HHeA6xfIX6q0CUa9n2QdjSRATl/Ld2A2JazP+n5j/bmnayW+jUslDq8FIN8conHDO2+IGZ/fkcg4GNcm0SAx8ZdnrkPpHs+/F1yu17c0OVtEDF/bJyYswsSuoByF4LnkWJOD9RDnvXwmr1b8hQ1TkXqk8Jw85/PVKiYGMUZWIlnNzm7KPj0AbkTxFXqVLPTWxYqzWJsYwlLoznf3o153fZyDtM7l6XgrX55LQFpBx39ekmTDLLAacunaE99HF/TWv5ooa0k9JfZabQE1a5Lys++lrOIX3BGtKPts15fkf7jBm2S+umeBL8WayDVRCQRHIGjbt+UOD4a+wiYcQlZH3bQbH1Vu04HsWMTlG6e/XV2OnDmBYRXC+ZbDv1y/yhS+Rm+31ZCtnWF4mGw2oIWm+/GivDSJQ+FJtM/Cxg/Dn5S9lTY+qaNGr6q2Qzz1w== 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)(376014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AMNN20kFolX2YyFM8knbtItDljOzEiQKXGzkQKe/nZ8aDClYoMeLsnK7lLstarxYDqs7xyeKQWd2VGINU7GSrQZkMMej+c9b8P5sKA78/RDXMDrbQpdL7fFdtIDJP7puaB0fG6ngICRS8BnLZdHJ/Vwkn7IjgrnPKfHhp52IpILznPKqmIfX7BWl4wXW+ttr6SgJ8SYAnh6aeCJ7kvluNq+qHyF/eNOec7yt03lxKuqjTVVUN5+HKCarUH1jQelrOoyhXXnqSyYJ4Wbbm+6XOQGBo+Gnzhw1urOWFmzqvsGg+Yxzp1t+KoeuoAPHaxxFx43ZDUIUiMx46jQJNgBc5PtR31c3t9FLFy0cFsby9TeBeomMjdnqJQ2NHLynaKmGN4wZmG1jJ1VBvAgsx3Yd70yV2DUKj67oFd6p52qU62Z22C7xnevC9wePb9wMiUx0rBd0BB9Dnarz7wBERcAUTBR1LyDjy9kricqNaaZ/N4yytkNye+QnFZZ7s9c56/6mQ2OjX79zDr4LG/peAAeX+md3YH/dA0MLeDKaZ6tskbn45sUJMjxb4yosJj82S5LZ/6p9eBrcVOhB8y3zU/wkSZ+JEjYuJ2EjZA3ss5Wrd+y4WIjfrb9zzk4Ki2MHsBzL9CMwZir6uRDHEBGGGlLR0XJPtDyDTBm2a5U+OwlWxpoP1+Ha8S8e3Law5gHvEToLXIUV5EccJYxrzEjuYLG1+GnBB9yE/KzGDeegVwy6f5HiVFsNrWGzaALsC+qnvDbNMfcbcdwb4SNSRSdzdY474tUmpD3xsC8DIUoKBiUax3Mai2JOjlCJG85C6K49TCeV6wL6h66mjUsq80L5y/iFt9R0bYHkJrslE0l1vNJ16lASdRq0sam7dY49pNKmJMfvV+RL6ajZEabk9FcUwApvcKXV2Qnasc3uAgoIjVxkQahvZ/vl0xwQ2mC9CMk6YpjqXOfyXpwMgHFSK0iykJSDrp4YVMIyLsCZ44rrXtZ5V6mA7aLJGDFRK36Nxe8RQknH/1g9HSbwKgGrC2GN2mMRyQN9is2VNud/TnO/nMYdGtWlX9TaEvssjiMp4sKaqHJUvYdg9UsgG1Z6iR8a7zP+4k7DkgP1noxNBqD5kvOzFUWd8Bz6IKZpYecjO8/fG36m0VtpSKbn/jne07JHtT2XzdRVnZmHAcB3hNrzK1ooNmlFCeYkVe5Zj+KXxVpaQMYmnvQWcly2j8JGJ5RpmS0RfMl38W/htX+9TuORokJTeWEyOsVjf2ERKjnlY674l5YUUVt1TQAePpE3VcTvhl3rbSy1hmzABmzCPsadHftRyj4VDdpCYwqOQyjcgRy3jZzsQJzwu4Fm7NP9WJYbi0zTQxRouk7pb5kaH3gZ3KWxN08rL1nIhNqfm2jk20eXbXNdc57xtygm+sfrCVrDln2Eh4qP10t9UC4ITETZRAljcCgI9B3iWGNAF9PAveJqE3/u8c4cIZohuDp//J1jBZ0JZ7wpOjbSJLgKf3TTdv4KYLGFntrRCai4mqEKoZIednHBaEEWB3SNEcw+2cIggnwQaAoGQ0xqfsHL/P3sJoImPTrB8746gXESOwvL+QLcUnYw37vlhXr4EPIHiTwgyaQGYg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8b662ba-deb7-4024-bd3a-08dd77e5c8b6 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 04:11:35.6026 (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: f8AmntgdM7/3w9YxrzfOraKm7rXz26/hw49quK9TSGMYEhz9uakiFc2KL3OOTckSy631DzXDGF1hPktUCVbTEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB8185 X-Authority-Analysis: v=2.4 cv=Td6WtQQh c=1 sm=1 tr=0 ts=67f744fa cx=c_pps a=wMNeujlvNozESTkKEiiyVQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=NEAV23lmAAAA:8 a=p0WdMEafAAAA:8 a=OGsvooznAAAA:8 a=t7CeM3EgAAAA:8 a=di4TEDuSiV-h7an7GRsA:9 a=B5HV4OX4S3AA:10 a=Ro9wbLpunPwA:10 a=_MKx33s3DjsVgJzmPKfz:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: PknC3g3ZwMgzQlXBy0PCqFNyP0TXhEK0 X-Proofpoint-GUID: PknC3g3ZwMgzQlXBy0PCqFNyP0TXhEK0 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-09_06,2025-04-08_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0 mlxlogscore=999 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504100030 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 10 Apr 2025 04:11:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116750 From: Chen Qi Avoid inheriting qemu.bbclass and use oe.qemu.xxx instead. Also, the unneeded 'qemu-native' dep is removed from PACKAGE_WRITE_DEPS. The package creating process does not need qemu-native. Signed-off-by: Chen Qi --- meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb | 4 ++-- meta-oe/recipes-devtools/nodejs/nodejs_22.14.0.bb | 6 +++--- meta-oe/recipes-extended/icewm/icewm_3.7.3.bb | 4 ++-- meta-oe/recipes-graphics/graphviz/graphviz_12.2.1.bb | 6 ++---- meta-oe/recipes-support/espeak/espeak_1.48.04.bb | 4 ++-- meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb | 4 ++-- meta-oe/recipes-support/uim/uim_1.9.0.bb | 11 +++++------ meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb | 4 ++-- 8 files changed, 20 insertions(+), 23 deletions(-) diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb b/meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb index 6babba3de7..af15ce61a3 100644 --- a/meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb +++ b/meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb @@ -28,13 +28,13 @@ PACKAGECONFIG[fortran] = "--with-cross=${WORKDIR}/cross_values.txt --enable-fort LDFLAGS:append:x86-64 = " -lgcc" LDFLAGS:append:x86 = " -lgcc" -inherit autotools gettext pkgconfig qemu +inherit autotools gettext pkgconfig DEPENDS += "qemu-native" do_configure() { if [ "${@bb.utils.contains('PACKAGECONFIG', 'fortran', '1', '', d)}" = "1" ]; then - qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" cat > ${WORKDIR}/qemuwrapper << EOF #!/bin/sh $qemu_binary "\$@" diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.14.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.14.0.bb index dee4c9df4f..a9d98ff453 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_22.14.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.14.0.bb @@ -9,7 +9,7 @@ DEPENDS = "openssl openssl-native file-replacement-native python3-packaging-nati DEPENDS:append:class-target = " qemu-native" DEPENDS:append:class-native = " c-ares-native" -inherit pkgconfig python3native qemu ptest siteinfo +inherit pkgconfig python3native ptest siteinfo COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*" @@ -107,8 +107,8 @@ python do_create_v8_qemu_wrapper () { on the host.""" qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'), d.expand('${STAGING_DIR_HOST}${base_libdir}')] - qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), - qemu_libdirs) + qemu_cmd = oe.qemu.qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), + qemu_libdirs) if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1": qemu_cmd = "" diff --git a/meta-oe/recipes-extended/icewm/icewm_3.7.3.bb b/meta-oe/recipes-extended/icewm/icewm_3.7.3.bb index 311abc3702..8c238beb42 100644 --- a/meta-oe/recipes-extended/icewm/icewm_3.7.3.bb +++ b/meta-oe/recipes-extended/icewm/icewm_3.7.3.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "4d845d8af6194fa25b36524467ae9fdcca2faed5c4046515e3bc633ff1 UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" -inherit autotools pkgconfig gettext perlnative features_check qemu update-alternatives +inherit autotools pkgconfig gettext perlnative features_check update-alternatives REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ @@ -31,7 +31,7 @@ do_compile:prepend:class-target() { cd ${B} oe_runmake -C src genpref - qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}',['${B}/src/.libs','${STAGING_DIR_TARGET}/${libdir}','${STAGING_DIR_TARGET}/${base_libdir}'])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}',['${B}/src/.libs','${STAGING_DIR_TARGET}/${libdir}','${STAGING_DIR_TARGET}/${base_libdir}'])}" cat >qemuwrapper <qemuwrapper < ${WORKDIR}/qemuwrapper << EOF #!/bin/sh $qemu_binary "\$@" diff --git a/meta-oe/recipes-support/uim/uim_1.9.0.bb b/meta-oe/recipes-support/uim/uim_1.9.0.bb index 5ed61fd098..19fa8d3887 100644 --- a/meta-oe/recipes-support/uim/uim_1.9.0.bb +++ b/meta-oe/recipes-support/uim/uim_1.9.0.bb @@ -25,7 +25,7 @@ LEAD_SONAME = "libuim.so.1" COMPATIBLE_HOST:riscv64 = "null" COMPATIBLE_HOST:riscv32 = "null" -inherit features_check autotools pkgconfig gettext qemu gtk-immodules-cache +inherit features_check autotools pkgconfig gettext gtk-immodules-cache REQUIRED_DISTRO_FEATURES = "x11" @@ -118,10 +118,9 @@ FILES:uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ ${datadir}/uim/skk*.scm \ " -PACKAGE_WRITE_DEPS += "qemu-native" pkg_postinst:uim-anthy() { if test -n "$D"; then - ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim + ${@oe.qemu.qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim else uim-module-manager --register anthy --path ${datadir}/uim fi @@ -129,7 +128,7 @@ pkg_postinst:uim-anthy() { pkg_prerm:uim-anthy() { if test -n "$D"; then - ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy + ${@oe.qemu.qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy else uim-module-manager --path ${datadir}/uim --unregister anthy fi @@ -137,7 +136,7 @@ pkg_prerm:uim-anthy() { pkg_postinst:uim-skk() { if test -n "$D"; then - ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim + ${@oe.qemu.qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim else uim-module-manager --register skk --path ${datadir}/uim fi @@ -145,7 +144,7 @@ pkg_postinst:uim-skk() { pkg_postrm:uim-skk() { if test -n "$D"; then - ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk + ${@oe.qemu.qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk else uim-module-manager --path ${datadir}/uim --unregister skk fi diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb index 0927f5c904..ce02535c95 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb @@ -18,14 +18,14 @@ SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f0 UPSTREAM_CHECK_URI = "https://www.unixodbc.org/download.html" UPSTREAM_CHECK_REGEX = "unixODBC-(?P\d+(\.\d+)+)\.tar" -inherit autotools-brokensep multilib_header qemu +inherit autotools-brokensep multilib_header S = "${WORKDIR}/unixODBC-${PV}" EXTRA_OEMAKE += "LIBS=-lltdl" EXTRA_OECONF += "--enable-utf8ini" DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" -QEMU_WRAPPER = "${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" +QEMU_WRAPPER = "${@oe.qemu.qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" do_configure:prepend() { # old m4 files will cause libtool version don't match From patchwork Thu Apr 10 04:11:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 61086 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 E59CBC3601E for ; Thu, 10 Apr 2025 04:11:47 +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.26714.1744258299748675751 for ; Wed, 09 Apr 2025 21:11:39 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=61957cd107=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53A3e2I4016715 for ; Thu, 10 Apr 2025 04:11:39 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2048.outbound.protection.outlook.com [104.47.66.48]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45tsr1pdg8-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Apr 2025 04:11:38 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XB277wkihUQIryNuLJeDYzSIkf3IaELLECj/DvSFev9H/uU8iCTMqxyUc8vc4IxmBd1Qdtv5p4Jbf4TQ3YUfvx86WW4uin1RGDCCJeSejZ3xqf+RvzmHTLxGdjoFEOqhwgdXFqxX0MjNA5/i3rUormXv6GedP/P6VuIsUKsJl7mA9WDhjWqgFRkKCbgMuswQ+SPDfmvIk+rtkY52vrgmeHBgu3ZnzyGZefahgS3rJg/3mRWgiNZX8zLcZ6BwoiWdtluA8b7ZkvEIhSVpXGEY4jQyqrMTxheatxulMzc8WHboa52tXnETrEZr27zgWWRkEQMKGO1AF0TXx7Ew9EtBHQ== 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=yMGINEyg9h5nfIiNuDO6FnwTH/4aH+7+RKQ2k/UccSU=; b=rWRnW1sF2LGqXIUtwOe4rax62a0B6ubprL2jOZuwwEb0Buk/46sUEi6W+oVXakL10KilqpqW3H1GrUoXtnmsPPgj9vFf2VDsvTeptaNjT/r791TWC+Gniaa+Rmf72II0MtLqY0ChgGtI3XfoW7oUduMX0DijLyEaJkChKLt5W1mQLFCcbAhCBmxhxQL9YtlVqQXZP+O2bGihpsERywb0SEtfyR7Ba3NsYo36ZZQbJsSQCCDDbVjiQ9CS51QPFEx6DKfJB65+l+Hxiyob+JzoDFiPnDhnlsFHvd48eHE6smaNg/FVwvqS95WI01um2CcVtPbcEeYP41AG6geP2wjH7w== 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 CH3PR11MB8185.namprd11.prod.outlook.com (2603:10b6:610:159::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.22; Thu, 10 Apr 2025 04:11:36 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%4]) with mapi id 15.20.8606.029; Thu, 10 Apr 2025 04:11:36 +0000 From: Qi.Chen@windriver.com To: openembedded-devel@lists.openembedded.org Subject: [oe][meta-networking][PATCH 2/2] waf-samba.bbclass: adapt to qemu.bbclass refactoring Date: Wed, 9 Apr 2025 21:11:29 -0700 Message-ID: <20250410041129.1486824-2-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250410041129.1486824-1-Qi.Chen@windriver.com> References: <20250410041129.1486824-1-Qi.Chen@windriver.com> X-ClientProxiedBy: BY1P220CA0020.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:5c3::7) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|CH3PR11MB8185:EE_ X-MS-Office365-Filtering-Correlation-Id: cdfe0ac1-fabd-4c54-e01b-08dd77e5c8dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: iZxuhmGvcK1oAAHCo+RfP7h8MwRr/QjLF9uwk6QbDjRBcRpqL9OOGrwADGlmPSbwsPPzpIK6xICGAjnncP2eR+qTLllkEhCSvPiPYHPfHbv1HOW3eGnuwQSnuY2GiVRxY2AN65UXj1042AX35n3ud4F+548f4GLZX07F7Zd3STd2kBQRxVYqEAx5jO60Z6rSs/Z0AN8Y3NQVYtS8i2VXbIqDOhN65WHJiz29GVCi0KZrhc7NY6jG2FUMyJlccMfTI1QWYfY/S6ourwIeoiKqr6YTZTzOvCB0QnyehyYDjQZcn2s9jjJL6IlqJ988UyM4/wWkusM0LJoLgmV5CdUPXwzHZNLic2y04VMREdsOU2XYHnLm3Q4sn3nsNOjl6kZbD9lP3uRnQQ0UYmsDa/zVOJkrtUIBvbpNNXZsy6xOOKpX65OQoDjYpNhlqx2ZWeo2xTpC+nrEjzp8dHT0hx08pbQ2IPpf1UfcsUBa4AdYD5yqPal8jHvFoPXSkUoXCKZ2sHP4JnWuIJIin8gsk8WLmJJfu7Wi2D+UpyWNeYxO/PD6RIeeUBj4yZinMUyPIDDeieEKTowyWlDa2O41Nc6ag+dvx+SydJX90tQQGreR08sajtzEAdmkxvSqRco19MINIC1ybKIZkylLEUCiE3IygW++xzjn6n86HLVs7ER7a7aamv8JeE+/g6fsjt9fEN1teUtuR3kjuyDljCPwL7qwRA6NW8iW4hnK5J7w/5DZOJrwkI0wHGKUBjiRitakK1nyWsa01C1lou+1D9A2wrbk4v9RAVoge6Vt9B0kxN00e4EI6mcGdj6WEad0hf8Q2OfmDCQSxOjxVq8rRLlBJaiV5wd2ObUHFVvVHke190MOEosefNtHcwSkcyPnkH+NXjVvwCXtJ8liRlz4OTV71fLLGYhodYq2tqNNqxH440iRgV9P+68/ciyJv5L5tAzMYF2Da4dsnGb9kmVhLAlHwo+Z3QUlfTFp/ss8eYqVxegdr9V/d4X1xmeJvnj5DB5lekj91KV1DaC8Uu/ACylx9j8t874C6cZQOH1JKCZnXLE8USJrofNSrmqXI1kVUtHWJZYLV1qnrWkw0MAv+8CwYPExEY0kD2wvbydXJlk6aOcu3/RYyf7iraGo3pDLECpcS4qRdiSwLQBvnz5XYROIwmraHUHT82l4xUufiNxtVZvZvl4O6nuuU+Uq1ZSBTVQcfi5/xfMyMKvXMpPwT/OZVErM6ymmDU1820ospB8a927VvFdhFuUYfDZ5H7skMcf1sO3QR0Zkx6/OOPQPGyzxfvJv7My0rG34M5pvx/uNe0PmkTZ6gl9+x8gEtceZ3oDhMSNhoCDQZSGfoWV2oiJ4I9MZ8WDBRnUxS1ie8D1ANQrZARa5sBDIV/O9WXRj03JwE9Sn 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)(376014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XvfXLrtRDMA+EtAMh2EO7eucbmKxpS/fWRaU6X9/6rkXTDRhMxk0aTJr+hsYX0vdml/PHUEWhGEhNs7wd5iDeNYXyovlJYoD5SmU16M1ZLesiPzdNcrrsC6qbZhDjmt9a4ua86kLKEfqSVcdMRLaomyicw3+hN4hJWxTbs7a8mHkhXsW4c5kIOUJQeSBB94QTVurj7r1aMrkT+nu9/UZrLPaLsIZW6MLMDl7qrujMWEfzE307+d0RPFxufKKnR9jAwKAqhcSjy4gjW+JLlia1jkZgaRT6CLJDutmPdfrgvdnl7aBlnGM5RpAu7SMLM3YGNHyKW/T1TiW32nYWm+1wMb0KK7XgWkhQNjm8PPVDGlobNhoYMDh2RTHOatr+HlZB2aqGhKfI9KPD392j/Tkpp0NbfqIsKn/XfsEIJvTO5489ybpmdcyaY8tM30AsBogmlP2Jb13GHYw6oDvqIoruSG93zrSuN07hpbVLS0LXs4fnKiC7a3wWPiq2cZLH5+S2iNWhs2Mkt54McSvxLf86rOFg4X8ooVMpjOHcD/x1hPeV7aeYA7PSUC2PbCgoIapKwtuRK6/br7Bz97J7tK5HPNeJFGVcGUnI8Sc4peqhG8OwpQQO6cm1Wg32LQwBRSWyYBUrmuIvC3JYlVi/S+kgfUvJgiyqybfDiMRZ6STQoLP3VrTJocmi6xj6a+clzrDomTJc5KuzNcNsPB8sBvsaq7ou1uoejtisTgL7uY8TlP+B5f9ZxCDkjfPjei2v0OxvGYm6smyAuFOVtyPggMRqol5TY4kEzwXgOHBlyVFA7TVOGoZerfMR94aS3I9OjOCeBG78eeiDpl2fmly7Ct6pEvq9Y/1q2t3Ugsy0YE5fogaeHdYblhJ3mZMiq7QAX5bSWKldla4c92k+oWR324DEvmHPaLTlVoraPUkVsG5ityZE5nW6kF+AI/+LhcHKwc/54ZYiMgVbSxSsg58D37xMuj9ZOhCNQNpzwCDHiyRk4z7rlMhalBJU8bmgF9ONl5t4UTnXuVfY+iACSTdyp1TTmjEBKikRp67TXPLE+3TAVHe22CGhNn0CryiE7j9m/OVzESCQQamTvBhqEG4nyJ/aP7e6t2eqHPmkbH3EV9Q2inYsznizkwj7thbZxpC4Jf6QxD0igOeN2UGPUmQSGBcAzCNjpG1KTTTuC5MUmsrL9JI20qekG/cWtPoyiIClhcOhUaWPYNfCowNWAaEGg/HEUTPWCdWHrfxbVMBrfFa2kTCSFhsEth+6I5cuYSvTPNHcG5eG+liN3sxgP2IWR46O4QfbIEbbE91Vs2cGjQjEXWK0lE3uFVxEU3um+3LQzpJav/opjlxY0pWbgcRRZP/o2/cGDLEJqmDKngvX0hKWVQ3QF7ovspYTHTGO1lCKRPaPfp1kiJqQrUgNsxZ0dMaWLvQIfARg6zhTYnve5cgIRL/OsS6iMmWuCn/eEIQgAj6DKB6janDRLOSb4ca7jy9xXl8pVeErfnKRcynwcAr6fisaMIAaKyq1hBHVsPhIevee93DVyh8YeJt5tF4Ff/9f/ReRbQjXe0d5EYwa3LWk/C1mTt7qj5sBrQPrF3oI2kQj+W05jTvLAa2c+bjZjDtZw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdfe0ac1-fabd-4c54-e01b-08dd77e5c8dd X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 04:11:35.8916 (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: u3TazceAuv2qOFJ7t5eTE363JcrCicluu3awnYTmZEhTbXDBCqM1b50sbrKoEPwdCnpBHjVkAWhwgBN59MmazQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB8185 X-Authority-Analysis: v=2.4 cv=Td6WtQQh c=1 sm=1 tr=0 ts=67f744fa cx=c_pps a=wMNeujlvNozESTkKEiiyVQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=hGzw-44bAAAA:8 a=t7CeM3EgAAAA:8 a=0cNpdDu4uiylx8giwlQA:9 a=ahtzkqAwBOYA:10 a=HvKuF1_PTVFglORKqfwH:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: n2zfZz21PIM4pYqX3J6j3abWugTq0dTb X-Proofpoint-GUID: n2zfZz21PIM4pYqX3J6j3abWugTq0dTb 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-09_06,2025-04-08_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0 mlxlogscore=929 clxscore=1015 lowpriorityscore=0 adultscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504100030 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 10 Apr 2025 04:11:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116751 From: Chen Qi Avoid inheriting qemu.bbclass and use oe.qemu.xxx instead. Signed-off-by: Chen Qi --- meta-networking/classes/waf-samba.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass index cb78ce6b0d..49d64b096f 100644 --- a/meta-networking/classes/waf-samba.bbclass +++ b/meta-networking/classes/waf-samba.bbclass @@ -1,7 +1,7 @@ # waf is a build system which is used by samba related project. # Obtain details from https://wiki.samba.org/index.php/Waf # -inherit qemu python3native +inherit python3native DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python3" @@ -77,7 +77,7 @@ do_configure() { echo 'Checking uname release type: "${OLDEST_KERNEL}"' >> ${CROSS_ANSWERS} cat ${WAF_CROSS_ANSWERS_PATH}/cross-answers-${TARGET_ARCH}.txt >> ${CROSS_ANSWERS} - qemu_binary="${@qemu_target_binary(d)}" + qemu_binary="${@oe.qemu.qemu_target_binary(d)}" if [ "${qemu_binary}" = "qemu-allarch" ]; then qemu_binary="qemuwrapper" fi