From patchwork Sat Oct 21 15:51:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 32715 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 C4E36C07545 for ; Sat, 21 Oct 2023 15:51:47 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.60]) by mx.groups.io with SMTP id smtpd.web11.81900.1697903498558281721 for ; Sat, 21 Oct 2023 08:51:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=cjIkhOUC; spf=permerror, err=parse error for token &{10 18 spf.protection.outlook.com}: limit exceeded (domain: vaisala.com, ip: 40.107.247.60, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fhlLkcZ0WiMgtt1gCT7owKCcEVeaOo5EQul2epwyimXgQprzkoYKhPvOKcZ6qm0UDmfNoQgQDy+gax/xv0xK/24QXNAPyWX0sDA6QctfB06I11hI7EyD/wTlM6JtjKjKy5eOibs5WzUEJJIzRUoX4A+1zDYYqEInfoYH5XsXwilDbO9nlgEh/UZOXRu7v1Ccpvilgtaj3PoECr0wKAmVugSBA5v9k5uUoBdCvo1m/1qf0vLed6KQrT34mABpbymevuBLgyNtXA53ZK2xkumJRWsT/lTghRXZSyvuS+f7L5lR9THlqEsI4fZKLSWKrbyuxTrR6qaliNsm27N7v5nJCA== 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=jwxy3N90wtZJYXrbvkbhH+y1k5y5xmb563fEYRyFkv8hZtBfR+uHMjTt55ZEXGQicx3kg64+0Txzi2wMg/MfsbUcN8G6gZ7osRLLQ61KLUDciMnL6zyRi9uywICfs+W203ChW0m4MTmGC+QkiRXvlslafTqs9OJgHzyGTplPmgxgWIbwyz9I+9vShvqEgYcr5vCBVeOlQI9TBJdu5gpGEPsO6nIduyVLtG7mAHbGLmpAPYv7b59raf4C3D1ot+MnDgZaHG+l5Afy4ROCfiGb0D9MtmjsO1gqUNvakQCJsbv2TrQWXPGRFFg1XKI8cWq8heOWutBoXurhSWwiUgtv5A== 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=cjIkhOUC5057Lg34U6N+pxxpOK4NQ29MurMUGYAkB9dFSjYT1nmON0X8SkIbxINlw8+eRsfPvlxMOHttSgz7vYGbCEWAEmMnuIwsN+EFU+eU/4CVeUXeowt1OSlfaLrj0XYHHkgqdbkWxYS72xiDeU/SFlgje2STxHwMMDZF8EKUYKOHJK+KBTw++MpqHU9U6pifv4QUULCQdrxk3BYU72J2ia+NdG1eWMu/jLEkPMUfQ8zN34fxwerIq+0feMgaSfBJFYiFE4f0gEk5L3cC6jfWL/GksqhYJo4gNW4KLgjChWVCFeAF2xyyImwSq03gE4fbEi5X26pADW4n0zv4Tg== 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 PR3PR06MB6892.eurprd06.prod.outlook.com (2603:10a6:102:8a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sat, 21 Oct 2023 15:51:35 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::746a:49b5:ef81:9ff9]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::746a:49b5:ef81:9ff9%4]) with mapi id 15.20.6907.025; Sat, 21 Oct 2023 15:51:35 +0000 From: niko.mauno@vaisala.com To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCHv2 1/4] package_rpm.bbclass: Fix some pycodestyle issues Date: Sat, 21 Oct 2023 15:51:11 +0000 Message-ID: <20231021155114.3979864-1-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.2 X-ClientProxiedBy: GVX0EPF000013D2.SWEP280.PROD.OUTLOOK.COM (2603:10a6:144:1::f) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|PR3PR06MB6892:EE_ X-MS-Office365-Filtering-Correlation-Id: ad7c1247-f065-49e9-50d8-08dbd24d9a97 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1egr1nzouiIIZzK8xKbhZp/HbRzQP0xkgcV1oyWDFkyvNoE9+WGU/OxoTYjpv0SOdIUgE6JLIKIffvGHzJzFir6uiO3kpozNcznDJaUQ0pWAxd/t0Hlahusykxhay0H4OJFeRN1cbnQ75NU28o03+jdNqkLfyuXbvp4/sE6peLoduvn7lSH9sQNk9ffp1VIhliVEWcU+dsImWbzdiOZQ87OJGVZTaFAru0tW8EZVaZUfJ0q4beW+DdqBc8kWY/jnrmSOR3bhQXsilGW+4wCvkfKs+evAAIMvi0OEO8G5s7mMFy+hFtJ/k49bAad0QfgFpbO11+agT3g156dHuGu2ITCdl/u1CNCk6n2hskDkcfGOVo/T3qcKqYAOr4kYZb8BueMNgs5fTtAKiMi4/Y+9TkpetTWM7PGAceuAkVDVM6oW0fAXv3UCKzDglKZlZMBM+UgLaPYrTLV1OX8l2idwYbr/6JMBcd8hk/KzjlE3REkKfXhVF/TWPQ1UX8mryt5cmfLvD+KkyKuHM/n7TrB6LusY/ln15KfyZFeU7SMqWmQrsrQjLjJ2MNRZGQLvvFK8QAAC+kXwhW/PmZty/pvezwj2SlHcX1A3Y1WyEpKiDTu1t+EYe6Uh9jDDZ8rUsDb5 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)(366004)(136003)(396003)(39850400004)(346002)(376002)(230922051799003)(186009)(64100799003)(1800799009)(451199024)(1076003)(107886003)(9686003)(6506007)(6666004)(6512007)(52116002)(26005)(2616005)(83380400001)(8936002)(41300700001)(5660300002)(8676002)(4326008)(2906002)(478600001)(6486002)(66946007)(6916009)(66556008)(316002)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: w2J5OlVA8bmyHJm5K0KnMnyd1rvYA8kf8Ge98gn3iYGHAn68Kx8O5TMlqOi4JkAE1/J4aBVZjErwAgy4PHgX+2l/kYF8nTR2S2r3hhd4pSIRkXOUI6nBrSm3BIzVCiObf1WPhDdfA1GDKKOEkYn90t7giJ/5aMfoEPJOQV28zmVdiOau3xEtMyEab/5zpId2IE0ZO60IyzfC8dDY8ywQdTrBzPePSiSoTDA4T6/Baa0/H91LTE0iB3Eq23W8AEOHOWMNT5IWVKoRLCgnOUVpsjpoegOOO1NpsUEOXiN0HGhZP8xIHnWg2M2/nbKkAe9LbTrTKLtwmOYuBvhl2CnFrrJXqA6vt0Y3UGOqtIyGUfHWmd9VG0PcMkhlfvQ7aYAftX7lJKkZ2rxebKVjAnLr5HI+vi7cg6GbGClyM0BuOxZ07SH3REr915Ni+3qisFNCkGlKdXa+t6XSXA1UaGLQxlQkZOkmHIulwpVAHdzJFj0cbkrg+Y1iSFmUZc4lGh/+GNvFjGQzj7i+Lh6Crj86UH+zr51XI2ZXw5p6Fv1COox5wnInvYwvET6govY/XzCeDA6TeSUf/cI8sqK71VUFePjSDNWb5IJ97amIiehuTsLXlWWU0DRnaxz2cIkR+VA/eo51ozsopH3qWxNLcJPikDHiyY7hldW/c3nNDd6njy+N6AKdy3pFdG4F2BNw+4QrYBKc6Mro3dXyudBkDKLwWCGD87LmTLbjWqPGutblpyOLt3tQTJaECvCXgbFPZHFiZYlaVftiZve0Nb/9PJEX/52FAURD71GWyyJr36J5wsdaol3Ht0ZP/Y+PAvraScJqmJthyEH1iIRjC+XQsmc82nokmO344mVMsmfKOJiGWWQRYPsk4CoP6y96G+u6zdQaPVo0+7VLPZ2VLoKGfg3CY9HJPd4TV3cWZvxRl9eneKZp0cQdjWOE7H+thgW5GQZXtsk6eBNyrBCVvhy3ZOOAzCyc6EoiiKyrAA0gOSh5fM1FLSEyYLscd/sO2hPR0+iQ38ZAHhsmE0zzaXJGN5fQe/Y3Ipi33FT4PQyZiDvBW1X1rmEmnV7+LhsAy+t6zJNDWPq4X6sYtLvrnY8CKhstPZ3E7H3YJ4Q1bl8G5lMHeOdSNLS9qZuJSERifpwIGnyQqQUn1Ufzix9ksT+PWX78/bOdpdnoldb+GHZHRhjxkrvDetGvQchNRBWbINqSjlnMkrS5yxShJBieO2RQzfFXxoM9n3MpIUQeHlx4BMTfPk78s6B50fPuDbbrQlS/dBs/EzN1NSnxL9g/4OZUJmwO/3s61OllVGmn2BnMamYIJSksff/LPNCkz778UcLGqtb6iT8LA49ZpvAR95Mx5A0+7Q1A9cT5F9v8OkHUP5p7hEmYXfChL4sPA3x/7qjTE76wqOfQEV78uDE5JWpfDodCkpA5KfMNow0uWi6li+ByGqSnVjtROv2MMgXv7H330RLELPkgrp5r+uYCQG7/UpBLyLAAyK+vk6cEzCkZz5r/c4Zhrvbbtjszjm0cslCzCwLVCU/3y8/eYLvINcDEItNtbVut2rq37GNxvVAUm69CDoBLSwEQ8TwVe9Zk4aMkrXo8yS+RRNOkHJRN754FtZMKIQ== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad7c1247-f065-49e9-50d8-08dbd24d9a97 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2023 15:51:35.2705 (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: J44PRYy1cKFOdNtQfwAifaMJn1l5t6p5MGDXo873vYNnvsJGiTBbjOx1wNalXMhVFM5M94dOdZwsl3XaCmubEQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR06MB6892 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 ; Sat, 21 Oct 2023 15:51:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189594 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 Sat Oct 21 15:51:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 32714 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 B7CF5C004C0 for ; Sat, 21 Oct 2023 15:51:47 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.57]) by mx.groups.io with SMTP id smtpd.web10.81789.1697903506353010548 for ; Sat, 21 Oct 2023 08:51:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=WTFlAWuy; spf=permerror, err=parse error for token &{10 18 spf.protection.outlook.com}: limit exceeded (domain: vaisala.com, ip: 40.107.247.57, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iLFpF8SIez9YSdarE2FJOSyC1xdQjQ9bBL1Z59BWw/7C2nWDjKaSm0J8gNzELIlMClPnZpQlZHSZTWzsAwENMgZb2TzMTmqEBjWGbSSCVPLohjhfk65Qs905fEdGdVVNETfeDEz+z1sp/53YCUunYTq4PJr69fNPRMbQRnE5IKn2TFXkYPgFMsKY/zcFopQfHSsaT+K7hNGNjAMUmSer4aa5Bh6N7VAlFBXw4dG+BmMWcs11bp6EQJ0DdS0pDHmAPnGyRKc29PZ1q0DbwFfGaG2p5FgLH404z4/yL/grUgMObg2t+yvRDqqN7seShZRo/RG1gaZOXRPSGf/0sroyvw== 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=Glj4rdgrgFYhvAZF4ao6+cm7or6RVHglGQn8+46ghX/DtFtH8Yey2IO0PqVmtoeTGAd5c0Z5DenMvZUDvCGCX/RRumOy/kQJX0ETPIHORPVzmsedYxpWnvn3PRDS6d65HHDrsZB/PIn+Mut21Ohmz/oYgkwzPHnFLyDfzKajnfOks4GFHIo7GZj69LPNcnxTDU7DRHNtQJ7FF33HoO0QHab+ED7M7qlVlwE7aw2KQx8346t6Rviut3Zbpj/6mrx0wRbllZwpFauEclmcKWHGrJrnezfjS6400jWAvX3Jj7fQM7oB8quG3/yTrJX4Y077tjwaXoVm4oiYakLpLUAYBg== 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=WTFlAWuywLAQKmO25FcgpatHk8fUt9jCBGuGeKELcRczvCtrMTohk7yWHISq6gwshJznRACcM7dAp5bBsra882XZfIq81GMONjtW2YNoQWpzfGvhzCQ0Yt1bjpsFCjQ4is3dsNlw4GbItDwr6v7dmZebR5Wsg6xR/ONiqIwqpS0NTH5Tm6qLGWkq2bCzdywynnwgKXUQJaWVaug99A7AlvmHVsR5g06mP0INNY8pLFg88s0ZXK98sgEhSGW1A2DwAbtvkI2E7WTfkJ+yLwjKByoBfBM2XFqiyxNFWybOCHziTDr5XfHOSaStzVe12cTVI3DKP2y7Srx+BCVDuV2wUg== 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 PR3PR06MB6892.eurprd06.prod.outlook.com (2603:10a6:102:8a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sat, 21 Oct 2023 15:51:44 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::746a:49b5:ef81:9ff9]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::746a:49b5:ef81:9ff9%4]) with mapi id 15.20.6907.025; Sat, 21 Oct 2023 15:51:44 +0000 From: niko.mauno@vaisala.com To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCHv2 2/4] package_rpm.bbclass: Minor cosmetic and style fixes Date: Sat, 21 Oct 2023 15:51:12 +0000 Message-ID: <20231021155114.3979864-2-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231021155114.3979864-1-niko.mauno@vaisala.com> References: <20231021155114.3979864-1-niko.mauno@vaisala.com> X-ClientProxiedBy: GVX0EPF000013D2.SWEP280.PROD.OUTLOOK.COM (2603:10a6:144:1::f) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|PR3PR06MB6892:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b5476a0-63d5-410b-e61d-08dbd24da00e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dP7OzlMGKDPL+veKtkdEvmIrDCfDrno3da4yHS6AJczASaiH3SdV5lmJqR0zeIp/gr1vKsTdQ5NQFFHJzLxQPMqy7986ZYvui3rCiPCeJNsu57g2s7ISLNllQ+CwRl1QriJ9eESDLi8tCZtq+G5Zl5ZrKfy6l3sT9Swjravwx7KpeVyv55FRd93i0x9ej5KtbHCoY0Fjlw2KXjE2VjRtyCTAM4W63kHTlgCOLG3IRjdjpHDZDrnR5o+b6E7O2YDLl5xp/AXtWxAi703vsXESzjKdABWPvEfz37Q13KJXm5yd5sNYoDkpC2Z+vnhgG/8TXe3jbD0y8ILtiPHeUo+C37FqOmpUay8QUch1QnISySJ4eSfG6KYuc0Y796b4wPdWGjKqOoVc92swM0tZVEYynaY/pM6pdLWv+GhoTVlGRSSPmsgPAUwqwHbTLLVinQIzm0yFZtp9vz1OS0S9MYRXLtN6jLojqa4QDzci3mfbNX9dwCqlvRuXmMq6FHOvLeDN7qyUJmdlwc46z4Lg8ZmPEE6gi15BydKVhUAOqImI6hqEtY/FyDXaAeo4EdJShsS97vmqt4X/HPTgmesugP3g+t/VyZ/vH7A4JmYXvWDNZ1FDrhSfuIZg7QIRltuNsz5J 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)(366004)(136003)(396003)(39850400004)(346002)(376002)(230922051799003)(186009)(64100799003)(1800799009)(451199024)(1076003)(107886003)(9686003)(6506007)(6666004)(6512007)(52116002)(26005)(2616005)(83380400001)(8936002)(41300700001)(5660300002)(8676002)(4326008)(4744005)(2906002)(478600001)(6486002)(66946007)(6916009)(66556008)(316002)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NsOV5S3YkeBTRQnQ/QQV9plOKeHqRc0APFEBtA66cgQA6SXAT3WR9yiBHbpLy1Zzuk+AFZcAKYTgoLobEk0Du+83iMB5gmPtWpFOar5eUOBriCcMdW+x2bUdfqdEL1lSBqrOL8fBChAxwhAT2caaNg+m4LaAKZNheGw7TLl2gyzWyvTjZkUFvC3LHkccZgiiwPKxrFypmxf/MBi9qXFtE/P9erS00MaUqgpO0kXwvmTmnr+yCjg0feZ1QT1JY1fxPO5ix0SQVY+yblwnKQXPDWHT8/4MeHu7IgGZItdyWOsR8b8r+6J+f++eI/Cd/rg6gGnwwRBJBNal/dTNg+1HRG3eNjOVNUjr94uHS/rNJikbfTCt3G3q745zG/XeFsaP97zoBm18aKPzai1GJ8aUcKWjPcSqnvcAxUlG0J545mGCnZKQj1NsKRt12BSIPg5PrQw8/kxJ7SUk18/lQdYBdh7+7bIhqy7x6SjqljuVyyDP9S0ZwkgaVRrnhrazZFg4Hv9c+gktbXzBG+YmkMdPa6YPwRS/rRmaxBcZEnGiEcoQGVexA6Zcv78FMdtQ684c5yKUJcd5kBLjnx+xpKCEromYYK1MSTkJdzv0aKNXSTY2RvBKPtwa7ZdSQqh3yvq5+ctu/TYNRzAhyUepD99z6oEp8WkPpI4CuWY6BAfe+f3dHfjtrAdFnv3wpu13EGTeGb7mzcXWl4LYgIGTfH+OvS7c5Ya3IduBezx4AB5fNUlU8iD3/NhlqwaODsnofTYg++/sbYE7AOhCXKVkc0x/JuDh7okTjHG9hg0wzA+nh2AacrhFZ/7nLKcI0f+mOWgKz61huoyFSWMP8NiNrCxS/+gxPK0/H7Qt5jNyWufjRLwbaMfjtVZ6mno0rg/cZ+idS3eOUkiiD5IPvBTRpzTSruqeA9Bky/peRkZ22g5ODvN5cLuGHhO4KM3i3XlYUKUsRNyYU8eypyT6Z5FIRs7XDEPAwJJE/+beiyIrZUx3JIql9xlRvUA2tDCV56W8qT3ktf4WwHAg4QTQw+opkYqg3/1OWdC89tTvvwCVTjsuCb+3y48XvfzlCQeOUEH3wzYSbZEg/YzinywFdsfOsYhAJchzmYf98y6mKS7Jx0LUSJwj13QsLh+VC0v7XJFaZY2soPqUPW1EshLa0dsqtMpJr/g9ZKhX18doIQvrI8VA62zWvdGBeWgrCyHdLZPk8YV+uGmAvfgG/oYbcosz02oMZr/0ZtIp4Zzcn4bf1dBofVKj5VuQsJfGNSkjfMDxMizd9+uoaVxEMxMt3e6mDdySyZwVpzvWPzPLTPPii4o4iFLU6MwO12hH3w6HnxBZqxFmgLKc+jh4G/9QtIZAhksJPn+9ra9apsOxE7aQOSFdKMJok896ppdmAP3xj3KRinG5t0f5hb+dIxNxgcIubaKixhX/1K6/aA/rhKQi6DIASYjVsElExcRkKiNTlpYSxsaGy6C1gAVTNb7lr9tb1o8r3TLsx9ed9cSnI5xgZHT4JTCUzNLRZufWfuKv+LeLB6unX+QNlaaw4TzaLt4xxP2KPqLaQbhjs0249zh0Y8gZqbWqvQp8Zx79A0RU7FVwsAGOEMbY3gGmVlsZXiKDeE4OFw== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b5476a0-63d5-410b-e61d-08dbd24da00e X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2023 15:51:44.4325 (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: 9RhsriJLJUnxh3Q4LeKhCH9aLe1VqI4DxyL6No2ffQvW6LsRoM3QT5lHQOdGA18+H66UNsdOuQ8DyC38f5k8uA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR06MB6892 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 ; Sat, 21 Oct 2023 15:51:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189595 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 Sat Oct 21 15:51:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 32716 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 A1B48C001E0 for ; Sat, 21 Oct 2023 15:51:57 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.61]) by mx.groups.io with SMTP id smtpd.web10.81792.1697903516082409865 for ; Sat, 21 Oct 2023 08:51:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=uHqvdv7w; spf=permerror, err=parse error for token &{10 18 spf.protection.outlook.com}: limit exceeded (domain: vaisala.com, ip: 40.107.247.61, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PWNam35Xae7dKsyNFyH/x8y09o7KIq+/XGhJUcDeRMiX5+xoRH4Avfw2+keVaFu6qhJG7z1m5Y1eEhCnUvLnWa/r8z2pgVnaLDEkudgwblzQdPIkTmKuaYsGBcWMDZKm58EXI7bHZr5C0aMxZRR4gxHRDyHO5m7d4XSQvAKq/T6vqWyul4JurwGGdX5CsjV0rnWTo2xyhhdfuqgILE5CDJ7YkCIMxKgvuxgrswrMpmicHiG3bunvfm0w+dny4W7Fh7t236/WaUdAnIhQLA4nbX49senR8z+ZFP+zY693BeEvHIa9Ei9x67o2TeuuY5D2ql+9/wwxfdREZCDGgW6wcw== 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=FbcMNnpDiBouqMXAyTZPhK3txK0h8IuM8+Kxd67P/G6buUPlEKprJx0GUvdeYLm+ixsz3S95alAWo36AU0thz+tLgxvHu8uIDq/BRilfVfa2rUrsbtgWk13AhckiDC2wN91/XMPuhpdyZlWCbVaYnrGopQTby5YKO1lZtIvhG84nLSRZcvjjb6tUyaEgdCK7XSzOlooTmPMfSFF78U9nIUQhCodWZd61xcdReefSVazUz4VyIRfV/CeAedK0aO6vlhuQ6fsk4OW58CsnNWDs7MP/1eA98kzJb6ZZQacmuUOjZIuReNka8NtI7nSpRTZfPnYmwlT/0mRb94gJyK5IVw== 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=uHqvdv7w+QfdezMe99s+RK7D8abIjLNfikLpyNL8ZR32OkdAQY0vd+IM5s1G0prg42mrxnhS3j5gzLMQrSsXZeVB1QY2fgtwkY/xlTqF7UeLLYDWtDfM2OOMlccVdyV2iyRyF1+erzkYjZSPSpmUoxlkIdBSQwQATKd9+RTniREw/wOxEGR1TEQFWMYPYni4lXiDcl9a1sHNDXUh5CniXBEFFSKBtY07ByeCE4wiEfa4oNVMnis0e4EfDmhuoVrUHe7ckaXIZVyhY0q8XPlFZRwH5LTB7AS6nBb9sfTgfLfHf3t/jEkJFKMKIUSYB0/y4JWP4WVHxFzcTTsxkZvWLA== 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 PR3PR06MB6892.eurprd06.prod.outlook.com (2603:10a6:102:8a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sat, 21 Oct 2023 15:51:54 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::746a:49b5:ef81:9ff9]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::746a:49b5:ef81:9ff9%4]) with mapi id 15.20.6907.025; Sat, 21 Oct 2023 15:51:54 +0000 From: niko.mauno@vaisala.com To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCHv2 3/4] package_rpm.bbclass: Remove unused definitions Date: Sat, 21 Oct 2023 15:51:13 +0000 Message-ID: <20231021155114.3979864-3-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231021155114.3979864-1-niko.mauno@vaisala.com> References: <20231021155114.3979864-1-niko.mauno@vaisala.com> X-ClientProxiedBy: GVX0EPF000013D2.SWEP280.PROD.OUTLOOK.COM (2603:10a6:144:1::f) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|PR3PR06MB6892:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f6891a3-7176-4e42-eb54-08dbd24da5d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uaPQH0jadatQ8yla9Sa4aQzVuUBR99XFmiM5w5Krf+zGNEBgkHgvTea0zqdhqbWXdswsIo4mwqfK04xAPqmKr/ju/jRWhikEOnkWiYuRg+BInKBcBY3rDEI7qr+f3AzMUnesJtTzXG2vod973HtWyd8ljcczLCs8P1P3h+b52JGVjIT4oRBH27W5q6+e5Za4Sn0YsSCID05tloEqxnlWQhswbKn1XEzsLdwnvV9/j7+Ds9oEMW7+U545/nQDvuBHm4BjA02Pb1nGqsRaGCawGepsf0o9VJT8oMWZ42M1xPA/EM3xOEgzWprPMinxow5t27QNGJlQkrxbmLdQy1yd+XP/mi7moxTRZBsQ7FI8cGMqS1Io+h/TNblBM70bl0Uux+MBdaZ2xyYBNLdIiaKVvvGAZ7x3wI8n6HIYUJyjJRRbL1UDxxZBrem9ovrMhaCsUiG8QVe6DU5s2bLF0K9/ZkMrBi/A+lgw8O3yJ527jLy2Z5t9PFMFkR+SDkCiHoY30n+cZnbKB+QQTcragbJeCxTa35aiXRuD0EKEk0yOAwgXXk3GtYri0gDOBk0QN6hoLtpVcsVQ03j8/JOsIsuL2DOG9KsPQE3ahkK6U03IOYVHm0RYvGB3BHVvel4dgQpv 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)(366004)(136003)(396003)(39850400004)(346002)(376002)(230922051799003)(186009)(64100799003)(1800799009)(451199024)(1076003)(107886003)(9686003)(6506007)(6666004)(6512007)(52116002)(26005)(2616005)(83380400001)(8936002)(41300700001)(5660300002)(8676002)(4326008)(2906002)(478600001)(6486002)(66946007)(6916009)(66556008)(316002)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: X7owSCcUaPbpdXaL0tSIvsP/fXZfT9oVJ5EcqmVWHE7zb63D3DL0ieQ7sYPNvrFIYRHt7ZWkn4uDC5r8qKe8uFNMJbsEhTEmBZXyrCPI/LMMyy7Z8urkg/WyGHZyU/N2J+jlZMA9MP6Vxsl40s7oauOTX0Oh+vPqcRArNK6eDoJ9RWD0eqI3UQRfiVxPVeiFFUd5ByM60gWKTZFJdn9zT90DgSZdMjoPaeB+CZf6k3fyLViieRFisvyVWgwS+qDG5klCz0DVi4fJrhIAJXYnSUd2v/HXNOfKfD4OIAFfqk0Z+Rnf3DnPKPj0/WRYhx5PqpbSNPtYtAGpM7VFl74N1qxCRMGClDlEiqJwvz4CGUdYZ6A7GJBT9DLYA0tkmGWdd7Wn/SaLozZjtaJ67XS1JIyiHGdEQ2Pe/7JzpKYDnBugsFnKmz6CMtHT+eUbdXL8ZsIqr5V5mOrQ4X4B2J6Wf1DXLBd9DD7I0Zu+BKHTJL6jJEA0ILY3+3BxxyKQopXeL9S0z7vIYQoTSTFB5pQV+QZjQqw1Ap+m8TjyZIc8v1Dib8hsM9/1N4z5M2kR20hhNBxt15MzZgzCFSFRvEgcIJNs60kADj9DrcbHG8TomoFSqZ1FrDxnBHIDEiLzucA70fB51b9lC8YKHpX+GuLVZs4Jejhw/0PTrc4kO1iDRwp1/ku/6XvDlpt2HY2R3MB58rH8zZVea0yyW+mCDCJyzU320PLrU2P/HE0XS5SGrHwYqneTrA4mrUI+6wRFvYs5KZPwInL6gSLwiC3TC2NFn/a12LM8LkgdFuxJrTrn5qoTURSgTOtqVijZqomMf/v9ZX/jPBHflPpYfFfpQbOg26tBo96lKK9ykyfVTL+pA5UAlBIlfDKIsP5Xihtef5s3JoyGmsd5E7w0UBTL9S8bGStVcTos85Vf/uanslL99QF81CQHJ1HM8F/pctJmorpBYJe8iZUAGi9ycFtEKQJcylja8r90lqLlGy2x/lJ8K6E0+LBnNsEkZOyTXCbloIErSLasfw6U6TJUV8YqVU9YXQMPsNXAtmqa0nu/Hll4Rdesrpyez+y6PmgY1OSx9/lK4Km4tBInakdPeOu44KYOGM6oZCFlwjcqGYNZYnUYU5oLifjERu1qDusc5OblxrwqUDly0H9+O3bQmuHSWfxQoRbKRbJ9EjcpC93RsoLiPLKsY1IJKR6nIJNb+lLvJrchpFb4eSjxIb40gU2NFTVm/WPiGtbg9SzXOzUsxASs7+2e8jfFOViuNhCtd1UNG74c/5ZRUmPdFm0lP04TuTki0HcLz3JdHdP2DUEtCRc/+7Bhop+PEe5keqcmF6jp/8T0KpNfY1dQcce2cg8WEega6QrznMk9T4etnd7blXMkKTR74JS3Xhtp903VLBkYRuz5tLO+3BDph6YW5ZEebX0OWXG7P9nRcYlJjUsWrlKD3rL4UEkRILUSX3Fm+9ch7ErQIQOHBylmVzURBIl1UkXQvRCrqeZt4gJJZNHH60AoJDk4shjV7cFOHsKyMrtEXTTv3oDfkNS4H/eK6Dy6m/zisMOSB1psWPuUKhwix5DqZtut2KrV4dtaLA5GHkJrehTIubMkofOCDxOkC5yHujSL9Q== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f6891a3-7176-4e42-eb54-08dbd24da5d9 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2023 15:51:54.1221 (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: v/oI7CWXN/u8mGUha3CwtpWC6u6aSudry7jT1a4WtgjoPNDALpKVIkXNsTgDNbYMJAhKKANHoKCyOY01l3yHkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR06MB6892 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 ; Sat, 21 Oct 2023 15:51:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189596 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 Sat Oct 21 15:51:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 32717 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 A280CC001E0 for ; Sat, 21 Oct 2023 15:52:07 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.59]) by mx.groups.io with SMTP id smtpd.web10.81799.1697903524830546583 for ; Sat, 21 Oct 2023 08:52:05 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=cVF348va; spf=permerror, err=parse error for token &{10 18 spf.protection.outlook.com}: limit exceeded (domain: vaisala.com, ip: 40.107.247.59, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jOCuPSFJQKkeWKk/ZEsifPtm8XhbsNCNg8/zQGQQv9uA5CNeoeO8Qx4X8/ZuIxnyrt88+SEnhgtnLmHcW69s++FTxd2dxTcFzbu/DTUPZq91jJ2R7vcvNXUeD4jT1/I2NiKQzWVDFMxeg3ZgGXszY7WMEp+UeKLl0r9E2icjzExX7Hv6R7WIznTqpOePLQhSryRJYETPKtpkNBXCbJqdWiPJf/Pnw85Q6WowYSYaci8ybR5NTnso/b3Yy9UJNn+tu6EoDM+TfbDtMu4pUZYMuhOHEtiNXLsft1czMqqyxDFyc+GWYKD+Eo1E0/RTA18QtMCLlsSxet+qz3yzrW7Myw== 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=Q4rRdyxXUetJjpXW/YfchKrxYJmq/37lgSdBesvFC6U=; b=kHLWXsA9kJ4hk0NbOneoZZZJZ7vA3keL+2wqa8k8OhQagO9Cjqj8HXLo0yhJPqYtUyq/bzybFXIvg2uR0QxH6+NxdFTpiS0Jmc0K6MjHrMWuSbKnQeKRy1biHvOi4hBCeCKT8SQ2kubh+Gybe0fmdiCzRH3EbranCNLFHiAtPxpCQlKleWtrUOwaZx2IUyzvWkFDwmSR9ZJX7boYbA4+2iHGiY9L7E8yq98d2mm0somchzvOrmJVfZDzaPAgGAXUArVp7V6kL8FdNydFGvJluWegeenkXYBwJuZ/cAGzIUxan81XcC5l/e7xDF+Krp6AkbbgmE7xoBATnuR/poA5Mw== 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=Q4rRdyxXUetJjpXW/YfchKrxYJmq/37lgSdBesvFC6U=; b=cVF348va2/XHR5rxsdWmnGYvnqB8lRwbMW3fccX6bcqIbTmYlO1laV+xhoIk6UB43m0NxkJw5wQBgS6ePMG0b7wPRN+LdhrWJbbbIfLoZ3IwdXBBlYHbMm6RTbSrxjIf9mEL2tcNEjtFcYxOjAVHDMC7VGehkgTm+ODOi68KRI58V8nT59y8dOVf9Cb5HbzLnUX5hSgv+BC1UlGK4hxD6FvlG8uQ9k7HLwv7qDk9wMi6I6PnjiTUuHKIoUakE/UF5oRHHM63VGikTER5303nGTlds8jCQIf2mL8VY/8WMTcsAx4fridB84CQD/cUl2fuvhA5dWySX4Ay9hxnzcxxyA== 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 PR3PR06MB6892.eurprd06.prod.outlook.com (2603:10a6:102:8a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sat, 21 Oct 2023 15:52:02 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::746a:49b5:ef81:9ff9]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::746a:49b5:ef81:9ff9%4]) with mapi id 15.20.6907.025; Sat, 21 Oct 2023 15:52:02 +0000 From: niko.mauno@vaisala.com To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCHv2 4/4] package_rpm.bbclass: Allow compression mode override Date: Sat, 21 Oct 2023 15:51:14 +0000 Message-ID: <20231021155114.3979864-4-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231021155114.3979864-1-niko.mauno@vaisala.com> References: <20231021155114.3979864-1-niko.mauno@vaisala.com> X-ClientProxiedBy: GVX0EPF000013D2.SWEP280.PROD.OUTLOOK.COM (2603:10a6:144:1::f) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|PR3PR06MB6892:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ec94cb2-fb88-460f-32ff-08dbd24dab05 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ACAgrd/jCUtfMopiuHtJHaNyK4CcTs5GXaV2UMzo9ExTPRsYnEM4iM38pRNeSQUNVe3m7tugz6MdUinWXOaECQRxxGsBKzTKerKJ+f42Nkw07IS2XnPNqyi8eDo6/GWLSsgmCPH6imX6MG4l4qlGLtajuZkwaCSUzPk88ampUKjljbRNcJfatac1qjiKxRaxLYe1VMlPZOcpmBR+13ZS8rj9KP+qwDdqk2yUggbZGDcRRwkoIFvPAiw+FeyPamVClYC62tqi4EUJ/jCSBYx/fxxgir5Wvdis0pAZcpjAolRMvNeeaAOBrGHV9AfJOmPEWvAE7UcI83DhEH1fvsWgMEHJr/R/DGoGeiCUNpSn2yqTi7LxWyPFo9nRA+uavBYWwDW+pYFoKiQez1Djn9cQAiRHndo8p3lzcKb2kbujECmp7bxHrtlOF8fq3fmoYYKdCiqqb89Ymim8E87YmmTbjDpCAtdyl/1PaAuamh0edkY4xPYvgNwwNLOcAuFoa332GFt/WhpEX9435CeXJYgywY5WG+y6gTVQzvsa/7a/cAq8a5kVCDQ1P3mf6NlVD6B/EaUG4uREr/VuFYEM2oPhAsTsvpbv0klvNvdts8AYxcL26sIB5ltZuFxzxuVthFYS 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)(366004)(136003)(396003)(39850400004)(346002)(376002)(230922051799003)(186009)(64100799003)(1800799009)(451199024)(1076003)(107886003)(9686003)(6506007)(6666004)(6512007)(52116002)(26005)(2616005)(83380400001)(8936002)(41300700001)(5660300002)(8676002)(4326008)(2906002)(478600001)(6486002)(66946007)(6916009)(66556008)(316002)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QC6U6odyaPQoTyKKGSFYZYYGCPVynXEoci6xTkAChCIYZleB6cDS/0FJf83qUH49P72tBSV6EHoQBdVq3pz04dlCXpovl8R10+tFewq3ke90f48hJLvqh417JNM4MplZPvIAIyO0jc0mfDhnlikPVjQPB4Vl2ZhbK3kduOdeQSSlySIZ3ls+ujrvQDPfN1EN59Z5vLkHFcy4t8elzdvHs8YRHbVk3EBS5kZluDna6MUSCoMkMKIHQ5zy1wUhqFxYGkUQ3mzRELKOqkv1JiMJPeV7504UNorn4R1VAgvShliaRLYSjoADbnusykQ9Cdor+iyUYtdqdz7s0ww8ovNHe7rM5RRh56hC72so4X1xmgflJDRUKyc6BwbmvRkjDTS6OpXyQrVM4jWz/xrnhHItp/j0gR+dg3typcuXnM4pm+6d3e9ztoNpZXyb2fsDB0D5pQjsr/KwmnQluHMxU2egkdfcK+hOcsbzOgRytnCHpQ9B8j1LakdHBU7Lw2wYeMb3clGuOSV0IcnrTcPUvS6gdppTRxT8qpOUgaZFiztQbgD2EGnD8ux7XJx10dLQUaUKJurhCwHVGKOHDOgGIcnu+JYfmlMemOyFzphOuDMB50ynOeooWYFzKsp/G7gW7QIMwGXGfNkTMjkj6mereU8tAb4w8+grI/u3PXAeH03rDphSg/e1Aiu3SFGuMuI10H2+KEdMOG/6bUZ1XiiowGfGEjLRRh2VmgD6QhQlMKouzJKyl56rg9lQ4fiH5MBuOQe0TXTfqnQ7Z0+YyBfD8dbF/UQAh8HjZ6lM3X55O2DBmZj8awhujOm5Au8GCc/ARGkAu2lOiEDfDrST8Ooq9qOUvQNXSCqthvZIltVp7NfoG+Wx9gnV9ivKrhJQXC6+8ub9xaz1tR7gJpK7z7dppGitEPBgFJkc+Fm8pGHeWbC5GSGIDq+cUX3TfA2hSnQdhIaXGdRTnDOf+bBntYjDLeZgOY23MePHEfV2ZpnxCQDNvrmIXJHg7zqmJ0HNARtsPYr/7S6lxU4E6sndb/hpRp4D3Gu3DuO4tzJGfmmJzwIK56FvJBxik4ev0WAZlXQXz8BzWWmz2tpv/t89t9ybfwYDaycCPC3EeHDqsf0N8IsRD4+06RYQKYJw0QeYpLfic63nIltyNvLh3TIMpjke2MCGx6a6xki1HyYXI0O8LfIYBDQozyU6FZOgiI38cVV3oa/8JEJRuZ/9XiT0pWvw/QJ7GKJk2TLVEf0BOzvZENxfkboFtejPBfDfrB+DJJHJCSI3eSQzh6r0rICrYwuY/zqzbXyFo4kZ5G7mFCfc9ltDN/jQRUDOxIew7CegO5CB1Htp8WvE/hm40lgfacWsz13myWOEvxbD9gj6juwDs45tx8FJj1KBn8yeJF2CEjBE3OygZZ3sSM6DMIzYY72OrgepyTvj4DLbkNPaX0quXX6b+JasQt92jneMnulI5JDQla4FjzehCNTTkdU+ElL5RdmyKDXSfJWoazmDHQvZNEaUuoKyVXmdN8V0EpYwe6y77LPghwd3qkKGCnnzoGQa9lXaxsAjtnWX0nZt7fgfNnj4zUF4btP3GEXj9nmTOaCMm4PZfj1Bw0Y7jOvR4oGY2a/LzA== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ec94cb2-fb88-460f-32ff-08dbd24dab05 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2023 15:52:02.8073 (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: zuAq11A9LX9pV9TBHehbbsvaudTd0Rdy9HBIXwF2eXQA/gZnWQHftZNxheT5uFBQOCufUmPqiZhmAmO8q1mQIA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR06MB6892 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 ; Sat, 21 Oct 2023 15:52:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189597 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 Introduce a variable which makes it possible to use a different compression mode, making it possible to override the default value for example like RPMBUILD_COMPMODE = "${@'w6T%d.xzdio' % int(d.getVar('XZ_THREADS'))}" 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 246106ea4f..5d35962aff 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -10,6 +10,7 @@ IMAGE_PKGTYPE ?= "rpm" RPM = "rpm" RPMBUILD = "rpmbuild" +RPMBUILD_COMPMODE ?= "${@'w19T%d.zstdio' % int(d.getVar('ZSTD_THREADS'))}" PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms" @@ -659,6 +660,7 @@ python do_package_rpm () { # Setup the rpmbuild arguments... rpmbuild = d.getVar('RPMBUILD') + rpmbuild_compmode = d.getVar('RPMBUILD_COMPMODE') # Too many places in dnf stack assume that arch-independent packages are "noarch". # Let's not fight against this. @@ -682,8 +684,8 @@ 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")) + cmd = cmd + " --define '_source_payload %s'" % rpmbuild_compmode + cmd = cmd + " --define '_binary_payload %s'" % rpmbuild_compmode 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'"