From patchwork Tue Sep 16 15:51:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.laplante@agilent.com" X-Patchwork-Id: 70369 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 F0234CAC598 for ; Tue, 16 Sep 2025 15:52:06 +0000 (UTC) Received: from CH4PR04CU002.outbound.protection.outlook.com (CH4PR04CU002.outbound.protection.outlook.com [40.107.201.63]) by mx.groups.io with SMTP id smtpd.web11.2151.1758037923728357046 for ; Tue, 16 Sep 2025 08:52:04 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=psqzqSB6; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: agilent.com, ip: 40.107.201.63, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zFB4YvkR0PcnPkK/1BQ7Ox8CzLa+fVlFj43OfPwdrJs48Ov3BQD+vse2HxXljyIBcBvcTAT5Xhq5REwuALn2P1nuODenIjwhLGwpAxQaw5Sx6OGbpaSBrOUu+8yJuvIdFhNUnQ6wWfSqmck3eqel5gWq0IwO0vyUDdPqqjsi8NBZRIIMz3hgwdYaxXKxqzZSvWsvFTTOx8pNfy5laB4MVjwJ5lfg/484O6ONJJwyYucHs70x9a7IzpB5zFJj7x9oT+YHDR4t/BainG6nL1zrlhSGC4EK97/jeWlxfWtscKwcyouBI4nYPDP+gbN4lyED/7AxO6eSXOjsQFCm6IsNFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vHL1pLEUCIXMikkxWmvLccHVxKRqddj2ywY0nukh7pM=; b=OrwmLlicDGTH6+ecsR3svMS0SbFCJDDcVpMUqwRvxzeRoKazOvFUB2OHRXRKEavRABLpVtyF2DuiXwdLSTl916WTVvOR/J3j8ICQ+c/1nShL+bw41aVg6GyBSQoLg7m84Pd9p/sreTyxyhI5nBrINSI+5q9n5/oenTHizs5qMS0D6V0ZSc2dKWBxJTgDZOz1HBDLIf/pJvD/2/D5vBvUs/UydLoLSfGKqtA9AZaLPbddfFE/IeoDpT3EaddHOyI0FLwWGoNoOHMSBBlZ8Ad5BfsnBnQTqXirJyl68yT4ZcEejsZGoY61ZKrC7FQoTfMjmGFnjj2HPwVFfORTIONV2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.34) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=agilent.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=agilent.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agilent.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vHL1pLEUCIXMikkxWmvLccHVxKRqddj2ywY0nukh7pM=; b=psqzqSB69I2O6iXHHWwNiHeTf9x1wYfdpXkCZgzuehO+mX8mCGIVJ+CrgWqVKgeW28Jjww1pSDWxxBGD7UyRk/HUWK5Zy7VS2nlguek7pEkqUTfcWUfcfu29nsobF496v539vxaOb+L1HEOsCCGBW2IqYOWSblgB6c/ooWBrlmVimt6HzJZ8JpOFGZiWODHTcWFS1rlWZioZi7XIP0OtFaJxUSnqR3SFGWvvoX71YFbxK7bs2DU2FVQeydu0ZTdf9nPq4oOyCkRJKuyzn62qcmGYuDieYHovbEgFeOd892XBTbUJiHhDfENklmzSEY/WtXTxmAbPklH9zwSjg2l8xA== Received: from DM6PR02CA0142.namprd02.prod.outlook.com (2603:10b6:5:332::9) by MW3PR12MB4379.namprd12.prod.outlook.com (2603:10b6:303:5e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.21; Tue, 16 Sep 2025 15:51:59 +0000 Received: from DS1PEPF0001709B.namprd05.prod.outlook.com (2603:10b6:5:332:cafe::4b) by DM6PR02CA0142.outlook.office365.com (2603:10b6:5:332::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9115.21 via Frontend Transport; Tue, 16 Sep 2025 15:51:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.34) smtp.mailfrom=agilent.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=agilent.com; Received-SPF: Pass (protection.outlook.com: domain of agilent.com designates 192.25.218.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.34; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.34) by DS1PEPF0001709B.mail.protection.outlook.com (10.167.18.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.12 via Frontend Transport; Tue, 16 Sep 2025 15:51:59 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.5) by edgeappmail.agilent.com (192.25.218.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.58; Tue, 16 Sep 2025 09:51:51 -0600 From: To: CC: Chris Laplante Subject: [PATCH 1/3] devtool: __init__: cleanup imports, including a missing 'import errno' Date: Tue, 16 Sep 2025 11:51:42 -0400 Message-ID: <20250916155144.3279173-1-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001709B:EE_|MW3PR12MB4379:EE_ X-MS-Office365-Filtering-Correlation-Id: 96add34b-40b0-443f-fdc1-08ddf538f880 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: ZLogI3vUj9sWvkuSzaulsIqfK6T/lI/jr//0bHL752brQkjd9guLcGyzcHPSuvpEKTGLRImWyNt2HmMUFz/UroIr2/QqWm0OpJHYkkDLR2mb6MFZ/2TCVIYWvCNB5lbj+zgiv9BM1INGsl4brFePPM2yLUvOtxgH/MQSjqze93O+vs4TyM1X3DGwrXRgcEueEZN+j40EpMuuJbAcHI+0EbP0KTUqAEQB2ZQ0TElxCPsSOs2jO98oy++ob41EmXBhIkZ0qGiioYG47ftaAWJki3fN4G/QuY6rI8JVR1YK2rI8HOkSOQKNGSteLrJPZOpkzkkhgQ9qQ8nyIDmdEBaisjJx2EoaJZ94K2GqXTBEpdV3ahmJf4qD4LrqSN9XGP6rshrOClOgNyhYPYRV1Uvllw+QlgCZa8L0fACwgKDyvXA8R7b0J94MpUZ3W3C0gGr0MvOqJT5dLM3kPzP+QOQ2uveVTlzMxv6km/Mnf2i5Jpiwj7CuN0vGoa7kvVVE6XMWyKc2c2PwbykohAx3kvZ5qH4ywJTJnYyLQdCpys5MdRuiOA+TREFa7dVvoeMSqjf+h5xf+Yxf7U8aD2KtukCYBIW+MtRitgwZUJrfIrd25fYXm97HOE5qUSCINy88CNi7Pc0eS89zqG2Y8Xn0/du8G7c0dfqa55sC8psbe88nH2wvofJQsApdXjJnG+zTpnJzL553R2Aj3y8lPRU+dvKYhlGudRg/BdjtNms54i12eqf+zVwy4ef0gIl2+xONTCrf6ZaGQupYzX6DOMNBBYvuyzPKvpUnmnYTNJp3sk7a423mLyNnY27RLTDt07C/yxKnUvZSsbZkRp/76WaFRcbRK/l26Bk6nROAbQu3dkLTy7Td3/pnEoFQhhs/FrvKhxxtwpow+zN8UXwcQlHWZ39n2RtrEb1/e+g/vPJvDv8/rIEfABP0CO11F2Yp2W/S4Y3IxaXkp+7rs8YnRvBvaPT6SJKPLgCq+myzvGPOwmO7ysD1FzckTj3QaDe7+oovIP6rJ+F4/RA3QmHq2lZUMan4eWVQtK633FwfqUTETptR7oO+x48NpdQ79lEA5kHnaTuoz9wId97G4jDI+sPMHzM7L9deReCgyFfWCxvxJ70F3kdiQxxLHXLQNEAl7To0i6Csq0OATk44SPjXPNaoqMhyJk0Z5qJe+c9WwJJfN5AQoWo0Ifhixxnwpz3Gt4E5eZCMt5cA0yry/JQWgtrqgpv1r3fwxM0vqZyTEoVPlfS5FM8XABCJ4ACswzPCG4kYV2uR1QfDDpP33qa6hfhbbl5exSog3p5N8KBAkdM2Sns/tQvo9uqTmY94L7J2SJ3TKtfZAVpkZnnigj2kbyTYpMz6aeI2aqEvPgN7ZTOrT+hi1bN+uOFgZ9CSCoP4fqjKQtX0yjCeAcZakwjpiUYZigbC3fZ8x5HpIetjNn/f3844g8lLqgfUpUwmAu7+7AdoxcZ89w37A0aBW+yE+bXU5NjdtpjrRdCUNS7DSqViwiH+5BjmWrZ4V587xN4ZGJjVAnMq X-Forefront-Antispam-Report: CIP:192.25.218.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg3.windmz.agilent.com;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2025 15:51:59.1617 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 96add34b-40b0-443f-fdc1-08ddf538f880 X-MS-Exchange-CrossTenant-Id: a9c0bc09-8b46-4206-9351-2ba12fb4a5c0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a9c0bc09-8b46-4206-9351-2ba12fb4a5c0;Ip=[192.25.218.34];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-DS1PEPF0001709B.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4379 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 ; Tue, 16 Sep 2025 15:52:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223568 From: Chris Laplante Signed-off-by: Chris Laplante --- scripts/lib/devtool/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index c9d7ade9ff7..396e8025b7f 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py @@ -26,7 +26,7 @@ class DevtoolError(Exception): def exec_build_env_command(init_path, builddir, cmd, watch=False, **options): """Run a program in bitbake build context""" - import bb + import bb.process if not 'cwd' in options: options["cwd"] = builddir if init_path: @@ -50,7 +50,7 @@ def exec_build_env_command(init_path, builddir, cmd, watch=False, **options): def exec_watch(cmd, **options): """Run program with stdout shown on sys.stdout""" - import bb + import bb.process if isinstance(cmd, str) and not "shell" in options: options["shell"] = True @@ -122,6 +122,7 @@ def setup_tinfoil(config_only=False, basepath=None, tracking=False): def parse_recipe(config, tinfoil, pn, appends, filter_workspace=True): """Parse the specified recipe""" + import bb.providers try: recipefile = tinfoil.get_recipe_file(pn) except bb.providers.NoProvider as e: @@ -178,6 +179,7 @@ def use_external_build(same_dir, no_same_dir, d): """ Determine if we should use B!=S (separate build and source directories) or not """ + import bb.data b_is_s = True if no_same_dir: logger.info('Using separate build directory since --no-same-dir specified') @@ -320,6 +322,7 @@ def replace_from_file(path, old, new): try: rdata = read_file(path) except IOError as e: + import errno # if file does not exit, just quit, otherwise raise an exception if e.errno == errno.ENOENT: return @@ -339,6 +342,7 @@ def replace_from_file(path, old, new): def update_unlockedsigs(basepath, workspace, fixed_setup, extra=None): """ This function will make unlocked-sigs.inc match the recipes in the workspace plus any extras we want unlocked. """ + import bb.utils if not fixed_setup: # Only need to write this out within the eSDK @@ -390,11 +394,13 @@ def check_prerelease_version(ver, operation): def check_git_repo_dirty(repodir): """Check if a git repository is clean or not""" + import bb.process stdout, _ = bb.process.run('git status --porcelain', cwd=repodir) return stdout def check_git_repo_op(srctree, ignoredirs=None): """Check if a git repository is in the middle of a rebase""" + import bb.process stdout, _ = bb.process.run('git rev-parse --show-toplevel', cwd=srctree) topleveldir = stdout.strip() if ignoredirs and topleveldir in ignoredirs: From patchwork Tue Sep 16 15:51:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.laplante@agilent.com" X-Patchwork-Id: 70371 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 F2CAACAC599 for ; Tue, 16 Sep 2025 15:52:26 +0000 (UTC) Received: from PH7PR06CU001.outbound.protection.outlook.com (PH7PR06CU001.outbound.protection.outlook.com [52.101.201.45]) by mx.groups.io with SMTP id smtpd.web10.2157.1758037939845703179 for ; Tue, 16 Sep 2025 08:52:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=vbTUyR4Q; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: agilent.com, ip: 52.101.201.45, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lnq2huImN+Q1AsdcbafkOGB2NPt4g75DnXmQIH0LGAbODLwJ3p9fJzyPvuMCq92HMBbvE3CY4uwUMyX+ALI1WUhxCChv7drG0gc0V9EeREHpyzG9LB23Axx1gZfPk/h7/Q34ORVnZHHUnrShblejtMoy+wjNsaxliHUvyMQypEwv9siJ4hg+lwpRYSVdgV+h9Ju08lkQVjWDXB5bgrWYsi8Uvzs3bO7FidEc9fE7wL5QKP4GbTZyt/iZrjgQ7VPFZSGzZ4d2j2AfhzR68QuyNEv/NnSh7TnUF1RxG5BKEP6VeBD+q3PkZZscgs9vflDTWbpq6gOTFiZLW5IdhTL8mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MKHg9kG06NOgnDVpAbXRdM/LyuUlp1hJ7ZlrB7fGXmo=; b=zKAMxaCEd3j2tCVob7WjAmqzJtLtMCXlmJmw10nGrcjNOkWeMQvS0EsrIb7jESGZ/G0estZOkGjXkQYeLABPqVWIxkiw/vjoFbpSnG2GLXrbQRQ683mUGXNgQrbM+HunkXjYO4/UBXpolqOLpOTyL+Pup5l+UYejvGUVZPZYOBxF/4uSH4P6+hcEnfC6H3f5mT2H4b8Um/HzbPpsUqhKwzx/EmT6QJdqwSG3B9GNHF7/+SCVwGPhF2eXFxuTp1gkCalFLrMBbuG36nt6uCpq7V8hxnOD7ZS8x5Av44D6caunKLbhH6J0oL+Fxr/EmQMU1/ruwELF2t1CXmqJUpW8aw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.34) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=agilent.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=agilent.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agilent.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MKHg9kG06NOgnDVpAbXRdM/LyuUlp1hJ7ZlrB7fGXmo=; b=vbTUyR4QNWb5d/sHl7TT5+GCY42zvt9nuP9mFjVSRKZiP7L3Vy1ECefMHDCczrhgJZYwC1j6xA3lvehOsadVIlyZkUNp12iUcBV7OIaNAF8Zp2fPhlW2I7orKDwgvn0/TV7aqV5htZInOigq8usqIiQo41m+JD6+l2lMCm770bm3puFaoyWSLQe8xYGe/+TjbPaXAaPNNoEtGKgJNvgymFruxWPT1HIlS8o08uTrC589DXXtVqm56sspFAoy6xew33wu6YMqkw6tcCKkBAvCQlI04G4YmlloZPwbLqndRcf+PbVnG4Zf6OCK0KkCe9pMmybn0b+n+Y4VdaNL0WMPXg== Received: from DS7P220CA0007.NAMP220.PROD.OUTLOOK.COM (2603:10b6:8:1ca::14) by DS7PR12MB8232.namprd12.prod.outlook.com (2603:10b6:8:e3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.22; Tue, 16 Sep 2025 15:52:09 +0000 Received: from DS1PEPF0001709D.namprd05.prod.outlook.com (2603:10b6:8:1ca:cafe::a4) by DS7P220CA0007.outlook.office365.com (2603:10b6:8:1ca::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9137.13 via Frontend Transport; Tue, 16 Sep 2025 15:52:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.34) smtp.mailfrom=agilent.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=agilent.com; Received-SPF: Pass (protection.outlook.com: domain of agilent.com designates 192.25.218.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.34; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.34) by DS1PEPF0001709D.mail.protection.outlook.com (10.167.18.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.12 via Frontend Transport; Tue, 16 Sep 2025 15:52:09 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.5) by edgeappmail.agilent.com (192.25.218.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.58; Tue, 16 Sep 2025 09:52:03 -0600 From: To: CC: Chris Laplante Subject: [PATCH 2/3] devtool: __init__: small cleanups Date: Tue, 16 Sep 2025 11:51:43 -0400 Message-ID: <20250916155144.3279173-2-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250916155144.3279173-1-chris.laplante@agilent.com> References: <20250916155144.3279173-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001709D:EE_|DS7PR12MB8232:EE_ X-MS-Office365-Filtering-Correlation-Id: e5a0d15c-7e66-41a5-6dd3-08ddf538fe95 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: QKMJHpUQG93tJFwdF6W600bjsNPGb8Sr4ZYx+7HAHGy9B7w+TlQ4WwCsAKAs1+sIVBc6pm+/pjjSvsKD4YMWHHaHZ1wwcx01ScMIXirl88HiDQB0xsayvhxuBnn1arVXAOiB2EI9CV9iIOhDFh7/aaLO67TJkLKJFtOb9Iw64vdKqpxuSyq1gz2OO2zxcSVLO/A280W6sUfMT8AAeEpSPJavXS3179lvlnJEg7rWjx35Suwavc8SK+mCN0HZKZUOARYLJ2L3osk/mbXvlZcQGR7TEjkaBxgYnnwpZtvqPkLYQol5CTTJSkkHs1PoVK2aEZhN1I0WKZfhM+hdQ3nYMSmS/YQkVpvBDowjYEr1seOBanonncTvmNIFdyP0RnYUcI9detF2w1lhTdx2wN9xFZXR6yuMX0DFCZpQ3I5PUCcvAPeehYTslp+NmKarCzm6tO4OWKZNO4zomZPqW7hyD0Fb73iW73zJhTLuDP4g8Ynp+gFB0NgwEwJVcnwnAk1sr+irgss3qObsohsza96Wilw5w6MwQrOBfGCxvPPg9NHRdnqtU/PeobzeSvKixSA3r/0RvoPAwByezs+2NpKSMLYCkj8klMF6jPXgt+CuVaAZUsSAPK8TAEMNn2oQNk21mkXvGlhrnfXIp4SFkPITcsTtb6EY2R56itDVtRcsgceEsdzA6XuefEAH9FGs3xTsMTXWV8rho+bH7Ls+BzD+ZpROFgvxpvJ8xvKUfZdIlYfM3biE5b9i/K3ntzh1eC2PNBEIKQ4X4OEAyV2ZHqCK67lyZ/cxHLmbdZ4Jsotp90I+/h3hEvX492opdmcc0w0CBJ2vMwi6HlNTbbx8yG3tEjUZIn89gAtwtRaXL6lIVb82PvpnqT9ojI13pWlEYnV3B/w6qz40Jx+iZJgWKNtwaQEegWAFxS0kpx2SxEwtgxk3dl2xLKgZg6BQY0B34MHDcTb0TYQ/O2U4A8QX8WgUZpWbR0aKbitsMrjtJtaX2oTUtUTAvNBBj0AxtPvOscjygXdSgh8SaiiClPMukZrlUUHRXam6Xx2QLp+uo2HpN+0XZol8BP4iDYIVwJ66PpwVzFRcGbAem9TnSzqnU9FbobZ5gpdaFRDmbqq4I5jYoHsiEkMWENNl7zHdTwLsa4643IuAxw+ITQhiIyBop7z8cvz1Nap6FyJvr8IHnpHm/+ieGzqZOxAp+9CmrqhuKLc9azVYraCQZusUbqoJiAdMwI759J4Dj1WGL2T/yspKhryQiuoE0yMn2h/ajG0Ex5eSh0o/ylVhG9yjbPKV/q1PhWPQWt6+M1dpZ2UHsdVxFIQEf2Qhy6CTThLK8/TDYjEkjCUCgWqGUmTm3Mj9BnS2d0+Ah549ErIjsO7zpemjcib/EgVV0cWQH4emny+OYassbXx/7YuMobd0gSUx8ABPnbwP06s3gUX+ziJfirIaqFFpgxype7tcaftFzbaku3lM6KSOV4Eqi15nz5O2AVe553MM1ILZNkYlIPoIE0NVki0m6dT+UfIH4Y6koO1CzyRl X-Forefront-Antispam-Report: CIP:192.25.218.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg3.windmz.agilent.com;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2025 15:52:09.3034 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e5a0d15c-7e66-41a5-6dd3-08ddf538fe95 X-MS-Exchange-CrossTenant-Id: a9c0bc09-8b46-4206-9351-2ba12fb4a5c0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a9c0bc09-8b46-4206-9351-2ba12fb4a5c0;Ip=[192.25.218.34];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-DS1PEPF0001709D.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8232 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 ; Tue, 16 Sep 2025 15:52:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223570 From: Chris Laplante + Remove unused exec_fakeroot method, which wouldn't work anyway since it doesn't pass kwargs correctly. + Fix a None comparison Signed-off-by: Chris Laplante --- scripts/lib/devtool/__init__.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 396e8025b7f..717a60c039f 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py @@ -66,7 +66,7 @@ def exec_watch(cmd, **options): sys.stdout.write(out) sys.stdout.flush() buf += out - elif out == '' and process.poll() != None: + elif out == '' and process.poll() is not None: break if process.returncode != 0: @@ -74,13 +74,6 @@ def exec_watch(cmd, **options): return buf, None -def exec_fakeroot(d, cmd, **kwargs): - """Run a command under fakeroot (pseudo, in fact) so that it picks up the appropriate file permissions""" - # Grab the command and check it actually exists - fakerootcmd = d.getVar('FAKEROOTCMD') - fakerootenv = d.getVar('FAKEROOTENV') - exec_fakeroot_no_d(fakerootcmd, fakerootenv, cmd, kwargs) - def exec_fakeroot_no_d(fakerootcmd, fakerootenv, cmd, **kwargs): if not os.path.exists(fakerootcmd): logger.error('pseudo executable %s could not be found - have you run a build yet? pseudo-native should install this and if you have run any build then that should have been built') From patchwork Tue Sep 16 15:51:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.laplante@agilent.com" X-Patchwork-Id: 70370 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 F0A49CAC599 for ; Tue, 16 Sep 2025 15:52:16 +0000 (UTC) Received: from PH8PR06CU001.outbound.protection.outlook.com (PH8PR06CU001.outbound.protection.outlook.com [40.107.209.59]) by mx.groups.io with SMTP id smtpd.web11.2155.1758037934673341099 for ; Tue, 16 Sep 2025 08:52:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=C64thOCt; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: agilent.com, ip: 40.107.209.59, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eBBFpnQg9saEZoGHa9fg3WrS1QTbSA65o6O6Ogp1kwNJjRQRIEjMxtCqJWOpYVXpgP+2VfxcpOp/L/5eCeCeiAPzUAXSn6g7LCwShWLaQ5AwtdHsOXdCI2t5eM+JeutzvxHsO2sAXwITJmn3S5a/3Kh3czmhgr8MVFxOIDRSrNZjZsPMMPCgE/OvwiXznbtcO8pFXG2kVehYM5300PR6fXBWnblpUaDA9C12wUcOPH0jwAlZ/G2tSNCmsAGZAB0IUg6+S1oUXFYJQi7gZDbfx6Jtx/gtxzO65Hg4Hld5UZaoZouhOMpINbdfcJAdg9CekUwD14L5+sQyVKVny8TlYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wdoRi9pFrKIHAm3KgGZ0K5+8RMAh6qkPH+lWwhgiQkw=; b=vEtVblkBGUHeHsPhZv0r7ZbYVksPya4qmLByCUj6cIef9WS5P1zAIBT80rkC4cwDD8EXHSYETaBcHKZbPgFWa+vs8WOQ3cxnI9cIjDnoxrWp2l5A7NkDXMeEMQS65s/XFZd1j0d7F4xlGT8mDsyvAoGW5CA5hcX/onvZfLgFqBh/EXcPa/wvSfP17P72DN9iJIHF19pqN0KutJTOBZTIkahYJ/w+/GLMMXlU/85b7BPE0eB+1CdObhOTK1Q2R6+bMylgJrv4s3mfBaXy+/NPGwRdlutFCSOP7fyxvgIxDEL6DNPZmw3PO3VulSYB3J/EnBsGCVShiePQ3i5U2HjyGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.34) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=agilent.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=agilent.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agilent.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wdoRi9pFrKIHAm3KgGZ0K5+8RMAh6qkPH+lWwhgiQkw=; b=C64thOCtroG8t6XIXMU1O6IAsMF19kLuY74AGbuEQnFXuShW+vOUOua8I9mdsAjJ6WebWTgXPvN+yGu4eWc5xtBwXX4zVfzmIcIdLxtjA+8ijhtsDaBgTnW0XrMJ15XgQ91HJY6d6x6gBbYd+j4sf01mLg0QigbfV2WXDqcpg/Fl+W02W9lz0Z5FQh7MYhJM96hx+VyrcjLVCXxrMKSZx/gZI7lbisnejBGH57qlelAzH+iqQ8DXoTS6X5SW3esOVHsydjYlU04Ie31Hl0dmAMKL4Qu7Ad9ClbSJQFdkpgU7/jMCsq2nagYrLC/u5L8bubWaAV5mTmuJHtkkO/pZRA== Received: from DM6PR18CA0025.namprd18.prod.outlook.com (2603:10b6:5:15b::38) by DS0PR12MB8042.namprd12.prod.outlook.com (2603:10b6:8:141::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.22; Tue, 16 Sep 2025 15:52:11 +0000 Received: from DS1PEPF00017096.namprd05.prod.outlook.com (2603:10b6:5:15b:cafe::dd) by DM6PR18CA0025.outlook.office365.com (2603:10b6:5:15b::38) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9115.22 via Frontend Transport; Tue, 16 Sep 2025 15:52:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.34) smtp.mailfrom=agilent.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=agilent.com; Received-SPF: Pass (protection.outlook.com: domain of agilent.com designates 192.25.218.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.34; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.34) by DS1PEPF00017096.mail.protection.outlook.com (10.167.18.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.12 via Frontend Transport; Tue, 16 Sep 2025 15:52:10 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.5) by edgeappmail.agilent.com (192.25.218.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.58; Tue, 16 Sep 2025 09:52:04 -0600 From: To: CC: Chris Laplante Subject: [PATCH 3/3] devtool: __init__: simplify replace_from_file Date: Tue, 16 Sep 2025 11:51:44 -0400 Message-ID: <20250916155144.3279173-3-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250916155144.3279173-1-chris.laplante@agilent.com> References: <20250916155144.3279173-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017096:EE_|DS0PR12MB8042:EE_ X-MS-Office365-Filtering-Correlation-Id: 7dad9afc-466f-4614-f7bd-08ddf538ff88 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: QnURV1xJc6MGiOgdBhQDlQPd0K8AxlXOxrUTsSHahaFmEAdrhSz5UJ1goYLrtPZuSRcfJniwMUGdVSYNSTFomU42QJrA9ufvBTXW32hkiecNv/Wnvo+g2KugKz0mFBSKd9vq+Ciob2D8ljx++ZheWXQtSe/87lWEgM9oHq6HOEpjluKlBv1Ya0tgWelpyGje23snsbC+y0aAEtPu97wYOO9BMQRDO5yGP0W+scrDPxfVDA2EUwEtt0yTtghhQaGxuXusDgCpO8sIk2SlSGwzu2D1/seCy2Oxzc/6XECyirQ2mntlUm1hZSGsPggtamqrlzp1hXl7/uth2GTXnCp5tzDFhrnudw0F9CZbmXZZBSc3VE8eBm4/vkErnKPoOdvcxM8ihMMCuMBnrKz5Yu0wTvhidou+aJtAe1yJJ4gL49c7zQARW72qFbMYLIhEAJY2HQc7jJ0YdkMhXCv7KGGjazpuevM9LGcgTyhTooG5uimI0ii9VZ1SiC1Wvzj91e0FlUC4J1/zgsVGr7oIPh6hhEeuK4yaXJhmn6D1DkRl1emG/Vj1G8pkqHSp9qaR7m8QL31e4HV2MLEAC8+0a2NrwmKdl5QMOG3Yfvjhscl5dk8HOR1vn8I0p8irIfZtkJNWFpIuH1Hbss4Nhh+3iVuE2+AFwiOgabgKMYqO8k7RmOkER7ewDgqyehYtLxb9Hx+ReC9BL93Kglmkg5dge3pNwpt/ZzrxPcRYgZSIIr594Oig+EzqKGuGADfhJneX5Xq2D2bbhw7hw/DQEdQa0KrKXsOFgRyyxaVDmzScUSWfCXjugRB+l7d7SVkJMedcmemeDI61GqCgs/C90D7Su85Cg6Pj9XYBtvO1hOP+Rf2K3zHqc7J9dFjO2Zm/eNWx3j8PhTmL75DWo231XKQe/Flg26vXPupoG9CUJuS5rTEFDax2aLZ2+SV2MC25RnC8JxYhFFaxJdFky78hw6Fgq0FY0sK5/VFqZRSMZva+ZW4fIjupTN5XX4q/v+Oi5ol2BtJ2mMG57bVWjB5CWOEK0rxy9patnn4VLtrZMSankGBP0xVuq8kDfg7zTvAMzoDoFU1WBu/wKogZ7VYSQ+3sqNtYeVzTnDcKfcgN471us0b6gn2C827Kwy0vJOXhkVwRs9rf7Y82zGHs2l8JcBzf4Y32izSr14HYVLToBuDnMgrofjLJlQMgCXfS8dNBAvi9bl6L9js2sDPAGaYnYbwGsJJgIwBnVJ4k5yqz3JzVkkcCJulHNfRnvhjjyBB/O2wFqyHZzK4KsQ0ZCa90iWxXjW1AHqdys/wcV8EsO737omJQlYa0P11VreYmxWTOZkjn2dm3W4zzJb5rZLjD82ZFURin5q9suu8Ie+Pxhf6lgZYTr2HD2yBqPzIxe62YEgjNNWhor8/4/euoj2fe3ZVZjGWZ6r/Zi+cLNrZvkbxv9Ydv37o58g/bErA2PsY0LEuGEf6FANfel4dy2Q7v4qERcf8WnfnqIdRSC7+jwdM4xx33j8sGvA05ZYD/MfpljUnWa00a X-Forefront-Antispam-Report: CIP:192.25.218.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg3.windmz.agilent.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2025 15:52:10.9490 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7dad9afc-466f-4614-f7bd-08ddf538ff88 X-MS-Exchange-CrossTenant-Id: a9c0bc09-8b46-4206-9351-2ba12fb4a5c0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a9c0bc09-8b46-4206-9351-2ba12fb4a5c0;Ip=[192.25.218.34];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-DS1PEPF00017096.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8042 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 ; Tue, 16 Sep 2025 15:52:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223569 From: Chris Laplante Mostly just remove some useless helper functions Signed-off-by: Chris Laplante --- scripts/lib/devtool/__init__.py | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 717a60c039f..969d6dc13ab 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py @@ -295,32 +295,18 @@ def get_bbclassextend_targets(recipefile, pn): def replace_from_file(path, old, new): """Replace strings on a file""" - - def read_file(path): - data = None - with open(path) as f: - data = f.read() - return data - - def write_file(path, data): - if data is None: - return - wdata = data.rstrip() + "\n" - with open(path, "w") as f: - f.write(wdata) - - # In case old is None, return immediately if old is None: return + try: - rdata = read_file(path) + with open(path) as f: + rdata = f.read() except IOError as e: import errno # if file does not exit, just quit, otherwise raise an exception if e.errno == errno.ENOENT: return - else: - raise + raise old_contents = rdata.splitlines() new_contents = [] @@ -329,7 +315,10 @@ def replace_from_file(path, old, new): new_contents.append(old_content.replace(old, new)) except ValueError: pass - write_file(path, "\n".join(new_contents)) + + wdata = ("\n".join(new_contents)).rstrip() + "\n" + with open(path, "w") as f: + f.write(wdata) def update_unlockedsigs(basepath, workspace, fixed_setup, extra=None):