From patchwork Mon Jun 19 07:41:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 25950 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 26923EB64DC for ; Mon, 19 Jun 2023 07:41:42 +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.2804.1687160494352208836 for ; Mon, 19 Jun 2023 00:41:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=WM/Xm/A9; 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=55343858d1=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35J6TfgS003709 for ; Mon, 19 Jun 2023 07:41:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=IK0FfvqyX1rrbUwWsxwohvAtIKYTPSlEsqwC7sBvC+E=; b=WM/Xm/A9AK3k1IQ9GY19yrBSN10ybidJ1rpB68MVAHC3JSoDr640Oyvv0qJBN7ilQJ0N Y1zyJ4oJm1X283qGtWEuvZd3j7zHSQg9NkfqO2YvLD1ThAZEfPgjqhA824BB6wcvlyzw uM1ro9qvlNeXM9v0pPxkNrcIM4ZLfz9uDJKKIrTUrBRNxJJJyBCHZD+DyqTFzHOwp7wH PrYNFPtO0YPoS+4Jqp8b1w5TprrmYV/JAB1pGt76pFQ846TXqMzLMPWyWWbn+EBSUXDV HY3GB4Qx35U0sk91k1dTFLK5pcq+ndEEb4hfueHqeCwNmdK+wxDn0j/0eZco2q32/Flp UA== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2105.outbound.protection.outlook.com [104.47.55.105]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3r9220he5j-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 19 Jun 2023 07:41:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eflmQhXRgqtudjl48zIYtdihFfyH4bJ4LMWdqQ3iZ+chkKve7v9SqMuCKGXmV4/gGuPqFH/LeYLHDT2/8UueIB1lL+Wy2fxlmtEZSo6OLoEa203YCa/iZv++/o8SV6ekYXUJHX8hjfHIxxt7QaL4IN/aHv8gsTyKXaK86ahiitbS6W/FrKh8SMp1PsxJ4dkDWOs7LQ0HJkcQzi/jQjZ9eRTQooJl7swMnD0kx4UIIKemsaR/MlgFbYE/0x2NInzsSi8uZ7pGdElDD//6aDzcmSskb0Ox9t40wOLC/8Y4mNU8BXudBPvvv41089Vcv59+8ZZy2ttxRgMHk+wk+FUSaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=IK0FfvqyX1rrbUwWsxwohvAtIKYTPSlEsqwC7sBvC+E=; b=dowozOZKlhOHMjgmhH/t8GNZKJ/nA0nnR/4BlmLQwEboeZONhkALGeJMKrUt93S+bjRw2HvnuArUrAWi+bSX9v5WK1vJOtm9CnVl6bfOYrdQ8re5PHRGLg5Xd6dKgNRlQCNSFM25j+yuwC0vllSaLWpxLxQ1ETU2LedFG/B8LVd6zVGbaHuA6QLLJCDZXYbHFZ2wbpLizK0FbrjmnRX95S70t8ODYCF4chHaDAk7WcQlJUQSRQaYLEKtFhOIk/b5Js6ZBLJ8g5R0Czyf/IT+5a8/CfdbWUN1nFV61sqVTPNk9Q+ODZ6o4Yk09fuKmiNa55c+Z0z0Z0scbFG7oJLm5A== 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 SA1PR11MB5825.namprd11.prod.outlook.com (2603:10b6:806:234::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.29; Mon, 19 Jun 2023 07:41:21 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::b504:c7a0:9ce8:6f17]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::b504:c7a0:9ce8:6f17%3]) with mapi id 15.20.6500.036; Mon, 19 Jun 2023 07:41:20 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 1/3] sdk.py: error out when moving file fails Date: Mon, 19 Jun 2023 00:41:08 -0700 Message-Id: <20230619074110.2831977-1-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.40.0 X-ClientProxiedBy: SJ2PR07CA0022.namprd07.prod.outlook.com (2603:10b6:a03:505::24) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|SA1PR11MB5825:EE_ X-MS-Office365-Filtering-Correlation-Id: 31a3e462-98b9-40c0-7ab8-08db709892fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nXJE8fzj+7XVyp2pzG5ceD70a/5hVSMleiVhhSFvmpoLQzDyAlfHqiQLACo5zRKC9poV78DaO6I8KbTwKXZT+JLUbsHrIYOhXln0hL/Gf4pQr0UPw5RlNPnYPgp1V3CZu5myUXwBdgfGsGTLdf1Bw19h5yhR67Oky9XUSJso79VssEY/wQJKwqaAFQ3D/bCy7YYfi5VSftPDr2aSnYIEw/6lAhMvpd1IbY2kpUF5o/MOa5xRaWjw7h1BOKEA3+jBq5MdM/F09k2LyZ5nrdS3GT5DJgM7A0/JUJTfz8GSkaKinjQIu/zlPrYrAwQl7gUnHJRqU2NZQmL+WiHzGnGlWKyeCOrL/8cD7wRMPyb8M21lCaWaq8mWYxJmTx8YPiFHQDN24U9qU4v0nyM7OpmD5IG8t46qMnGG1VDCz75cBJjhAFNcz1QTXPA3VZNiqWCly3oPXZbxLUDjeifChZZvz3zKGsorVbETdf1TWWwWXmXqgO95P2xNCNECbxN92hR54pV67tssNqRQP1RzxAiHIKA0A+xc8U6v33dxnOcKxOHc04gIPryBH8p+KxFSAhPm1KwEPYocJXmzFst0lN/AJHvhmOzqBGgctbcjmVqX/MO/tjVHbCj5JkCwDdBCEdPE 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:(13230028)(4636009)(396003)(39840400004)(366004)(376002)(346002)(136003)(451199021)(6916009)(66946007)(66556008)(36756003)(186003)(478600001)(2616005)(2906002)(66476007)(4744005)(316002)(8676002)(41300700001)(6666004)(86362001)(6486002)(6506007)(9686003)(1076003)(8936002)(83380400001)(26005)(38350700002)(38100700002)(52116002)(5660300002)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4DBEeN6BMWEwAaBCzw39nWiiUlPo0Y46pyuVrvj/FHTIMbUnBQdUH903ilfs8jw5N1RDOZ5snH6/QNRG46xAD689spHHqusFbhbq/W4hZhEWIcCcxP3LbGYJVXQZ/rdi1vwAOLRy2uRVvGFOKcfBuO6eD5mZkksl5ATBGmqx0Bs2A4DCsyDK4Y+5/9ZxS920HIfcFdaOETuaV70EAGO2KwzDkahK2jhf/QWwYBAAz7pk3D2wUlvrmQ4nHGOv8W3RCcaeZ/GqePjBZL9r2dgn+6J2SsLu8CpJyhCoBSC6c/MR0egufcHG+6MudgSCUSSGPT6jVL/QpcGR2lcQ1DcmSmHDsyCVJEKxDXDIGyvVmfRSiHzoRT5iVTfDdmzQXgmGpnEXrZrL6BTV6mlPwOSvFTz3Hi5WZ7bTBLA4+5r5Xg/zid/8dKWAMGIzOUrr4Uz24rL1lxvHlXSlAFNl2u/8AUzlHscBBmpGCTQ5LnV/PovOntjIVHnTrHpVRLQaa5nWhfp2JI5bcoeugFNc779Hhae+Hdclj4xL0ppnBFpMKxTbj6rHnxkiWnB3poF1IoUwglpLzczv/JAJRMcugYtcIbccTjZk2Fy7/F/2n8AMGHK3YXa4MS8zPOgd4AfnE/7vPxWR3nNUapHDJHF/bos6+4TAD044/8eJIL58E2ntIaV/BEFq3GTSo+e20z0f98gct9HYSG0d3kMmTtUcvVTwVGpdBs5tOXIdOsFIGQZThydeno4O/Uq83B6wDOBjNlcORRBpekCmsGdF2KOg3msNEfq9kIoBi5Nn8EdBhqcWL2z5HiePdVC0WXXVx/rstp85guVSi6KBkK1xffGmiJjy/XM8SnAx07mLG1jSbe6o/zQ4nXhMCaciGyhs3gtHk7XdPoVCx9aOrgi52AbnnLO6hcL5tEjL8HJ+hM8iIZ6yswtpxSnEGuTCcZ/AOhp56BJkq1Eq56saN5zZ/SR0dWdlJ9cyd0Ap/yNhO5qJUqwRhMzNxRmDUJNSXzabj6Lgsu+ttjnVaEc1bKK7+is4s+qTv9M6HxV/i/7Tyz0Kup7Cm+8mAalfE1+1p90Rzd5hj5EiQ/zd/eiR4Ua1IrlQhiZX8Zvathr5VpESxNknTYLxffEQBBphJL6LSLblNvNaJx7HEuQrb+ZHH732vON7cFhFzznUVbglPPbeCa8IV/n1R8BobZ+SpCc/yG8V5cv1/XEAOuvONujXZt+B4tIcYwMBB+aULJYL3BTZRvwKmluweJZSWzXr4TtCuKNthGF5Q0vkIkM+V4z4f02mdmgryDEIN6s1EL6YpJLvrjD95mdkhY0oz7D4m8K8DpHNknBpyjqC/OE9TAmCucRG0TeEnnOg215sFWTrW3LzYFz8jRZKdar3jmhUPfvzIec208zqRHIpDQ3/pQJLQXbPc6MbGPl1iUalVcs1YP+HDZHsvFOukc/DsHYhvO07mG8zzNr0g7glXBIA6puBKRnVEZ0B90v6QFnuvnZCq6z0SXSzXa5MVx804jHlEI1klYXHDA3TO62faNzIRlSIDOK085Y6mdEKnyYv+Nrxathc+lMUAFr4KOgT9BC+yjmObQQkHmzd5e8mVyONFBd3mI3VwkNWP5jK8g== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31a3e462-98b9-40c0-7ab8-08db709892fd X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2023 07:41:20.7681 (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: 6jAH7N78Noh9kRaNUX18xVplEsSG8jStZ/8iVP2zoYoOhjjf90PlLhWW6SKneqZ8KJ+2aIWulw7GY4/zBwUG5Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB5825 X-Proofpoint-GUID: XHaFUvOuKoPH2KLT7nWvKWJvJKoLdb7T X-Proofpoint-ORIG-GUID: XHaFUvOuKoPH2KLT7nWvKWJvJKoLdb7T X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-19_05,2023-06-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 impostorscore=0 mlxscore=0 mlxlogscore=845 clxscore=1015 spamscore=0 adultscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306190069 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 19 Jun 2023 07:41:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183094 From: Chen Qi Instead of printing an error message and continuing, we should just error out when moving file fails. Signed-off-by: Chen Qi --- meta/lib/oe/sdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 81fcf15371..3dc3672210 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py @@ -70,7 +70,7 @@ class Sdk(object, metaclass=ABCMeta): #FIXME: using umbrella exc catching because bb.utils method raises it except Exception as e: bb.debug(1, "printing the stack trace\n %s" %traceback.format_exc()) - bb.error("unable to place %s in final SDK location" % sourcefile) + bb.fatal("unable to place %s in final SDK location" % sourcefile) def mkdirhier(self, dirpath): try: From patchwork Mon Jun 19 07:41:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 25951 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 228C2EB64DA for ; Mon, 19 Jun 2023 07:41:42 +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.2805.1687160493813298414 for ; Mon, 19 Jun 2023 00:41:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=q75XPCwG; 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=55343858d1=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35J6TfgR003709 for ; Mon, 19 Jun 2023 07:41:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=09Vv7ytYZA7AQcASo/+9tPwBvDQfoXknE+GlahWZ1NQ=; b=q75XPCwGXbIdH6tMQFSOn8uTRSYZvlKxv7UqU4csRzK4GrKM7Y3zM03hj3uk6ruzcYOT pY1fNdHDVvnJnNuUIAK8mSbGmStxWpVi3a5Yp1xWI0jHSyX75nk2wNpf3s8G3tfsxVal QNeb3vqmE4fvv7HDBBwmKg+HWA0tKDwPlyz/Zgu/1IB2joIp8aKdpRusT6Q9tZesrl54 mRQJoNiqkXk7p8nvR9pNvLO3FaaD5qXuCQ3a+ShbJPeyohIrtp/xDAhWbXq6CRKJoBjC Cj0UGmzGLMLinDU7FUAxAETRFV0HX21Wkio7PIjt/Rq1TPQYJ1POW6Fq/N6VmFtSnKHB LQ== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2105.outbound.protection.outlook.com [104.47.55.105]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3r9220he5j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 19 Jun 2023 07:41:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CpHOOhRw4bhk2SRzHGFYPyxch1AHL0yeufiZ07VUY72EVuTWgzjz2tbyjmWNzWCGqiGEHRtKCAPT8zC3d4uBYGKpc7LePvaNe6kYMvaHhUEbjUx7uSjSJroZ5XItGtwKCEvaeuiku6qNzwbzm9RWcpfdvDIDae9vgySOUinALtnESZyvNoNciHm9R6fxuhrKVxd21gdVRawpIpWQYUTb/riuPv5FKhrlM4moHUT7nvBluGPtv9VPtozEH9BKd9ia8wjtqHQ8vj1wFWS1pwQNXFxbcx/VbQKI/ef/3oRIdsihDo0S9KVq30uHhRziIV4o0+V1c/twZJY+2P1l3DuK2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=09Vv7ytYZA7AQcASo/+9tPwBvDQfoXknE+GlahWZ1NQ=; b=h8f+0lB8z+Nwl1ZDZX1blYY6yFW4nYjS7Gfhzp0cup90C/qgysOokp7QkKosT+AoyufNGG9+OUK3Hlg4Fbyuk2OzYN7S+h1MA9Xzr9q9L0dUQYbfJarpUihWATgz6DUcv8EYzIpaaUG9/lSYKbQYj9612YNK1DBJhWKOYnXXXmgPmntiQRDPUk3oSvc2S7JAncz+r2EVRthV2W5o/NpHNj62FQtHkgTrCPWLIJyK6lyFa8SRtScLOtHC1ibaE97rqSxk+q1UqtTAL2ax0i2l3VzXZR8RqDSR8HnfNHUrDWUeVN60Z2fj+Kvw8TjnuxzASZ1K4VfVJUyJh4proM4RQQ== 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 SA1PR11MB5825.namprd11.prod.outlook.com (2603:10b6:806:234::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.29; Mon, 19 Jun 2023 07:41:22 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::b504:c7a0:9ce8:6f17]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::b504:c7a0:9ce8:6f17%3]) with mapi id 15.20.6500.036; Mon, 19 Jun 2023 07:41:22 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 2/3] sdk.py: fix moving dnf contents Date: Mon, 19 Jun 2023 00:41:09 -0700 Message-Id: <20230619074110.2831977-2-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230619074110.2831977-1-Qi.Chen@windriver.com> References: <20230619074110.2831977-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SJ2PR07CA0022.namprd07.prod.outlook.com (2603:10b6:a03:505::24) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|SA1PR11MB5825:EE_ X-MS-Office365-Filtering-Correlation-Id: d6e261e1-fc5e-4353-6319-08db70989328 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cS3koxMuwIzzImv5sXWAUaDRVqwDzN60w9UtHYN3oVXl/DgVSZm/QRRwcgywZtK/uSeqqFNGvocuQRdB3Zn09kVqxOEsEwzCVGmfjl+AyyOVGUwEDXRv/vb+2NQHbLyfCiORfPNf2qfYzm02Jk0tOYm1rliIgs9oTSi9ui9WelSu2y6CtXWvRedpGzHC0I0u90aosm5o3DFTiPDrJr5WspqNz8VdNgoHElUoHAGH7d0RJHDgwxuddpYvhCebZwLnnplGzxUxsBNb6cVWccUjT4OpXOtdpGYfuaKAQoWgUFSIl1aRa3Zk1GfMulMVfv5o/Y8IeuNi+SNK/V1ofhYXjOVXy9GW1e3/xqSEEpsMQQ35tyShViuHgTN6lNg60cgnudJAG+ge2+lAQCAVEuHO+ShFWtySGVmuVrSPlkyuEHFF00WEPLVMwmaBxCDBBu88pbiahS9/o8qPPcsBtIIWL8Wmpfp2amq1Q4vvGQFcQ7QAnUZChdUVvbGPQFJTZ5oGJxLxmTAGrT5rUSUalnzFtiG3P3/2lfqZh6RCEsExmMFYaT9hqJsEYtRqm8VwXk7+GpeRLrAE7LzANbZTbOhBAPKJZbT5nVad2sCFFU+J6JRk4PrEqpxnthx4o7OnHXYHL11VrWFZDbMMYJ8F0weMcA== 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:(13230028)(4636009)(396003)(39840400004)(366004)(376002)(346002)(136003)(451199021)(6916009)(66946007)(66556008)(36756003)(186003)(478600001)(2616005)(2906002)(66476007)(4744005)(316002)(8676002)(41300700001)(6666004)(86362001)(6486002)(6506007)(9686003)(1076003)(8936002)(83380400001)(26005)(38350700002)(38100700002)(52116002)(5660300002)(6512007)(21314003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tWgBWwGEFOI93u7K/cYNLyK0xgxu5y9Tn+cmVuf6yDcRUWW+6aQBTVs2JKxFwtm635e/B4j9cC3NtROUAmQvnD0sVXiKdSiGbZBtbmUJ9tIoRnOQF16RtM7ZI8JEJMlKH+vDNdT7xmr97XqfT6gRu7rlEvPuWMH+JUf6SD/EVHRGUvzVsvaxWLZirOUtVSSyPfIXFPCrP7Ys8uYGDZnP2bK+zKKWkzYUc2aPkVhWaMJgv5tGkz/giOmDt4ahXAVRVrSJ82+NJumHloPqjUbnfIb5qiipjvspu3caVRvAQJy8Xo7HjT9M3j7OhX+ftf9kQ+//nvwadXsBQauplzqD3Wm75r1Aj9SxccfdjUOENJBmeWMFTIDuLF5yXkxtbF//3EUfISabO6ENH2Kv4RWm7C9HisaFeEJ4gbrLc4SxR5LqFrXAFv7lpss1fwzpj4Efg0qEV8qfAjJussxEGA8esKVSPAd7h9t6mnLX3fuO3vaKM3o28eqaYNAsF+RJm64CKeIKsa6RAmnpW3mgK4eFS/AtMFI2Pq5JLdBtgKZafflnKBMgp8uGCIPu+ODCxmz5EILKAr2p9OVRaImzE+yz8prKxfFggWrB1wtwH6RonEZ9YYnQuGgAfN9aYS+wnLM6NeVMFFHF7AtnN8nKSJgeMIWhg7GTOVifoiJYQT2ZmRyVpu6MX/E/nvRR7WhV25pvBf4+iPdVfTuv/miohjsscyC6LMca8CjZcmgrcDCi29ozgw8jIldjTcLnjZgPQwVAmWvLY+cn4IB5+SqeKke3ZsFR7jQVAV8qvaRcJ0kUCzS+RrTRVzoGgTJvKa97lyS4utleJu5jvq3du9qOJmA703rpoafrOODdGdqRrLaWwFnvui4Ot57iDm40EfbK8idGnE+BMJj71lVs3Lt87JSaUcH54zzeS3UE9cZowltynrtxGHU7mOVGKSGP1xeSasPrf3l0KnayZU9hFxA8pTPhnGJLoWqlmCUA4/A7s5dR7nCQL7accwd4PJBjufS/GSDgduV8yKPk4I0IiFR77kmsBZ6kddWgxkqDi2qxdy2Mj4E7H62e1kCDJc1yMfWWBgZrcWBtW8oRR1XJcOkrEq6iyOTkA13wOdlDjUDcJ/b/nfKJ8Eb1eEgT5bjrkKU5i32zTgSLx8NO5NM/jzFGHu5SjKKuo+M1XrtUQYNMBvLg0BJSVTAZH8Bg8dJvsF6f/kVQBl2R5yq7cGd2E+6fHBz9DU5veM/JFwW3P/xdn8riEnm7zQ5WNnPQxARi5pyUHEVJ2nWoKKyDqL5NiI6DMzM0m+xBJ3GDoFPPOF7LhDVq6yMkSOOuJ04OLOPrh1z6PkEhpl+9tcN6YIAA9tx2MOqzpIzZ1lNCGpiRUjg1rM84tO2poekj9WOPoQa4ENlRg/0b15IXssSElZbLPKIhP3bSx4lT3nTpsIxkOvnSNCCik0Ta+9PaVhTthKhWWtfIhzGszVVwY8LtukteajWSUebFUAnMeODrk+qIv7wwXPYXgBAM7H+iKv6bGQj+HV3S7VZNv7SljPovFTT9VE3W9QMdNK+abSOLI8R+AmZYRPjAZEF8DQFOUPs9YKBgsHIPFzC/LLKjLFSK6Dd4XBWDcmc2Qw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6e261e1-fc5e-4353-6319-08db70989328 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2023 07:41:21.0870 (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: kECRy0YsFY+mEsFp1LrGRrXb3XoWF/MaeiAs8tgZWAKVJmdG9JpCnmVNwRMhH1MpSn0MYC+WDymSMLkgU+UuTw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB5825 X-Proofpoint-GUID: a8CmEZavN0MxDQjNjPnRMV_rfWbpj64b X-Proofpoint-ORIG-GUID: a8CmEZavN0MxDQjNjPnRMV_rfWbpj64b X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-19_05,2023-06-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 impostorscore=0 mlxscore=0 mlxlogscore=771 clxscore=1015 spamscore=0 adultscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306190069 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 19 Jun 2023 07:41:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183093 From: Chen Qi The dnf contents should be moved to /etc/dnf/xxx instead of just /etc. Signed-off-by: Chen Qi --- meta/lib/oe/package_manager/rpm/sdk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/package_manager/rpm/sdk.py b/meta/lib/oe/package_manager/rpm/sdk.py index 0726a18b91..85df6e949c 100644 --- a/meta/lib/oe/package_manager/rpm/sdk.py +++ b/meta/lib/oe/package_manager/rpm/sdk.py @@ -112,5 +112,6 @@ class PkgSdk(Sdk): for f in glob.glob(os.path.join(self.sdk_output, "etc", "rpm*")): self.movefile(f, native_sysconf_dir) for f in glob.glob(os.path.join(self.sdk_output, "etc", "dnf", "*")): - self.movefile(f, native_sysconf_dir) + self.mkdirhier(native_sysconf_dir + "/dnf") + self.movefile(f, native_sysconf_dir + "/dnf") self.remove(os.path.join(self.sdk_output, "etc"), True) From patchwork Mon Jun 19 07:41:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 25949 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 1F90CEB64D9 for ; Mon, 19 Jun 2023 07:41:42 +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.2805.1687160494852636624 for ; Mon, 19 Jun 2023 00:41:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=jWjrrahM; 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=55343858d1=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35J6TfgT003709 for ; Mon, 19 Jun 2023 07:41:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=wRpQwiwcUpyxYvWOQINSy7S4gBkaxuKSSMheA0nAcas=; b=jWjrrahMz+QdhN+SulOxvC5AUlpKB4S7EA9i9XSRO9K/Dy5Kxi3Qdvdy8qKSkK0XVc0r V6DaEbZgh4GS9nVEpRbpBOs2+x/jLBDfv4uNeqtDvRfW1ZoxGUjSiuqs51TL1utlAnL7 D+oihwjQcJa3OYiitx5RQo0ipDho9nglq7SQIpIX1kz70Xu94dBtSXRTn380FrKV58Kb AVifvwhU73lBluEKr2AKhD9EVcW3pKe82wGAQtDQXVOZ0Itx2sVn2C+3puRaAw+VTCos aHIJY12jB+so5kVWwekNBwlJ+TdmCj2S+KL48EkyIYehqP34QvXCi71Une8VmksZGeKa Cw== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2105.outbound.protection.outlook.com [104.47.55.105]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3r9220he5j-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 19 Jun 2023 07:41:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jvOIMC+oOHdAZBcpUtNJ+QhWXFNiFjZhMcMBxDpO5EqX5s59qunw8MPfDHcqsJriDve3krSMohaicMm2ov453resDAv2QqqC1uj5t4LMEh74lVRTsF5Vtz02Pzqi4XBC9BRyBN5cFx5RsEwbKE6zbbFkPBNAP0nKWVH5WVGy4+E4ZDMFZLumqfndmfKtS1zIZgMmAxH3NRnl/0d+fs6sF5UTIC0ezWWbfjeoxMxxNJNfTFUBPnf0BbAWs6j4zqwk80W+4FViorwsCv59nJPOvkOsHAKnkj5daWMAi7fl+WwP6eBkEdB6+cFBrzPQvYDCsKuWORWzeZhxAXAxc9MpwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=wRpQwiwcUpyxYvWOQINSy7S4gBkaxuKSSMheA0nAcas=; b=idGZm1eFGgLl5ZcObqCeS3jCJYgMrpTIgbhiKEp/xQldPwpR5qtLwoedoML2UuECjVGv5Gvb3vCX1bqik9xxQy9dKFInX+/Bc+oLu79dwmL34pC+z/RL5iWw3tMNq27e0YKmSsw7925ANWF8fuZJp61bsQHO1duCvjs/MmwUzYR6Nj2AJnfGFuXQnY1wlIhprXyQ4SBWm6sQ7IeaWTpdviR6LzIFFVwUc+PyqaeU/5BF9UObmyewTzuxZ9OdY/wsLJ1vvDD2fHQ3LEbbhZSHy9d1IyTwW4nRKBbs0098cwVtr6ln7v1t7LIPiSzGGvOFauL1aDN7FUCkfF4NBds2HQ== 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 SA1PR11MB5825.namprd11.prod.outlook.com (2603:10b6:806:234::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.29; Mon, 19 Jun 2023 07:41:22 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::b504:c7a0:9ce8:6f17]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::b504:c7a0:9ce8:6f17%3]) with mapi id 15.20.6500.036; Mon, 19 Jun 2023 07:41:22 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 3/3] rpm: write macros under libdir Date: Mon, 19 Jun 2023 00:41:10 -0700 Message-Id: <20230619074110.2831977-3-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230619074110.2831977-1-Qi.Chen@windriver.com> References: <20230619074110.2831977-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SJ2PR07CA0022.namprd07.prod.outlook.com (2603:10b6:a03:505::24) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|SA1PR11MB5825:EE_ X-MS-Office365-Filtering-Correlation-Id: 5670a9e0-7734-41ba-b0b3-08db70989355 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y0JTQ8B/t3dY7NOl1nwQkaTOoceXmb9eBwZYxW483ALHg+sMlsfm0MxaD4FJ0TQW9XbdCu+RquuzrgmD9oix0EyLsv/rIVDqWOjte7UdwL/qiGreg4XfOKcGodlWzNTq6djGpTnFI4kIVSCgLdS3v70+r+VFRMK5T1GcpMXmp8NKy2H07sClEgi2J/vYZRQjvwUGXQ5JdRtcdv8xXsvOd9Ok0fESOJGrv70r4sEhGpdtVV6RM1eGQzaUcEqvH4SFg2JUth5HmKdJKMJNII1dWGlCGroLBvjbMn/LUTp/x69bZLRGjpnb90kzzQVmqTkBiAcGkR7xA9PtXkmqNORdirOWINzJsyd75gFIZLzAp0JF4UYSSn97IRQrG+aaTOak9qEcT9Kp+crZ5i6ogdfNBI3NBYqOrH0hc7hCvmqLNCIA8J343fRfNgi/s54BaYO5dciu9m/dMhfo+bEOrLcmlLNwBo12xfx4bEsr9coLT24Vinn2o1VwUvHtlnXrTq07qnUxUKqpuXGz+ozxskM2o/MY6vxilfjZHtRawsIttbQ83yKnWM5IhRqCGsXIzV9aVinaCzTBcKwiyKD0uavF5D/Whe4S11kvxnLVjzYO6W0i4BNOhZxvulUGqGzamCZx 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:(13230028)(4636009)(396003)(39840400004)(366004)(376002)(346002)(136003)(451199021)(6916009)(66946007)(66556008)(36756003)(186003)(478600001)(2616005)(2906002)(66476007)(316002)(8676002)(41300700001)(6666004)(86362001)(6486002)(6506007)(9686003)(1076003)(8936002)(83380400001)(26005)(38350700002)(38100700002)(52116002)(5660300002)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BQDYBeLm4TuJhevHJdjfCrVPFZENT32XJURQxKaX2WMekTYx1M5YWqkIh7lwZJvOYDccdPggHXEYq/JPTnRGjnadPkBVMtR6EMnUAxbi4WkdPS+JArHATYFThHveOx97d038opUCYYnq34LJvqoIdgpD+sCC8JRjz5t0E+7wWDGw+FhllVfzcryOZDDGk/Fp2OQLCqYg02TpYfJroUcXm0IrbkhGi0G+oG1spru12lJL8c0ci6fgOn59ZqA5wsao64owZIg5SAumMvXvhkbU8xFewt51lTSD+t7gECMwK8aLj0OyQsVd68V/WXUb1GTP4G7Xrd3VDgRRDUBUyWvZxpPobYBacuR/+EFEbJJDbgR/2rirMCwuDpJ/mwzsDd8AdDYmDbBkkM0RQCFFsSULSFxhIKmea/ocSYTKmMl1TkfVEJt1aYaARgK9uPbdP/rixUTvPdZv5gtQxFr6ZrW8ARZRqi0YkF4q2DOBcWdIkA5FJRT5NSjijNrmsuHsfAt3y0uTERkn9uLQUARNYHOBd52INtIG/ZTr0K8C4lboPtAfhjdcAXraUrdcfPzUImfy1LwYRJoqUXpzHu1jbBFxWolPLZDbaG7vNdLHmHziv4GZVsZLc+zjvkMyl62/5hhl6gog+oPTd26FIeEWzR4H5jSW8waWRRFQF6jBLUwVuGRlaZDLu10niVBL6Ffu6p83NI4cuPiSmCP/cj/1goUXp2MgULIhnxVwNlluyR41fP6pmbSPVW3uHgYbB5EUUZCedr7MvdCelDOpf1S9SxYzkDy2JqprdFZtNqmS1AdK6xabNZXKFFxSfXcyOkyNSY4VkT+eQYAC7eFP00mKZhPQRhZKZEja0s4w2L/MJHgNDbSOUIc2l8M2M60yaukksD2AwOPZaZ1KQB+McZo1OLEkz/3HUNkE2x3Rwe09VwNjs5VIESbfljI0MRJhRZjUWUIjhR4nAjYS+BDQ0D+s9Wlmhvmb9qI2kBtqp78M1A8Ac9I9ykyd5ZVVlH31Z1P8MTcDzSte8qPHNp5fWx5mmIPrf186KD3meYEeqNWkye9Yznz26d5R7F7Edgv2hJ2HIoJsIkBljULXf1cYS7I4dJROTPMSKi/ZEcivWLG/ToSdoYYEs6zKq54bIv10L2pOdLkrqYU6gvZefCbxveWa2FN5HCqenTStn4nhfJYuW08b/BZ8ugddAUg+rXbW7BkoMbPkgZlSnWPhdRLThB/LZYbCOJcdTz9hhcU9zjJRYv3oDatQVWo9b97tpsKz/CeFf9Anm+5DSe/AhS8hgtoI/NeIHvhgzTEDjkbvoG6QaavV+DdENIV0hwoemp8m928rDAHJegWM2iSugidFAw3eQr41DNuIUD+++gFnGoVdaB2ib709IqdOK8PxJSu0SBaqIRNc3lKsYoV1cMIXyvMYLMxyFOx2zDKFH6VgZwtzw/bIUG6V9N8dwJd9PHYITLf6eUHjmD9cwixDQwAgKcyn9MqX0y0HshODBRrQCFWy/I0qjgdY7UEKWWpfX+xO8MaSQW/LPgNlhZnKPx+k3XePJHcMpX+/yh+mxBWimA5HGzIWdC7dnjAKVF1/6sUTCWc4m70OHVPim/aEEfxp1tPg+Nin6w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5670a9e0-7734-41ba-b0b3-08db70989355 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2023 07:41:21.3356 (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: 8YgPT2FZiDBDRxsYWLASZfrcFXMC78PYsS1MuWdAJDZ9cHi1vldw7Q/TdHYR79zR2P2nQbdqjEJd/Kaexgaujw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB5825 X-Proofpoint-GUID: h2vGK1ziS7mZxDdyEEMBMdDmXu2HQIhM X-Proofpoint-ORIG-GUID: h2vGK1ziS7mZxDdyEEMBMdDmXu2HQIhM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-19_05,2023-06-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 impostorscore=0 mlxscore=0 mlxlogscore=828 clxscore=1015 spamscore=0 adultscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306190069 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 19 Jun 2023 07:41:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183095 From: Chen Qi If we create a macros file under etc/, the populate_sdk task would fail if 'package-management' is in SDKIMAGE_FEATURES and nativesdk-rpm-build is installed.. The error message is like below: unable to place /.../sdk/image/etc/rpm in final SDK location This is because it's trying to move the etc/rpm dictory into the host sysroot but the /etc/rpm has already exists. To solve this problem, avoid creating /etc/rpm/macros for nativesdk-rpm-build, use ${libdir}/macros instead. In this way, the macros file is hold in nativesdk-rpm. As nativesdk-rpm-build depends on nativesdk-rpm, the 'rpmbuild' command inside SDK can still correctly find find-debuginfo binary. Signed-off-by: Chen Qi --- meta/recipes-devtools/rpm/rpm_4.18.1.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.18.1.bb index 6da2edddf3..83537d4761 100644 --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb +++ b/meta/recipes-devtools/rpm/rpm_4.18.1.bb @@ -134,8 +134,8 @@ do_install:append:class-target() { do_install:append:class-nativesdk() { rm -rf ${D}${SDKPATHNATIVE}/var # Ensure find-debuginfo is located correctly inside SDK - mkdir -p ${D}${SDKPATHNATIVE}/etc/rpm - echo "%__find_debuginfo ${SDKPATHNATIVE}/usr/bin/find-debuginfo" >> ${D}${SDKPATHNATIVE}/etc/rpm/macros + mkdir -p ${D}${libdir}/rpm + echo "%__find_debuginfo ${SDKPATHNATIVE}/usr/bin/find-debuginfo" >> ${D}${libdir}/rpm/macros } do_install:append () { @@ -173,7 +173,6 @@ FILES:${PN}-build = "\ ${libdir}/rpm/macros.p* \ ${libdir}/rpm/fileattrs/* \ " -FILES:${PN}-build:append:class-nativesdk = " ${SDKPATHNATIVE}/etc/rpm/macros" FILES:${PN}-sign = "\ ${bindir}/rpmsign \