From patchwork Fri Oct 20 12:44:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 32648 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 7768EC00A98 for ; Fri, 20 Oct 2023 12:45:38 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.81]) by mx.groups.io with SMTP id smtpd.web10.53230.1697805927092307722 for ; Fri, 20 Oct 2023 05:45:28 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=snQlcoLv; spf=permerror, err=parse error for token &{10 18 spf.protection.outlook.com}: limit exceeded (domain: vaisala.com, ip: 40.107.8.81, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GD33Kg8POrTKKLtd8v9yj6lcHU+6h2HUld2nr9nqZdI55BIhNmg7W0Zx2k0sx0bnub46ctJBv7FFR5uhawYYpCGAJm5+E1XAoi+sienSbG4YQUFsTHlZT6f9XXVpd9pwWoZAWOt37WZP/aM7awPbq2+KfDzZC2Ti7BQSR4puqFUBJbliiCgZQZfuw8NvpTIgwwavfIIPrOujl04K2iQ1KKNphX9ZEMzsVjPYoq8hDoUAqJ/eVCacy6CoRwrRkLS7QpO6yhUlxbfSp3AprTaE1hymvM2OPsWlaO+fbYyigicn0SM6xZXK3TtzxbdJ7p9DItcZrEIMuW57g91QkSy8EQ== 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=1GTAgSo0bf24wVqh+rk/z/iZBJQxR9/i+10+SvMI3Ww=; b=FHaqps9uvZzfptcZuTnfVPDZ4doR6SGh/i7AT+4pG3VdSQdx+opTuUiqiMM981HQPbsTCvM5lJsUimTQwpmg4HoFe7+ZVsb6eT4MCAiXwLgxGfZLJIMiu6j1xWNRdN8Kh+u84VxizSaDf3ohycJTJBAz+kEYE3EKfSSiuQUt+GSTofiM932prjtjLJ5g584ccB6QRP34nKBTu01qFie0D0CNPPD/wazNIPQicyTFW3l2pmy78DwfBJ8l2jRwwwqRNvNlOFU5h/8p9ytYNMjJXKiafFhez5Iv3kpcussTKUugjRbVBtGeQdSvSPVA9mnaISPykGW4xIzF92j7zP1DmA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1GTAgSo0bf24wVqh+rk/z/iZBJQxR9/i+10+SvMI3Ww=; b=snQlcoLvPEvGBmGt6NL5vyCYHAtDuRSvnF63PCc8WsMYJ5HYc2o1AgBUfJs8XPNft2J38Ye03WFeH46I1XMo1X0DU0vlxlYZfyYEsDYnHdc2UKN4+rfWiaBuLPfaMvW9heWuRvl/R7Jy2ndnCn7q5ZYYBMRcluFpPXPsp4h37kxPQCUmGxh2LBP+UBDdMgh7e9FwN5sPoeemWDOqpQERS+rOqw7pe2D5T1TU0i/kjR1+YwxKSQHx3cujgA6af3dQF6TaROoBI8x7V8K92fzF7sHHt+5uRCfMSFiQo+SDiJ92O/AZs3X91dvADm/3HJa205E46+FlNgvCJgT5f1ZLUw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by DB9PR06MB7515.eurprd06.prod.outlook.com (2603:10a6:10:260::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.23; Fri, 20 Oct 2023 12:45:22 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::cf3a:acd1:fc53:af3c]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::cf3a:acd1:fc53:af3c%5]) with mapi id 15.20.6907.021; Fri, 20 Oct 2023 12:45:22 +0000 From: niko.mauno@vaisala.com To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCH 1/4] package_rpm.bbclass: Fix some pycodestyle issues Date: Fri, 20 Oct 2023 12:44:47 +0000 Message-ID: <20231020124450.9736-1-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.2 X-ClientProxiedBy: AS4P192CA0033.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:658::27) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|DB9PR06MB7515:EE_ X-MS-Office365-Filtering-Correlation-Id: ef9454c2-b920-452d-220a-08dbd16a6c77 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nqtd6wq53L9B065NkSopU2NB4uyLvE2Qcy6fizQzrrx4KSIpiTBrJlvzKExhpXJfX99NxUnGvnSMPdaw3GDaWsGzgFpVc0L5uhb9hshBDRKOXhEbvQ9amFFnuutJ6GNUuu+jHTF6Xo/WCMYm707X1UfRnsg5lzGgTRKzHUvBNQ0Vht8AiMdBA5Y0aL9iYRRdk6+cJjIqiPtwwDHpfsRYmFptp0UXAjRn6HSIc13mSMlzwEp+eFR9YuNmXPUblk9RuRKs7YHcmEC+Uho1c42ueZArywYd6zJzdw8BK/SSt1tRy6iwh9UjAucuJ70s2Ks2+4XdBmm3zzXAdtWmes9mI7kFrFF3FIuFFBqyTkXubBAZi1qCVSwz9OAaIVQXQvKWGuMm7PnCTRoMS0qLHhPTBP+XbP9llXoAySjKZIKk7K4HpfgK6nP/g8JyiYkSHZj43+B1yx2ibRdmDY6OYCNgehXT+10uDayT2VXPS2hX/HNT3UB4UiMl2nqCuvVJm1idKjeG1U6ArE7bPzhvxMTMzp1xhO9u85QL9WtVCxAdjtZK4ucEwJCMMGBnu8BXQFRLfQIvMTx1iqTMkXAGOefaQbAXXudVE/bNarigeUcoObpMMPFAlyTrqHQmD50rpk+M X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(396003)(346002)(136003)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(41300700001)(83380400001)(38100700002)(107886003)(9686003)(6512007)(2616005)(36756003)(1076003)(2906002)(5660300002)(6916009)(66476007)(86362001)(8936002)(66946007)(8676002)(4326008)(66556008)(316002)(478600001)(52116002)(6506007)(6666004)(6486002)(26005)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kq5Vqx939tQ3Fo2wwfJbr4Q4pbvTWWsr7YO2vxVrjwWiH8ARCRwgO/58zHRe3BRS2WHVIsDH6vqTS4sCoaoll1xj2VVM5d+k+UtIgDx7JThgJX4Rvxdv6U7/xk1ldKGWe7ZgjAwexArgxgnGUfYKRCxl/FWxOnRuw+s6j/7Y05BHZR+1R+u9hoK26QQDFdnNFgiYOptifVTMBTyVKrtsdvuEevReV9lbFU3rvBtld40uhc+1riN2yVfRQ5gZYV9+y7J9mCacbepDD25JOzB9BsyPlabcaCOz2F+UKM1ipbkFQVDQoL2AY3XNXO5CCt6uedBKO5DSMnFj8Vs+VCvRaikebDPLMHn/bctCW2pn8JozHhBzQL2sdBNdvmAYqfCs50h0MqP6oamPweOBgnX6uno1rUVYL8ZC/5K2BcUJ1BPqQ95aOd7N2jhaM7UMHPXN/5Ns/J9nhuehAFM6PTdV3r3+qdX2vNsmKmLsO7p1vw5cXZdtj+k31miTcAz9mSaC7Y/vcU+zJoKCGAYV69SmTmwTOEoGYdxxkCpk4QqNUnsbj5USn0jOmZcRhuzQihGaHVKooRt8q9NwqFGqIvnRR8Rhr80tINxs+wAI42OBiaotW7NaUJBrD+CIHJKW38jBgUGqeJMsQNdvDZGp+m2xzlD+y0qaAn+3ktRRR2l+q3+lWJV9v+ounx6+XqSEOvm5IHbGDTyGZRxT+oPC333o20plfNGixIdc0x7tA8NjcoZIkTXvvW5Hfr/beoM7YcxrLSJcxxdSVYBPw/mgRNqpMbIX8cakXFDhX4LcZ3t3uSTGJPEMZ663+carq3Dv8/vFSFqRHCxuAB1hcqD+9s9HZmfQgRlS/m73QeBVlHzX8YOSVUxsgo5QkAMjzKGMv0XdVaemzegxtfOugL4ofjuCXXbz3G1QR2Q8RbRw0yv+3UqadclLF9N5tyRyXvgkTfZoDtp83GJee/GkJjpXbRKGBaVCgbDzMdFABON9HnSLdDcnHihb2idDg8raxudxUfqCcqVl4kwauzBZkHjeU1mn3zu4AZbs+EYQyR17/pDe+3SDVPqALDClP/r4YD5edN7n30AePYuwiDJ4S173ap+rVXa5bb1BGs1vxbNT2MGHrn9WaZcOFPxkgcBUMTAVx/xIPYskEndjivK8apQfn3L0oYBqyo/On5ZQPMlltik0jMHacIn2/xtwu5oGalFXTdo3lml7JNjSKX3Kv1zhCUF0uC8nFFOaywOqrl8d2d3XLuRXMiZ9YfBLIcqnAjmZBgoGPmX7+BXsUzri3q3Xil8vDQfJngHHXnd3zLwbCkoGF6vMTUCg0K03CBR77jq1tf97ZtkrPSpfAbiYWV3RbVW1z2uaau0pH7fK1KyjfGYGV81w9oq1Bh9KsgSdWVEdwpY/rRrTLlUkwdTyGxwvFJ3vHIuBpK7EPU2qS2jpM4L4O4dXwWZw2qRpxqnnP68iZwMLBoKgLN+UTavw01nCt6MejyjH+a6WJH22qGNAdDlAhExCKEDM6ZjAI3henIS3nkujLcbbQfTtfdorqsMJCI0doicMVAsFjfNJfvDA7OgDYurGhJL4Ct8PgSlSclGVBlK6XQoXQLg2F1r79bw2HAhDLg== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef9454c2-b920-452d-220a-08dbd16a6c77 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 12:45:22.4799 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: z8aA0GabrEn2pYQ/M8UiFzZJPEEyXhNwV3owqhebXr6nIWdJoZ0nDLkxu8ISJhFc2TWNTAa3++jrELExF6pYnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR06MB7515 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 ; Fri, 20 Oct 2023 12:45:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189520 From: Niko Mauno Fix following subset of observations reported by version 2.10.0 of pycodestyle utility: meta/classes-global/package_rpm.bbclass:65:46: E231 missing whitespace after ',' meta/classes-global/package_rpm.bbclass:66:46: E231 missing whitespace after ',' meta/classes-global/package_rpm.bbclass:107:19: E231 missing whitespace after ',' meta/classes-global/package_rpm.bbclass:109:69: E202 whitespace before ')' meta/classes-global/package_rpm.bbclass:122:103: W291 trailing whitespace meta/classes-global/package_rpm.bbclass:194:74: W291 trailing whitespace meta/classes-global/package_rpm.bbclass:448:16: E713 test for membership should be 'not in' meta/classes-global/package_rpm.bbclass:450:16: E713 test for membership should be 'not in' meta/classes-global/package_rpm.bbclass:520:1: W293 blank line contains whitespace meta/classes-global/package_rpm.bbclass:521:15: E231 missing whitespace after ',' meta/classes-global/package_rpm.bbclass:542:12: E713 test for membership should be 'not in' meta/classes-global/package_rpm.bbclass:544:12: E713 test for membership should be 'not in' meta/classes-global/package_rpm.bbclass:647:67: W291 trailing whitespace Signed-off-by: Niko Mauno --- meta/classes-global/package_rpm.bbclass | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 85d0bd7fce..992446a033 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -62,8 +62,8 @@ def write_rpm_perfiledata(srcname, d): for dep in depends_dict: ver = depends_dict[dep] if dep and ver: - ver = ver.replace("(","") - ver = ver.replace(")","") + ver = ver.replace("(", "") + ver = ver.replace(")", "") outfile.write(dep + " " + ver + " ") else: outfile.write(dep + " ") @@ -104,9 +104,9 @@ python write_specfile () { import oe.packagedata # append information for logs and patches to %prep - def add_prep(d,spec_files_bottom): + def add_prep(d, spec_files_bottom): if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): - spec_files_bottom.append('%%prep -n %s' % d.getVar('PN') ) + spec_files_bottom.append('%%prep -n %s' % d.getVar('PN')) spec_files_bottom.append('%s' % "echo \"include logs and patches, Please check them in SOURCES\"") spec_files_bottom.append('') @@ -119,7 +119,7 @@ python write_specfile () { source_list = os.listdir(ar_outdir) source_number = 0 for source in source_list: - # do_deploy_archives may have already run (from sstate) meaning a .src.rpm may already + # do_deploy_archives may have already run (from sstate) meaning a .src.rpm may already # exist in ARCHIVER_OUTDIR so skip if present. if source.endswith(".src.rpm"): continue @@ -191,7 +191,7 @@ python write_specfile () { def walk_files(walkpath, target, conffiles, dirfiles): # We can race against the ipk/deb backends which create CONTROL or DEBIAN directories - # when packaging. We just ignore these files which are created in + # when packaging. We just ignore these files which are created in # packages-split/ and not package/ # We have the odd situation where the CONTROL/DEBIAN directory can be removed in the middle of # of the walk, the isdir() test would then fail and the walk code would assume its a file @@ -445,9 +445,9 @@ python write_specfile () { rprovides = bb.utils.explode_dep_versions2(splitrprovides) rreplaces = bb.utils.explode_dep_versions2(splitrreplaces) for dep in rreplaces: - if not dep in robsoletes: + if dep not in robsoletes: robsoletes[dep] = rreplaces[dep] - if not dep in rprovides: + if dep not in rprovides: rprovides[dep] = rreplaces[dep] splitrobsoletes = bb.utils.join_deps(robsoletes, commasep=False) splitrprovides = bb.utils.join_deps(rprovides, commasep=False) @@ -517,8 +517,8 @@ python write_specfile () { spec_files_bottom.append('') del localdata - - add_prep(d,spec_files_bottom) + + add_prep(d, spec_files_bottom) spec_preamble_top.append('Summary: %s' % srcsummary) spec_preamble_top.append('Name: %s' % srcname) spec_preamble_top.append('Version: %s' % srcversion) @@ -539,9 +539,9 @@ python write_specfile () { rprovides = bb.utils.explode_dep_versions2(srcrprovides) rreplaces = bb.utils.explode_dep_versions2(srcrreplaces) for dep in rreplaces: - if not dep in robsoletes: + if dep not in robsoletes: robsoletes[dep] = rreplaces[dep] - if not dep in rprovides: + if dep not in rprovides: rprovides[dep] = rreplaces[dep] srcrobsoletes = bb.utils.join_deps(robsoletes, commasep=False) srcrprovides = bb.utils.join_deps(rprovides, commasep=False) @@ -644,7 +644,7 @@ python do_package_rpm () { return # Construct the spec file... - # If the spec file already exist, and has not been stored into + # If the spec file already exist, and has not been stored into # pseudo's files.db, it maybe cause rpmbuild src.rpm fail, # so remove it before doing rpmbuild src.rpm. srcname = d.getVar('PN') From patchwork Fri Oct 20 12:44:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 32647 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 743E5CDB474 for ; Fri, 20 Oct 2023 12:45:38 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.71]) by mx.groups.io with SMTP id smtpd.web10.53231.1697805935514709876 for ; Fri, 20 Oct 2023 05:45:35 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=Rvjl12Qo; spf=permerror, err=parse error for token &{10 18 spf.protection.outlook.com}: limit exceeded (domain: vaisala.com, ip: 40.107.8.71, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YtQcyOlyK3jSpvQGrOiwJ6etomRFOXNHfjNoIsh9Hw9qinRDxpj0a/mvo93TLIDjpxF3k78yJ1UyQO7wVSPvbspiJ+oV1a8fwRqcV7fvbB4K/o+RHWJafxXtoYZlUg9r0snmvGied/TOA8Op4AApYT2TuHQOr55HVmntb3vmZ1frYluSqiVywonUJnqC8oSCPjfx7U7/amQ3pMaMAETBltJgfKvA52Z3bqEPmRdn2kCiNiNJ6HKY0Ht1vkCi5NNEY0+/BfoNIUOS0slnFSS3ZZDfXC9IJQTSaWpc/Jy0dMcmYzhriS1Rduo9LZZhxgzn6Lw89tPpu2VOhL4GHcr7fA== 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=mtnRDGHSe4vgTRrW7C2QFXpZVj2deGIJrYTYgiS+OnI=; b=oI7YWUtnGh19WMvody2qMaNMz5UqKoFC/P2jqMHfZSIroXdlGoeXNVZ3KRD4/YfoNcgYdrJoE+4DXPRaZ/uru6WpUnChzb52LqXpuM+3IIjBbYkVPkQdouKTKKmBcnUfFTAekoDJ+PCTvfqrh1iMib2HBzYy4sNF21SUjmTQZgw5n8aTyoe+qYASqwSNFhynrPHPZGx+F/R0MPrmm0xBHqNJG1u2i3M0q1K6+R7ehZQHL80vJecYNf3be2JQrfQTVO/kNSNvfCDIJYWKdxdFizpEOZgTYBXmkYfhWypFEKgCAX/R42MQnY3NBiDdWOClO0pBJcorD092Undo8w6GjA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mtnRDGHSe4vgTRrW7C2QFXpZVj2deGIJrYTYgiS+OnI=; b=Rvjl12QooIQ25KeMiwGq3ljpZNfmw7xkxn7jDv9J3CjB9wUmfksFFqfD/ZN0c4EXTY0/aJcaaVeNQ3L7YcsH7uyt8y4pTrvqoUHJmUUQ9X/OahUJ60m2ykN2wQsii5QKPIp1A0ZT9Yzdk0Oqz8whHaSE+24rtVzGgnBGd76VwSDiMmLAIlgOCu7yHqhXovd2Mrc+UB38qIK7RjgzZIqDu+ig1rzu4fxR30D0d6qCErB9c2zcOpcc7dca3lOVXeRPtVFUt8+0fwOyMnkSNXgcx+UNRBfgvPLe+I8iaa+H3lsLpgtP/1URpZzg6LUWfJ8EsyexRXwP2STTTfND5qnzhw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by DB9PR06MB7515.eurprd06.prod.outlook.com (2603:10a6:10:260::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.23; Fri, 20 Oct 2023 12:45:32 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::cf3a:acd1:fc53:af3c]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::cf3a:acd1:fc53:af3c%5]) with mapi id 15.20.6907.021; Fri, 20 Oct 2023 12:45:32 +0000 From: niko.mauno@vaisala.com To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCH 2/4] package_rpm.bbclass: Minor cosmetic and style fixes Date: Fri, 20 Oct 2023 12:44:48 +0000 Message-ID: <20231020124450.9736-2-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231020124450.9736-1-niko.mauno@vaisala.com> References: <20231020124450.9736-1-niko.mauno@vaisala.com> X-ClientProxiedBy: AS4P192CA0033.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:658::27) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|DB9PR06MB7515:EE_ X-MS-Office365-Filtering-Correlation-Id: a8a8f635-5a34-4ebd-49fd-08dbd16a7268 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FOxDUkuNibqIVGdRCsKObKxlYMFL7vLLFvLh45BSMAQWufc/rddC3cOK6O7fld1p44N5ii2kX+m5DCuNyVxQDLx2bQ+cWT6T/3WNTjaCAa1T8mV7c7mQOre4zY4KbrDt9JJztw63J/GgFR49NxB3QpSnMfI4/F506C/tzZAZhv5ZOtI6j48wVDJD8kQahyfnCYUJ7X3bi2jh0X1yAfBLnbFNAA76jgkkbFroja5zPjHwmGxiJ2V03LzRgWrAkL+FjsZ3u5YOTnHNrDMZ984rGPgb4kB44EUdkoybJZXKQcjf+hgHJZlh1YujsABIUSz0OvH/pXw9xNeliKhgccr3aAz9YFSCzlALmUC3QJl2NCNSzDq3cOgGWuHrGJpStEtbDr5pbK5r5JoIgpPvK9f1WxORdGyGZK5evJcFqa0BDMOM0L9hco0j/7Gfj+Et7hJMjCUYKJVCZ2RUY15BqBvs4/uiXHp1qZQagPg6sBgyZrbOYbu5crRIt/Pmb9rbpI6OUdSQQWj4Z/mblFE0qvH4vLDH0gt3J+s1/kkePWk5DjYEXdQevEdBDRY6cWy6LeaOoGw49t/Mk1BaNg4N21AeS960LRS7lmEF/ArEgnzi80nQmM8QaSczZKHAY3PB+rP5 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(396003)(346002)(136003)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(41300700001)(83380400001)(38100700002)(107886003)(9686003)(6512007)(2616005)(36756003)(4744005)(1076003)(2906002)(5660300002)(6916009)(66476007)(86362001)(8936002)(66946007)(8676002)(4326008)(66556008)(316002)(478600001)(52116002)(6506007)(6666004)(6486002)(26005)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JPoyW+mKknaxCpJ/jYWRhPgTTBWIiVgkdqam6jK5hH/vqTnQIs/b1LSBsDwiPDAdD0AB6CWoDledjQM3az7busfS9QvHxTfOXhkRo6HMA9pT3lwiODABtnkcUt5Ibchi7wxYefh88t7yKpsVKpZ5hYgYJJ3UVLT4Ff9mGcsxiPfrnNfyJzOYwGEfINQ3nvpd0KOVmrViMV7PlYDP0+WxvCzJbmto9kFAToNLPZC7rrWP+Y9Hqmj3v3/lyZK3FxrUduSFDV9h93uUC/Va8PGYhNH+e+lD95XCnueK7wyEatPxkDBVatJCv9QYNzz03j9iHCQqIGSdEFlI2K4MWPmGYGPVtSVs/3H1nQ++oHBIGviUnFOo4cloXt3rqFKNzBBBHx3e+o/cRgeSZBMBCznuHWNiq1CxLvE6+NKq4HREUaomlPQ7X2sE1wfTnViwyZm1XLy606W8NBmUgLmvymEzciOKrOw4a8Zkacu4gChxJydZcTR9SwnPM2s1IUL+SARao4f6z8/gjOAHEnQf4Y1Dn0PYWROdmmkHOjJByNEIifPm6FDJecgwQeTKApgHwerJ/ugQh+yVBuuHjZVtwn47IlOK4Nf9Se9JA9fcvTOERBgqiTi6LTWlScsi7qwfj7hzM9yslY8UBfhpeoUQJj6FE8v7V00KsOGONEv8rcIU+rBdhLxjCuICltZ0HjCeNR3/y5BGnaoXZ0A9CQMgPywtDIw77fUQ3vNsZcc7FJAd6FKoNTqVJ0ohWHzb/vdULzpQZhervFAJI+4pkPMDRUIDDAPWEbc470OcgHHrrAP22R8Zf9qcinGyJMs1aAzjWlmChc8M22gTei5WrezIYx/D6htnZrspQscXvyrjzrEqctL6ORrpOyGChz0oYE35DX3cL+P6s8+NijN+l9PP1EVGcYPYoJ2w+Yk88aUKNurXn/qFebCNJb56c3pewPTplzlf+QoBFpW9TJj3lch7VHGrFahKINRNSp6qtrgjasIFJEVtEAF7npaqRE/Qdxfw8A8Ymqw+yaA2WnFvpwulsXbOXkVPe2ZjdU32VqOfx5mWC7bM+wXyMK7GXagLbqBcXF1hKFua6fDZ+TubnAifQdo97H5U5yatwSIDR/GID/hpd8V3m4/AxQoXMKEkv065rAv5oGWIZzlYw+9NQ7cVBhfFvr0V9sM3qv2P0Q61LuBWeYh/da/0kPGj/ik6S7HqwIw1jSwKLDIB8B+lawDuQFYaVZRqdzR4NX4P34HWg+QZl3cVvsKB80TuY1YnmuJH4baSpiOgIMh/ojiri1kX5cxML+Jn6xRIe/StidqUlm3gDUBqufq/ZRPTH+KVk3Bcz6P2MWv2HiRWvch3xTwrLKkYUhZNey9cy1Rk/iUPtGqeVF6/TArsMQK1MUpXi2RZ17vHHERKnbmNqs3vQPmIAH46wGVpAUvz+uk0k8tVlrPhoHnxaYN6FZONpFkpvNSF+m6zMqXRwskDwunPFBvI/TOwMq0qr6Zr0cmL3G4Q/c+dMzqC5C5pemA8Bu1Gq3slNyzzWAlgk36tRk3iYLe+4pR+0qIMbKDWqdWnQDQ8xdVuGo1tBcphoQtVouFAdLMBND5FkPjBcligPg0TKkXKQtQbiw== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8a8f635-5a34-4ebd-49fd-08dbd16a7268 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 12:45:32.1690 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: befJnZovc2U1jJNKEmYUlWdlGW3n5VUA90M4MSkNaL9Z/EORbh7bdHVmz8QoRU8iQ6n+I+UNJsiWi5vdU0gWBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR06MB7515 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 ; Fri, 20 Oct 2023 12:45:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189521 From: Niko Mauno Add the missing conventional space characters around bitbake variable assignment operators. Also fix a typo on a comment line. Signed-off-by: Niko Mauno --- meta/classes-global/package_rpm.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 992446a033..402fa5c4e8 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -8,12 +8,12 @@ inherit package IMAGE_PKGTYPE ?= "rpm" -RPM="rpm" -RPMBUILD="rpmbuild" +RPM = "rpm" +RPMBUILD = "rpmbuild" PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms" -# Maintaining the perfile dependencies has singificant overhead when writing the +# Maintaining the perfile dependencies has significant overhead when writing the # packages. When set, this value merges them for efficiency. MERGEPERFILEDEPS = "1" From patchwork Fri Oct 20 12:44:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 32649 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 55038CDB474 for ; Fri, 20 Oct 2023 12:45:48 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.80]) by mx.groups.io with SMTP id smtpd.web10.53236.1697805944544979644 for ; Fri, 20 Oct 2023 05:45:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=GC3VNUWh; spf=permerror, err=parse error for token &{10 18 spf.protection.outlook.com}: limit exceeded (domain: vaisala.com, ip: 40.107.8.80, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DE7HEe8Acg/T6eXyrYbkXcBy2bQpIoNAr7hq+RoWMeiawySkY850bZcxcRiWWki3w/ualqmbhjvsvxW0Cx3tIRD6xeDMzTgDA6nd2z8x1HvBR0gCc1OuGwRmNlI4/LaVIF45HeKVJ9kdEPqLfCNWqBz2IS9NzEFimcnjCOhqRgYDFO53utGt2sDXDJpx3WMz7pwhwgZOv8MKHfYNJc6tobyz5/gXYMFOWavxGNBVglzoff/yLPznYRCP+eGOwmbOUYEVazPDKflONEb1c1EIWWrA6yXVDEFDd9IMGWjJygXO4GBKXSbYPwRYJzj0J10K7iOp/uxizB7iakcu/miLzw== 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=QJByWmyqH8jRsXIaeY07l1jELxY6HwQcX36wiF0XwfM=; b=jQ50Hq9uMaSzJieiKxspRPKcAffWdT2W45evv6Fz+HW2dQICDDJDq4k/uFiIXV0WWWri7CMPbw0UUICQDnuQbu4Gr9aj8W+5gbyE3qOz++ug6sAoBoVGUwziKYbVX4LDW3g3MoUoqvSDK2563AmEFokGGlfkqj+NK0uqY9J0YzAIVD0FBVHm6aKhc+h0UEAPMaEBNdHfQ4HU2fH55cQW3DTP2fbeC92l3ZIXH+3ZW+KN8EkJ1AjaHc4nDRq8SReL1hNOd4G7Mfeomeai5NODbILFe7B96C0aDprmpDelgmMa5ULGI2OeGbTYpdUJppMfH4FWfpVE03t8YLnMFbnoSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QJByWmyqH8jRsXIaeY07l1jELxY6HwQcX36wiF0XwfM=; b=GC3VNUWhcF7RcfyiZrxxIX0nl9PRSDGkUBehIfmfGizFTfOC6OyTYRnC3KcNhNwq8la4IIJnOOaook1lvxcx9YOzTI1x5IdnUxjU8Eiw9TGVOulOjHu243WR5p2kHIEwPDZ+LcZxBpM5cox2goCrPumK9AtFNGTAQP5qq9WAveUdBq4F2TubV7+4qMY5apkYESCqn3ykL2RVTCcR/vUacKlXBFRqyQOEqxiDkXN15MdbxHrEV1kiIoROtigSWG40fxOU7K+1D5pxMQNk8Y5/fmnO2skXsj30InC63eZV3rXpB99SV7Vr5xtFwLlE+MyJJPm0SDQFfxcyX7JQn5Y6pw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by DB9PR06MB7515.eurprd06.prod.outlook.com (2603:10a6:10:260::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.23; Fri, 20 Oct 2023 12:45:42 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::cf3a:acd1:fc53:af3c]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::cf3a:acd1:fc53:af3c%5]) with mapi id 15.20.6907.021; Fri, 20 Oct 2023 12:45:42 +0000 From: niko.mauno@vaisala.com To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCH 3/4] package_rpm.bbclass: Remove unused definitions Date: Fri, 20 Oct 2023 12:44:49 +0000 Message-ID: <20231020124450.9736-3-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231020124450.9736-1-niko.mauno@vaisala.com> References: <20231020124450.9736-1-niko.mauno@vaisala.com> X-ClientProxiedBy: AS4P192CA0033.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:658::27) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|DB9PR06MB7515:EE_ X-MS-Office365-Filtering-Correlation-Id: ada6edf2-1546-4fb7-1c56-08dbd16a786a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Szs/raE5duIfEJdng+bhmuEfslmRAZqI/jm/ttrRdX5uSVEW2MxzxG2xpess4ceIz3mlgniz6UaKJyfjpdHREN1NAkgrw9lfOtdHg/kW7eVoNccLAHA5QArWjkldCWH4V9PKOzHWjtg16LdEzD7Sr4ZaAw5cVr0U60rhxwTNHtwyT6+8LsMNIh4LSIAO41J9fdTxRxyFH4bPc5IYhj7zCBitfrC2nAsQR9ci5rVVGThENYVQPAtFJT3S6dZhLMiMBPHYDeIaKF5B/NUhs42McuCpai2Y4rW4XA4cSGggu4N0YUM1PsFqW9dCx8kps4y4Vae3KSxWn+RD9LGtp1okkpKGQxlu793QcDQOnDiwNjkbViA2+EOKsRjXDorsHb9VOTjaT5iqfjwGZEw+N9ErKcADqTXDvz/DnZDPAEhKKdUFZAaAMm+KSbJQgRQPeuoaNuWRyCZepnRfsBIT/37Vmq7tOv5d4PnfoKuljEyvsLsVXYB6wCsZmLj8U44eXYhsgtT4MVFGu5xcoyD/+52fVzDehMnXfvLQuKUOoHpZ+Ajit/UOmL7TZApwgTOSSHFD0/XXp7B5+DMkBwCWG9dhLssH8F6LK0Vw5CBao5rQqnZqvNivBBlyHb92v5k+/4mB X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(396003)(346002)(136003)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(41300700001)(83380400001)(38100700002)(107886003)(9686003)(6512007)(2616005)(36756003)(1076003)(2906002)(5660300002)(6916009)(66476007)(86362001)(8936002)(66946007)(8676002)(4326008)(66556008)(316002)(478600001)(52116002)(6506007)(6486002)(26005)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H/Tbek2asVAiWMMYdVPZ2i43unxznChIj8BiYgC0FZbLW+lTfI22F4xTThXJqpcVfl/av7mo2hzV95WBi9JDiFPBZZ/EJo7+Kswfv6sZLWq8Ihe+wDSgcMZCiHCoG3cCHWHii6ANODtoPqctFbCevBrL/+9VXRt4LJ5ImsQ3KXOf8iqhTpvJdEed2A+qF7LVhSWBWt5rMl6jHW9PSyCzeFbeNeFD5oAnnn1j14vZfCkgb828BHOxR3gCTa0g5oNzt56HoIdtIQPNx2g8fOLg4OXNXdyLzTaeiAqC1XwQthE9jBCYBsvZyIEs38PA44R8bbRNeqx7TnJtDkdM2OL75Ao2a1cV+PJwFF9ULcEaHJDNdZZzmXmMVamstjF7sZHJo8HcR84rV4Xo37pTnifZjR6VMGmOVX5DiuxEGuUB9tWX8Nw43UX1eDq1joiIEUqpp6C8PVKjaX+zElhDEuI1uUObYSqzMO4tISOrMxUwhMiiv31+kLmC+UCmdzoBcRhXm9YBbvpZtHh9rpDdGWTx2dYv2qLBjDE3baQ/tnRI6cu5tRBsvfi0fb3SsC/MOymweZLsc2qIY82OJOrj4JAehI9J3fCn2YmtCBmGnTGO+u36rPog+/SJ/gXFa98rT+lkyehQA8t2NFIQM0yKFeIgF7atf1VNy1jOKzoMu1o5JHWz1J1cQyvabQjc8FJ87CCSOJJ1338U8ryAv9/tPLGCkXv+s58Bzbzrkk9ayyJQ7L9Y/2rD/B7e7fiTBGh3qTu+nXDxkkETSWABuEq67lSnKY6Y8czXYnxSvwVYVPz45j+bqmn+i2ZTcivnWdnBsN+ZALuEfARWO6NuRkmGrJQrRTMYMItx3ex3YR48RM7QJqoudjbJqF0k0KEqC1vdmogdfoR8gjr+A3Q15plFAjRj6JBtxR58tMh6scTUG+1QN/BzDGoe/1PK15spviXy4mnBf5t6OH68fAG76USg8UZC6C+e5iCU4Wtq2jsHgi0Psezcfbml1SRcoLMdG3TxYc88GyEuknG74+wakvH0hYk5HMZyC5krtgvKGD/GlpYNWnD7kLb8QTFVwKHNNUYTBLkLyZcvp5ku/oYfk+HCxIMb6+JRDetOz1DLMhLCmb4qWn23J98xytUKUgAmj9/cmVl95VOR/Ml63u1uReREncFESXxMZYFuzUpywOvoRQYlodT14epz7nPorR10icjPKITC3Y1xras/0EiA5EXT+eu7kEkWX+06hdabIlgCUlnkgZUPk8vWnB2N2uNsO+AJvvfZpZE5f5P8Ixk6Im9eP/LggTCNoPu8zUbqVL7fBoM5H/b6C1X+FB5ix2rVppn7/PAfjcWTndKaugtzlcU9nknxxagJvLkqigWhg2vrez5WP8/Z2Mbr2moThCSfq+QXK2saUv4PzCRueXJ/6Mb+qo4KgYBjsehEXRldpTla3VDKD/0+vuJf1kMKxgxvXMW0uaYXcZTbbKly3hHd5Nf9bnJ2/NSj+kNxehI2oi2UNvl88UwWJSFhM1mq7yPRfSMBY3uo+MH238VUwlhUdBH0MSECmb8cABt+pb2Xwjt23Q88uk4GpMJIVoV65PYUx7UdlxkpdX7zSvlxjLiWItQwoNkzyg== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: ada6edf2-1546-4fb7-1c56-08dbd16a786a X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 12:45:42.2188 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gKx3dQxKeYOHJyTqjoJVHL/84DwJ5wV2lY1vQT1JD1DGV/zR1ZpOgzW9dao8UZiggTm+ptYeUkqrKftbjW4/3Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR06MB7515 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 ; Fri, 20 Oct 2023 12:45:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189522 From: Niko Mauno Some local variables defined in do_package_rpm() are not referenced, so remove such dead code lines. Signed-off-by: Niko Mauno --- meta/classes-global/package_rpm.bbclass | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 402fa5c4e8..246106ea4f 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -633,7 +633,6 @@ python do_package_rpm () { workdir = d.getVar('WORKDIR') tmpdir = d.getVar('TMPDIR') pkgd = d.getVar('PKGD') - pkgdest = d.getVar('PKGDEST') if not workdir or not pkgd or not tmpdir: bb.error("Variables incorrectly set, unable to package") return @@ -660,8 +659,6 @@ python do_package_rpm () { # Setup the rpmbuild arguments... rpmbuild = d.getVar('RPMBUILD') - targetsys = d.getVar('TARGET_SYS') - targetvendor = d.getVar('HOST_VENDOR') # Too many places in dnf stack assume that arch-independent packages are "noarch". # Let's not fight against this. @@ -669,7 +666,6 @@ python do_package_rpm () { if package_arch == "all": package_arch = "noarch" - sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_") d.setVar('PACKAGE_ARCH_EXTEND', package_arch) pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}') d.setVar('RPM_PKGWRITEDIR', pkgwritedir) From patchwork Fri Oct 20 12:44:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 32650 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 5824AC0032E for ; Fri, 20 Oct 2023 12:45:58 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.40]) by mx.groups.io with SMTP id smtpd.web10.53239.1697805955384323293 for ; Fri, 20 Oct 2023 05:45:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=NHn1WSeW; spf=permerror, err=parse error for token &{10 18 spf.protection.outlook.com}: limit exceeded (domain: vaisala.com, ip: 40.107.8.40, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EIdWNSOKGxBFkLnvEc1UjAC4cgQg/EYz0MNPk3bVenDf6bXQ2NKkLRMTaekaMiEc/TvaBrRuipvMQfQ9sKxf1Yl15x+CUefhhwYaezvxeb06H0UACAxgtqai9QZAiCv6GX6hF3+NWR6AqtAJ0pn6V69g5TXTZdfUn6jOOzPs64ath/85hnWZsy6oPDmOIqR5TmCGGhtm0kjyPvLJp5bGJ+paCqQ3K78d0ZeGBkfxJS2fYV21oFOacQWSJU6WhdQIg3UFtRQBqScUKakNABCjiFd0F5rqJn4ZDSayFMWqEqLAjSE7hFG9XdOkRt2hqcqizfMs1bJ+QW8pp80Pk5LMgw== 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=8HfaFG1HZbfu/xXcgVfe+Lj2DrxJoDIOB+IIqgOK968=; b=UIvyO6PKjmE8vvziEyxbjtidwHWwwHIbbDYppvGs0bkHb5DUohigFUvdtdnx7ic0HdgLsdZpN0i0Q4tsjoq3/p6WpOHuPjNpiEmPQVDTGJAS9MEoWyt7Z22LmUkzeKIVH4JG/UpEehfNGUTvCQwa2JQAXFQrkor+K3/o3ByCVKoCJvDQJYxfAqc2FHlhoktb+RT1+hqGIE9PogXs6L2fwJ+zHAaR2mAk96MyCiZC6jDcPtVFRwPRxfl7uD5dLDPjfOxQad33rv0tlftzIhlmJYfoUk3iC/8nce2su2zB5vrsknevYOT/KGf9CBJ427pqqjAFUgJ2w6jJN/b+b1HVqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8HfaFG1HZbfu/xXcgVfe+Lj2DrxJoDIOB+IIqgOK968=; b=NHn1WSeWTDq+ql8MogIJlQNgIi3kcvbxJChaE1/QVZcCPEzHo4qtfHzumsz1JMGf1N1YnDcso5qLNn2kCmx+MFw24uMYfjbnvMWuy/a+NWEnN1gI5wYZSAfqi1tocWYS4G7QjRlBbmRL1o0zT6l5725d9hQ1tDhsDAqkP6+aswjuU796kUVyOV78WTjPwh3d2CueKnVItoYJjqMhRRfQQGs0OtDg0Fq9TLHqsoEeMbGzNfr9dzJA6NOYQFL4rKeOid8JZpNQf5ZPPCBS1zTrsmfxClNR8e+lnlRFkwX22WjMy7mxqWda1d+/jUTDOP3ZOBewMGrw9vuKjTBGpTK4vQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by DB9PR06MB7515.eurprd06.prod.outlook.com (2603:10a6:10:260::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.23; Fri, 20 Oct 2023 12:45:52 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::cf3a:acd1:fc53:af3c]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::cf3a:acd1:fc53:af3c%5]) with mapi id 15.20.6907.021; Fri, 20 Oct 2023 12:45:52 +0000 From: niko.mauno@vaisala.com To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCH 4/4] package_rpm.bbclass: Support compression override Date: Fri, 20 Oct 2023 12:44:50 +0000 Message-ID: <20231020124450.9736-4-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231020124450.9736-1-niko.mauno@vaisala.com> References: <20231020124450.9736-1-niko.mauno@vaisala.com> X-ClientProxiedBy: AS4P192CA0033.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:658::27) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|DB9PR06MB7515:EE_ X-MS-Office365-Filtering-Correlation-Id: 779ea407-d61d-41ce-186e-08dbd16a7e73 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0SLAEA8Gnmq48H6T0Yn6ytU3asR3nFrE0tJBQFLqf81SJiSUvGtcQijHoe+HnWGNJpHRwsi69ECbC6a42lRFHe7zbqjcedKEmwkJbhCwyu/fj9u30OqDWASO7RlPu50oPj58NFE0kBayoqW+254nHYxrMomJtzH86wlypeIDgGfFpqD99G56T4Tym6Tlb88DaE5XzIMHNuW28UZ8WtfQcNBIc+lDTmAlhdFaAj1fkJq2jP1JRzIj51t1B/9oifjiEw6RkvdIiWnOocSqiVOXLcxT8EzpoXck5nH1I/ej6JaZZsCkXfdGJahWm8bdNYWv8qh2uRQOzhZZrbGg/Ubb0tPZl99O5/qxhZTxJGONNFd3Y0l+s0VcBq5z43tmgv6GJ36Av5j9rWF7/3c8F84h2znE8qQeY+frqy34DV7jT8Bz7meGZvHEpWQe9s2CFfTkgbIM4fJJ7bYTFb+cREQNlZaKa9SrKag5+UhNxxw4imya3KORbQMvQKeDTIc8ZJQ1XKIkd4LIzNdmChljCsY8nknyGmEN6MKK3XMtgnW4q/Bq2HQ5fwNhA9cnNUEGa79a3j647G6GVeiCrcXXV0ScskttP6lwD+xWwTouteQzKHSHa+PgkVdPdWJt75TwDtQm X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(396003)(346002)(136003)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(41300700001)(83380400001)(38100700002)(107886003)(9686003)(6512007)(2616005)(36756003)(1076003)(2906002)(5660300002)(6916009)(66476007)(86362001)(8936002)(66946007)(8676002)(4326008)(66556008)(316002)(478600001)(52116002)(6506007)(6486002)(26005)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MgO1ThRvEOE1jph8/YhOHPwY8PiFmyHCIdiAqkHLXYujClnP7sjNV/9+ZRR5NN9+bTwgzJP7I2m+N0C8r5jIoKo1Rv8xWScQQE+KrWNNqo4y0I++1gvP53eeeb5bIJwI/ok5piKTA7gnYwGgNqIyFjCvkyMVTwwbW5kgiBr3XPFgRAEYn/4aC6V5BtPgGwc0EFKS+WhXj/zN3d/gNf00rM3PDGbLFFljvIF0u5ceUEL8L+AEjqYqeq1rXbAb08VwxuNihmZzGC7/fh7+T4A5MHSE3hFbRIvyvn/zTI03GwrCIitbgpSVc2F2qZap356QrvHxYq0redw8/EtfhUz+vzjyrJb2g/C5W9/Fd/eH4dX3rOapXEeO7F6t+OVetyimkUsKYoSy8r4h5tGWklO4g29p9eYn73TE2X932c5uxpJt1uqTnXu8mlbO6P3mr0bnFyJxMj2Gf/7w3hrBgpFNrh2cotKaZoY1Mq7nmj0yzcx7LD12+iAnVamwIF3OWjHBWo8tCAVKFlGf+z+qB8F0GEZzusCjEqI7yymcgXieYjybMqs+Q7PznF0H8q8SnpzJ/x5DGe8IpZkuou66kjIiUsEX5lQ9uzfMfrcqWCtLdWC8KNB3mTkgHA97TD23DAkhguZYq47SzupCwgw2hJuA8Jyg2qyA4cn4c4h49w8RwAMI9cQHtIhUNkfiYooubAPFZe5OWUMlwCZga3KR5Sn24FFT/nxswsG6diplP1LrDd8O6g+dkj96kiJkYOkkfqi0wUtcXEwS4NEIlNNvsvmuB3TuSwCWxNWwDmoyzCVZVUc6MeuyLUC3+mDfN/wz5TuDqqucLucZBw1DO2+ULRKySYTdOgW5p3por3/DLW40I0EVhSk1AkB0yesQkkHv30NtuIngmxUcRQMDi58fKSrS6ZyZEKwT+gaGm1Sxc6SlG0Uch9zF3/0xW3ASvEJxpWvnPYMlZQsFui17kZmaP7W0ELykcpgxkrOO8tG12Si2xmIPNRbocYYmMh8dmVTda3LemzMuziAJfZ/riyOCdWzrCrwhP93kj6huDTzqxAevpRRKUAfc5kyt6qopGkxB+CYq2BH1zs+RqRKJd7RP+FwKOvKOzXTjS9EuH2T4kgRzAPcwfn7aZ7G0KKT4JhZnZ1jH+BeDNI9c3vDAkxAUtdDGpsd89mTMO3lXQGMTamkL/iWMMB7tLkm2NitUyeCNIXKXhi3i6QJty3IjdxN7xi7vaOCvY/qKWo6g29KeY3B5c7DaU031oQTrtPj120VcG0eMEADVZfQjH1WlvRpuAOIDwi0tUDeJWbHjlNIFeCkaeymc+A+Ub4s7rA3G+jYhhZstRVlOJzQU355Z/e/9mPcO6UJLwvEtSoEEBWNeNrgAX2zxAevSdIViMK8L6O7chjQMVdyePdJZRoR8HvaQ6Ydz5NKj9XqGw2jPKJbUx5k8NVj5p0d3MORasbcPNvWp/8B/P9LgnLkUlfXpP7X4DWSDbYH1HWVGxOwYBlp12y1OsuZv2J/f4WnVGLMEEfrrwebpHhGlEeh96tpOAKcrSayBqCrKmyi6nC1kTtFCcMYa8QMjaRcQYEZ7CIOrd1t9ORym7FwDgxW19VPgPyUiKKx5Wg== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 779ea407-d61d-41ce-186e-08dbd16a7e73 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 12:45:52.2611 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: h1pZDklHjDGrDB1uTbmK7LvbjULPtqyLOD1pfuVkuRC7XePNfaYhExOXgvfWFkFGEFepxZwH9M5DrMjKWLrfuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR06MB7515 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 ; Fri, 20 Oct 2023 12:45:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189523 From: Niko Mauno Commit 4a4d5f78a6962dda5f63e9891825c80a8a87bf66 ("package_rpm: use zstd instead of xz") changed the rpm package compressor from 'xz' to 'zstd' which results in decompression failure with BusyBox-provided 'rpm2cpio' applet and 'rpm' applet when given the '-i' (Install package) option: rpm2cpio: no gzip/bzip2/xz magic In order to maintain compatibility with BusyBox introduce new variable which can be overridden like: RPM_COMPRESSION = "xz" to enable rpm decompression without including the full rpm package in the resulting root filesystem. Signed-off-by: Niko Mauno --- meta/classes-global/package_rpm.bbclass | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 246106ea4f..da25b7682c 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -13,6 +13,9 @@ RPMBUILD = "rpmbuild" PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms" +# Override variable to use alternative 'xz' or 'none' compression +RPM_COMPRESSION ?= "zstd" + # Maintaining the perfile dependencies has significant overhead when writing the # packages. When set, this value merges them for efficiency. MERGEPERFILEDEPS = "1" @@ -659,6 +662,7 @@ python do_package_rpm () { # Setup the rpmbuild arguments... rpmbuild = d.getVar('RPMBUILD') + rpmcomp = d.getVar('RPM_COMPRESSION') # Too many places in dnf stack assume that arch-independent packages are "noarch". # Let's not fight against this. @@ -682,8 +686,16 @@ python do_package_rpm () { cmd = cmd + " --define '_use_internal_dependency_generator 0'" cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" cmd = cmd + " --define '_build_id_links none'" - cmd = cmd + " --define '_binary_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS")) - cmd = cmd + " --define '_source_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS")) + if rpmcomp == "zstd": + cmd = cmd + " --define '_binary_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS")) + cmd = cmd + " --define '_source_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS")) + elif rpmcomp == 'xz': + cmd = cmd + " --define '_binary_payload w6T%d.xzdio'" % int(d.getVar("XZ_THREADS")) + cmd = cmd + " --define '_source_payload w6T%d.xzdio'" % int(d.getVar("XZ_THREADS")) + elif rpmcomp == 'none': + pass + else: + bb.fatal('unsupported rpm compression method: "%s"' % rpmcomp) cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'" cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" cmd = cmd + " --define '_buildhost reproducible'"