From patchwork Mon Mar 17 17:13:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 59278 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 9BF98C35FF8 for ; Mon, 17 Mar 2025 17:13:21 +0000 (UTC) Received: from AS8PR04CU009.outbound.protection.outlook.com (AS8PR04CU009.outbound.protection.outlook.com [52.101.70.35]) by mx.groups.io with SMTP id smtpd.web11.58667.1742231593981934490 for ; Mon, 17 Mar 2025 10:13:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=Y1VQhQ4L; spf=pass (domain: axis.com, ip: 52.101.70.35, mailfrom: peter.kjellerstedt@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=koRe6+W08VlraMyY4b/8YMVSm6qDZihrkYPdnxER5CFFiq+vEiodjuqi6m72kFAr2jwyEU0egB4S25e9h7nefiVPLcIEuvj1o5QOmjw55DhiD67dO7oJY3M3cKHXfi2f6QPvHeTZVPUivfJsEVe16qv4BqODd/kNMwApRlGU7dK63Z7vzZXFVRRWDrgx7VPPoUvKXSHmddfHeSYpE9/vRzKooyryQNU3FGMP6bvhFG8dirjGRVUCzJpI6EAq6T64fXfXZ5jRxn5+BE5w/kHO06NljBmpooLOZaLpzhxw68wTFTdkw10K+31QqpnNDGoFmhPqJuKRq/y/aG/ijsHlEw== 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=00UfEVtj8CwHcnucXVcb1YEh/3vLpFP+Cb1UEhitjow=; b=PzgR4JshM3VtY8Td7KzJceLMrQFrUDi/8j/CYrn9fHHL2fQwEKi+edwQETvHhtTiU2kz2OMivz1WOS4kIgsg7PqvFgEPn9H4S8RI9rTJWDnD944Dcx+XAC5fmxNNI6F94qyTe6BGGFAPJN/IbSKfO9Y6162gVKDoge3Y/Ko492PpSJllaD3BACspjLxv+RDnqIMDUYcChaOnRTVKHRVq6VXIx0rGGCtbDhY1TAJNvRePNGaxJOsuZj1yIPeQ4S8G9m7dIvqo0iRn2fGTs+gGiXqLA06br7I0gdRpmMEonRyi7j1WSzOdgfXVQWIZ9KZkE54uZJyJ8xF751fXElVrXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=00UfEVtj8CwHcnucXVcb1YEh/3vLpFP+Cb1UEhitjow=; b=Y1VQhQ4LBcPXmRLTxisVkUGCpgsBMGzKaE2RLOqr+QfqfyR+y62yFadMoXkY96BQa/i78vVjX/Yy+9nPJP0ZnBOpxU42tTOoCU6O1ExjGYM3qGJo9kz4GAVF+mL0BbNJEiMZrsO3hXwGWx7HSM1asglW48XwcRMcx/B9HHBcCZA= Received: from DB7PR05CA0063.eurprd05.prod.outlook.com (2603:10a6:10:2e::40) by PAXPR02MB7798.eurprd02.prod.outlook.com (2603:10a6:102:231::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Mon, 17 Mar 2025 17:13:08 +0000 Received: from DU2PEPF00028D0C.eurprd03.prod.outlook.com (2603:10a6:10:2e:cafe::bc) by DB7PR05CA0063.outlook.office365.com (2603:10a6:10:2e::40) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.33 via Frontend Transport; Mon, 17 Mar 2025 17:13:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by DU2PEPF00028D0C.mail.protection.outlook.com (10.167.242.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Mon, 17 Mar 2025 17:13:07 +0000 Received: from SE-MAILARCH01W.axis.com (10.20.40.15) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 17 Mar 2025 18:13:07 +0100 Received: from se-mail01w.axis.com (10.20.40.7) by SE-MAILARCH01W.axis.com (10.20.40.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 17 Mar 2025 18:13:07 +0100 Received: from se-intmail02x.se.axis.com (10.4.0.28) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Mon, 17 Mar 2025 18:13:07 +0100 Received: from saur (saur.se.axis.com [10.92.3.10]) by se-intmail02x.se.axis.com (Postfix) with ESMTP id 1DEF3294 for ; Mon, 17 Mar 2025 18:13:07 +0100 (CET) Received: from saur.se.axis.com (localhost [127.0.0.1]) by saur (8.17.1/8.15.2) with ESMTPS id 52HHD7JX3666756 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Mon, 17 Mar 2025 18:13:07 +0100 Received: (from pkj@localhost) by saur.se.axis.com (8.17.1/8.17.1/Submit) id 52HHD64U3666755 for openembedded-core@lists.openembedded.org; Mon, 17 Mar 2025 18:13:06 +0100 From: Peter Kjellerstedt To: Subject: [PATCH 1/3] devtool: Do not create annotated tags if tag.gpgSign is set Date: Mon, 17 Mar 2025 18:13:01 +0100 Message-ID: <20250317171303.3666709-1-pkj@axis.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF00028D0C:EE_|PAXPR02MB7798:EE_ X-MS-Office365-Filtering-Correlation-Id: a3e0f435-cfc0-4b2a-cbb4-08dd6576fcc9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: MfNe2NVZasCjiEXPrcq8srLUfjdbl9w2XjFemfJZ6Qqac6soJQnW6Mtf9hSO7FL7YuCX0tJ6eAH2cx0mk7vsRP5gOz02C+UMJ4KtJ0QWj0BWXpZ2bM4604RWZPgDB+veaUC0nF8wLn/SOVoCexlrtcDtn4s5NCy5BVNf0WTFNlFMIv0bg2mJlMh2+Pf0V8t5nI4HqyjXu0wSju3m/4vwuDAZvlzJBCPkbDFB7PS0GZ1Om1+K/G2D80b73he96xwWEN/JTTev6NjTCUmySbmbTd02k8XItw0Pww+S6YdVU2+TxxAaIdAPOmVAGCbP0NbzUxiTrqpiBB/Z405m8qnrPqoBStBJpdNrCfwIkmb9Nc1HUHywzm0vd0kzLD4cYMFh1ZYB/RWeBIKh6UXNwrlxS0aEh9wEBmSLJGLLMMpZI9rPyPo0hxfXxPujj8B2ZDw3HZ4k6Tz84TIgQW4RZ3rL0fE4AgOLq0l8enZJW3PctJ43ycgZlBYxFP5x5LZWGoCWWg7SESdYel4tMX7LuvkTQNcUgY84myB2FFlRIAdemcnEgjj+ALVEUqXNvqnSoFu46yC9mpdmoqz3wjpYX0ASLRIcNOd9S7VgKTtMpSzMjYe0IImAsIIX6CML6HQTb9i2haTuBabE04fQyyTGMXqNx/XkUAOlBXjq1mdDsoKIzWjsxAMu1mQpNENwWbPeHNZ5LNFSd1Yyl/JaPNUOUO5aqotDLUX/YNjyfqoGgTnQQH8d0JmYoe/OMJhrA5beZFKH/hyEdXi+lR9JacKVkyswiDWY1e4OKg71W5D79zt1dewAvwkQsHPpcl6sqa3DpjI6Mx/6pAAj0KhAiegN/Z/giSO3oXU6lbZ5Vl4ZnezYYGBgeMETMd9BGdjCA1TX3aIHION4atayMcW62pSnbUiDY5YuEiJKV6RmhL1ZrJ7aZBZDtwvI3jIoB+4kjlCppYYCJjivNwfSMHlxK+7VA4mEGHw2v50weKF+mRZmcMrwiRDiTRg+rzBGd73hspw1Z5vckJLb+PWE6b7vVT1CNJ6zjZBim+4LQR0wVFyRzgVypseuGDX1YI/Arw8LfY4iXKNy7eM5KFEDDr3ZWw9wCXLVELKXPu+3oOUyXV0SqX3WCXH6Z4BNOXv5BsHpGFGYjaxM7avX9UbvHdkDIdvHuXKlazhdliBxM5vaY+UW2RNpxrp4lcmmkJL9udmqp17QH1rKlhyU9Fvpj2yFwNT3g6TGWMb/nNP9hA39ImC1mm0Dv2JiJS25gg7wpDSH/oKxwGHabsCIyexqmW1OrJYxj4srDpqkCl4qB9ZValcavU698bamOeUMulvfcvkgKwyyfJw/lHeJnDNGdCYrATjOlRoyknoBGEt4qr3vFZFCjZE3fdfgTEL5JdKnZart4EorgfGq3PCNIDVaDHUNRbsACFHczMCdfNct6PVkjthbUtE+IM67KQ5ucn2N/tO4ndDiceP969woz0I9uJOuEzAFuF2ouXIXMfonbqniudW5+jhOrCc= X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2025 17:13:07.7483 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3e0f435-cfc0-4b2a-cbb4-08dd6576fcc9 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: DU2PEPF00028D0C.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR02MB7798 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 17 Mar 2025 17:13:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213118 If tag.gpgSign is configured in Git's configuration, then creating the devtool-base tag will fail (if Git's core.editor is not configured) or it will hang (when trying to open the editor). This is beacause tag.gpgSign causes git tag to create annotated tags. To avoid this, specify --no-sign as argument to git tag. Signed-off-by: Peter Kjellerstedt --- scripts/lib/devtool/__init__.py | 4 ++-- scripts/lib/devtool/upgrade.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 6133c1c5b4d..fa6e1a34fd1 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py @@ -234,7 +234,7 @@ def setup_git_repo(repodir, version, devbranch, basetag='devtool-base', d=None): f.write(line) bb.process.run('git checkout -b %s' % devbranch, cwd=repodir) - bb.process.run('git tag -f %s' % basetag, cwd=repodir) + bb.process.run('git tag -f --no-sign %s' % basetag, cwd=repodir) # if recipe unpacks another git repo inside S, we need to declare it as a regular git submodule now, # so we will be able to tag branches on it and extract patches when doing finish/update on the recipe @@ -256,7 +256,7 @@ def setup_git_repo(repodir, version, devbranch, basetag='devtool-base', d=None): oe.patch.GitApplyTree.commitIgnored("Add additional submodule from SRC_URI", dir=os.path.join(root, ".."), d=d) found = False if os.path.exists(os.path.join(repodir, '.gitmodules')): - bb.process.run('git submodule foreach --recursive "git tag -f %s"' % basetag, cwd=repodir) + bb.process.run('git submodule foreach --recursive "git tag -f --no-sign %s"' % basetag, cwd=repodir) def recipe_to_append(recipefile, config, wildcard=False): """ diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 94b6c11a37e..9abf72eccf1 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -188,9 +188,9 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee if uri.startswith('git://') or uri.startswith('gitsm://'): __run('git fetch') __run('git checkout %s' % rev) - __run('git tag -f devtool-base-new') + __run('git tag -f --no-sign devtool-base-new') __run('git submodule update --recursive') - __run('git submodule foreach \'git tag -f devtool-base-new\'') + __run('git submodule foreach \'git tag -f --no-sign devtool-base-new\'') (stdout, _) = __run('git submodule --quiet foreach \'echo $sm_path\'') paths += [os.path.join(srctree, p) for p in stdout.splitlines()] checksums = {} @@ -257,7 +257,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee useroptions = [] oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=rd) __run('git %s commit -q -m "Commit of upstream changes at version %s" --allow-empty' % (' '.join(useroptions), newpv)) - __run('git tag -f devtool-base-%s' % newpv) + __run('git tag -f --no-sign devtool-base-%s' % newpv) revs = {} for path in paths: From patchwork Mon Mar 17 17:13:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 59279 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 9B327C35FFA for ; Mon, 17 Mar 2025 17:13:21 +0000 (UTC) Received: from EUR03-VI1-obe.outbound.protection.outlook.com (EUR03-VI1-obe.outbound.protection.outlook.com [40.107.103.77]) by mx.groups.io with SMTP id smtpd.web11.58666.1742231593182830918 for ; Mon, 17 Mar 2025 10:13:13 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=j665piqw; spf=pass (domain: axis.com, ip: 40.107.103.77, mailfrom: peter.kjellerstedt@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fhkLq1sj6IFOBqGqONDtHynWP5kHcnpsVicwIJRN5FyWmVDIe6DudNkQbXPnFhT2Gp7f7d9NM+buIlOnLQkkbuJzkBP2RBrWl9toQRtWvKEcKhviEme+usqvRMSDcnqrgi9HnlFmqMQ/adnD4CSPsG310f9vYB4vgRe9kuWWLq5tXxWsy25It5wIyPHkRGssa8tHQa6o4ldz+cr1Y48eTkJvNr9krrDf52+BaQ73m70fnW8jCUxfJgZe9B0Rkv96GW2+9aC0TV3kVDLwr+cj6+TDqDZFBxlcsLpYwDvC1fzSkQSVcweIiRoIJ4nKvDgxjWM01PHeSiS6d1QbAy39Og== 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=IBseHXtsEi8cy9wEMlhj2xUoXRmGMSod/Qm4Cgu59Lc=; b=jmedjAiFNWJUGHsz2FLYBUeBJReHbcCmem0VQMrnjopSsCL/lp7lo1mVVccHrUEFU/X4SH4JwhOG3uB3Ge10kRjRCvlwc4/k+/dWMzC1NCVG+QyguG5f6aVDlhkFZ48Dt3EkDx4jnvwpqpHrZiOjGCtBBuKD1wD+8PeKAMYNeKXYUv77Fj38C8qkjeqlZkLWioazNWwMqGa/OCeWrcX9mEPgdFpas9pHHy82vuW+ooiVRaHjRcovR14EbS5K+c36qtoJe1jvUf3FpAwwbiufz3221oDXc/gA4FUiWTiPFmL6yNifupEVlqObbXZXoXpgnlLMXjSVaUX7w1e7a1lz+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IBseHXtsEi8cy9wEMlhj2xUoXRmGMSod/Qm4Cgu59Lc=; b=j665piqw84MucmTKb0FEVBtdKUIiEZRGq0nT9ZT4j178MsLm6VN7sToMdxg3FbBw6M/ZklXfpKLGL+XGt5oFwnzPAEX1gNKCSKsinqT8uwlDmym9dB2q4m9CSM290rtXMpguNuDYHsxQmnM0Wd4N5QwLms8wOo/2IK4PmS6AZrU= Received: from DB7PR05CA0044.eurprd05.prod.outlook.com (2603:10a6:10:2e::21) by AS4PR02MB8696.eurprd02.prod.outlook.com (2603:10a6:20b:58f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Mon, 17 Mar 2025 17:13:08 +0000 Received: from DU2PEPF00028D0C.eurprd03.prod.outlook.com (2603:10a6:10:2e:cafe::29) by DB7PR05CA0044.outlook.office365.com (2603:10a6:10:2e::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.33 via Frontend Transport; Mon, 17 Mar 2025 17:13:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by DU2PEPF00028D0C.mail.protection.outlook.com (10.167.242.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Mon, 17 Mar 2025 17:13:08 +0000 Received: from SE-MAIL21W.axis.com (10.20.40.16) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 17 Mar 2025 18:13:07 +0100 Received: from se-mail01w.axis.com (10.20.40.7) by SE-MAIL21W.axis.com (10.20.40.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 17 Mar 2025 18:13:07 +0100 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Mon, 17 Mar 2025 18:13:07 +0100 Received: from saur (saur.se.axis.com [10.92.3.10]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id 41A3CB4 for ; Mon, 17 Mar 2025 18:13:07 +0100 (CET) Received: from saur.se.axis.com (localhost [127.0.0.1]) by saur (8.17.1/8.15.2) with ESMTPS id 52HHD7DJ3666760 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Mon, 17 Mar 2025 18:13:07 +0100 Received: (from pkj@localhost) by saur.se.axis.com (8.17.1/8.17.1/Submit) id 52HHD7Wl3666759 for openembedded-core@lists.openembedded.org; Mon, 17 Mar 2025 18:13:07 +0100 From: Peter Kjellerstedt To: Subject: [PATCH 2/3] devtool-source.bbclass: Do not create annotated tags if tag.gpgSign is set Date: Mon, 17 Mar 2025 18:13:02 +0100 Message-ID: <20250317171303.3666709-2-pkj@axis.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250317171303.3666709-1-pkj@axis.com> References: <20250317171303.3666709-1-pkj@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF00028D0C:EE_|AS4PR02MB8696:EE_ X-MS-Office365-Filtering-Correlation-Id: 194d13b6-8f55-47ee-c7df-08dd6576fd26 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: B9oNnf8sdD2kr5wzAHfm8GhjaUbuGSiBY7q7Cn40RDO4MOOlnZ3hrEzoTym7bwaPapARsdGOuXhA+NSy2KpT7accKb90987wqTdcxqHFSuAEIknwC2xIuIeVkZF4hWOV1rVy/nrwgm9HmxDFWN+7vlJ8M+972BsT2YGY3CPZlWsjlQVKu0PdOTTKniWEUpMdO6iEEudFJ4okyGN8Ho/u+tl7EPLf0t3BuoCYn36JDT/HHgYNMM7tcLz0An6NIJco0Whhn0uwwZwDb9o5k67po5WyyATxk7KMLZ2O9F3yLYDrdJXs66uXxO3UFio2+TAqljKNZCPmPftuk+qnISsINm3gk8OMQHiJcdAfuOrrlFJX691iFP9xXDMMHbXRorpw/4n09iIo3RaRxHapynCwjDvv+dDqponEMsdHsYltrsGG12wrm3+jnOeHIGVrp3B/kBaztMiRTizBo8/vl0jFi+ro6SZfOc9MMdZUf9Ry9VJhmMKPqSygmc88Ek5XmBdiYnUbspgmkFGVyDsBbFQEGrd2rmBujDucRR9uexK/e7afyiYLt7lHqlgtV+IXYzI0Azq53VhBeAZHV07uLzkZq+Js+3rGDEZzn2NlCucipWLh1kZy1/ZoGAN5Jni/ayZ73b0fnWMz9n8frQeawe+PbB4gBH8FBMYhTf3Fr1PA+tOJtm4Axa2688suUEZnABN7ZdCODQ6x7DiNPLdCYZIpeoBsz5aKvu9OQVNu3gRdbc5z9M1+7Ys+ce5KeMF8RaKlLpbOXoqGpS+SaLIemjnbKaEMgpUshdYXAKlepPAwvHwZdrRGshXdFIRU3CbwM++IUNjK+pnMFdh0sQT2rrRGh0CI3e03+E6b2pzdXU7nJEwibMSS/SjE7+E8f7pG1hGIuiWshA6kyn4W3cVCH4Z+zYoBVAeD5ZZQ+wB//O+/2+s9g5SAcAW2C8FEVrHrRJCxEztIhd2xvOdRFez9cIJBIPwI0Q3IC5WsUE75shvkkHIH9cvkBVj6VkkXKnM2fzQSnNcJXYtFvnAFxo63ObEgETiiXv7n1cC5lNdrFXBF7uBsaWL7GHXTXS9CQL+gXYnthSqS9lx9/1N/E6HjjPLnnuxi4MgHh6U/KhZ8w5SQmrv4nVDHeJQSjh/PiOupnG3qnP48q34PPKm4QmTWB5stPdTa7ktTJIUYRGdGNsi7OSZHpFo1yVQtS+Us9lDQ/jcwLvNOM8dTsNd1Dj9p9xahDrDQ0ujFQv+hqswPaEulG4xF0ylQcgbezFEqTSV9ouDi9hI8hH7GPGqrhKJgOJ2lI6SyA+55YJZX2poQubHaaCgPkWxcYELA/zUOF4PRg4xaBbsjvcUE3k59d+NfUQK/lGA1KH5IeCZCDxJ3l7b7M5rdeFkIJ6vPtlRHb5Q1ZP3ED1X/HMVDKQsbYOpI4RQQguCv3F/8ZDHwPcl/RlEmS+aTQ1y8tUG/Z99FKk4hb4aPWqfs3GwK1QnxauCloNUhaQ== X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2025 17:13:08.3576 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 194d13b6-8f55-47ee-c7df-08dd6576fd26 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: DU2PEPF00028D0C.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR02MB8696 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 17 Mar 2025 17:13:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213117 If tag.gpgSign is configured in Git's configuration, then creating the devtool-patched tag will fail (if Git's core.editor is not configured) or it will hang (when trying to open the editor). This is beacause tag.gpgSign causes git tag to create annotated tags. To avoid this, specify --no-sign as argument to git tag. Signed-off-by: Peter Kjellerstedt --- meta/classes/devtool-source.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/devtool-source.bbclass b/meta/classes/devtool-source.bbclass index 3e24800dcb0..9762003ba75 100644 --- a/meta/classes/devtool-source.bbclass +++ b/meta/classes/devtool-source.bbclass @@ -179,9 +179,9 @@ python devtool_post_patch() { # (otherwise we'd likely be left with identical commits that have different hashes) bb.process.run('git rebase devtool-no-overrides', cwd=srcsubdir) bb.process.run('git checkout %s' % devbranch, cwd=srcsubdir) - bb.process.run('git tag -f devtool-patched', cwd=srcsubdir) + bb.process.run('git tag -f --no-sign devtool-patched', cwd=srcsubdir) if os.path.exists(os.path.join(srcsubdir, '.gitmodules')): - bb.process.run('git submodule foreach --recursive "git tag -f devtool-patched"', cwd=srcsubdir) + bb.process.run('git submodule foreach --recursive "git tag -f --no-sign devtool-patched"', cwd=srcsubdir) } From patchwork Mon Mar 17 17:13:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 59280 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 9ABD3C35FF9 for ; Mon, 17 Mar 2025 17:13:21 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.89]) by mx.groups.io with SMTP id smtpd.web10.58469.1742231592655450449 for ; Mon, 17 Mar 2025 10:13:13 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@axis.com header.s=selector1 header.b=OOY7K+qw; spf=pass (domain: axis.com, ip: 40.107.21.89, mailfrom: peter.kjellerstedt@axis.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gNFMKG3rtCsU0qXPKa50FGzqxJYYUGQ7tWtUgZFD6rKDH0fo8hkpZhN1H/qfebaK3IHZX1G2bnnU3LL2+h5TCAgBiMD0PiKcIxLBcMwyoa2OSSLgRIRRwtCCWBFh5ktrecRcfGGku4MI/K//Rg2Dy0AAJ/bCd6kCS/X7m53D1xpU6uR1VRHqaudQ63rLOExAE+DxY4fZo2MV35tMkmanP2oh2m6vEHg6Xf8tHq7x6w5B5JR59LpeAS3qRKutHKJD8kedRn+J1YQFYQ1xo9agPwGrm9GMbQTYvG9H9FIby62AqJ9qZL8Mzv+/7Cy9Nht4KdXVe+4XeNbwWrn+lBsZpw== 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=j00Ii8F+ZaA4tM5fFzgiF5upaWxU3HdXi+Dd5M6Q9YE=; b=U9Qts0qvTMGpM/7UVk+DW09nX051SsnfXSPGKUhNCvQOAxb2NFWvQaBQXjZTGd1W9AtRMsYhHtMRugDvWn8EkUId3g3zDXLm+ERS1vDJnkfv4EYLjn7hIgBSL0Oa0XkjeUyGleK8t0gnn7BCTFmh+eq3rPTSKJhRmleDSnNkJSuy3vmHBKCVOtesGthkrF7UbAUn+TJbvfmngcQXRQxGoh1jkC6ORHWFsm3TvEAfnKLSvTl6lIBE+4efLcxPiO612JT66/qzkBynJo3noxoXnDvxRc58k6tFYgoWQOCcdgIm65HsGkPwwODktGlwa2nHU39DkMN5bmh3jEmDW8ubcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=axis.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j00Ii8F+ZaA4tM5fFzgiF5upaWxU3HdXi+Dd5M6Q9YE=; b=OOY7K+qwBZSj/Zdnj4iP5aTuxDDIvfnhvPGmhw5jpOM6MjMKfj2rnz9efEtUmAgdjgGAS11bpiu5TYByRgJSEC7rF6YVdsuwseRkbgqli9lIo/tlNxheX4fCcfR4lq7KdZFtGX22i4niY0VZFy1qT9O+NuWXdaZjOdGU0Pswpqk= Received: from DUZPR01CA0192.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b6::15) by PR3PR02MB6346.eurprd02.prod.outlook.com (2603:10a6:102:7b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Mon, 17 Mar 2025 17:13:08 +0000 Received: from DU2PEPF00028D01.eurprd03.prod.outlook.com (2603:10a6:10:4b6:cafe::bb) by DUZPR01CA0192.outlook.office365.com (2603:10a6:10:4b6::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.31 via Frontend Transport; Mon, 17 Mar 2025 17:13:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=axis.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of axis.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by DU2PEPF00028D01.mail.protection.outlook.com (10.167.242.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Mon, 17 Mar 2025 17:13:08 +0000 Received: from SE-MAIL21W.axis.com (10.20.40.16) by se-mail02w.axis.com (10.20.40.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 17 Mar 2025 18:13:07 +0100 Received: from se-mail01w.axis.com (10.20.40.7) by SE-MAIL21W.axis.com (10.20.40.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 17 Mar 2025 18:13:07 +0100 Received: from se-intmail01x.se.axis.com (10.4.0.28) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Mon, 17 Mar 2025 18:13:07 +0100 Received: from saur (saur.se.axis.com [10.92.3.10]) by se-intmail01x.se.axis.com (Postfix) with ESMTP id 63993328 for ; Mon, 17 Mar 2025 18:13:07 +0100 (CET) Received: from saur.se.axis.com (localhost [127.0.0.1]) by saur (8.17.1/8.15.2) with ESMTPS id 52HHD7Ci3666764 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Mon, 17 Mar 2025 18:13:07 +0100 Received: (from pkj@localhost) by saur.se.axis.com (8.17.1/8.17.1/Submit) id 52HHD78r3666763 for openembedded-core@lists.openembedded.org; Mon, 17 Mar 2025 18:13:07 +0100 From: Peter Kjellerstedt To: Subject: [PATCH 3/3] buildhistory.bbclass: Do not create annotated tags if tag.gpgSign is set Date: Mon, 17 Mar 2025 18:13:03 +0100 Message-ID: <20250317171303.3666709-3-pkj@axis.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250317171303.3666709-1-pkj@axis.com> References: <20250317171303.3666709-1-pkj@axis.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF00028D01:EE_|PR3PR02MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d44aca3-ea7b-4435-c93d-08dd6576fcf5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: r6wBdK1lEPTtrBTDK+jRhvpwf29xkZRjPoYN4YSsHxeo8hqgufXsxnRnGPQVog8DBvOpolaZD+hAEsjsunXdDnA/OvnOVKHxyBMv61Eawxwez7bypKHpPFm7bb9MwMeKBzB8X51yB/A7Zv55IkQyblVtJ5lehPqo3DEQPTeEpslmX7jcpRldV3pky9T0Brjoj2TfWFozJ/86ISxlCuQna41vcqR8tx4kbBgtgicaBjD+Af8wJNTj5UUHkeaLGVP/Fq6edW4FiKbQ1lXB38oxaKTuu8NiFVZwm5Z3VQUazr7hk2jeojpjf1rI1CMOyCJD6Uqrd6tCHW5OeNAPzhA06D2Xex9bfXmBow1FSBO8zVDEkjxlrs4V1IVJuziqST1CJP9JgvDnijgi9p7IzFISF6IRzj6oQxKMFCaBUcJ4b0T+AUMzjSwAGMCx8P2ORBHjRPJnoKURSeJ3haQ7tYut3qNkkZlJDBsVNixBx25LlzIY6gOLpWvYulgprbymqAxCi2QSGc32R3MT3UFQJXXnc8VzrU6uAj+jjnM+tJWJnzgcWbDwRuIFtRQIMSk93D0aBSPA0xW1V+XecdQO+naKpAWr2kbGycT2YmuN9sanigK1iH7o3XIDL4u4oQ+c3CmBYAEDJnkWcUvjGCFbuXnZb2Xb//wT9xCkDvSVdxWvS04Drbeb7IIuWV42K2IW4EVHnBM9V67Cy3RAWHPHUjJFkzOzoKaT0PZOMGEmd/tpmI9kdKER3s2mGb52yrC41GOpGR9DxO8tRjjqLmc5FA1qtXH6KnsuB5JxruObyEzt7yp9ONVmPGrSKw+GtdQOtFnJYudK5Db73HFboEnchSJ+MU9Wai/49f0g6CKzb1SNKtITM+N6ll6/mCac/dAfnm7cjXeUXd0tat8vhDKazf9EGpjNlkU8kT/58KX/PZXzlVyiBEI9yzl1eqqYrhofblPNAhXOwu6321+edQSgrsTf4qjkIfjrjUSUBmNVrqy3f7QuuQILI41vN03bZ9Qn2J0fs/SFtTY5LGH+5JwlweTuOmhM2mXbEkRB+hGaeVrCRFFiQl2fmh+38GsWJckn5NvF8qnsPbEQr97UbTTTlCXD5mWr0+kAQiyX9uj//fEKR+7R0h988DZm/hVug1gT5DZVvfsOo1h6wt0Q3f28mEY5vBivXXAyPnTIV1UFY1juucau7tSJhvRZ6/0XBiwNSdg8OzEfNlacL/K5WhE5L8pVC3MjahfoIqjug3D1SWblWWN91RrFEJxmNccaMzYAZWN4X/jb4KU4Gg7XBsbQCEki91WpXawSIXOp8eVBFuBaFVHPk+xv1juXQ5PwzYGcNhtEdPrsYJkQhZv8qQldhOtlIqruGbdoAxrqS7qxwkoC3DG9SOjNDwSFAkIG2DI7wwxjh0FoTuTv6QtQZGfky64f+tVv80U74ueHxe/n/uJqfNsX66JtR/4dAsbyEKd5jxhVMrC35tr5d/3ZrNJFkgILPrq8iyfW/Vqg38wU3AG9TnY= X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2025 17:13:08.0366 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d44aca3-ea7b-4435-c93d-08dd6576fcf5 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: DU2PEPF00028D01.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR02MB6346 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 17 Mar 2025 17:13:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213116 If tag.gpgSign is configured in Git's configuration, then creating the build-minus-X tags will fail (if Git's core.editor is not configured) or it will hang (when trying to open the editor). This is beacause tag.gpgSign causes git tag to create annotated tags. To avoid this, specify --no-sign as argument to git tag. Signed-off-by: Peter Kjellerstedt --- meta/classes/buildhistory.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index d735dd5fb5d..fc8b7a9fa45 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -861,9 +861,9 @@ END if [ ! -e .git ] ; then git init -q else - git tag -f ${BUILDHISTORY_TAG}-minus-3 ${BUILDHISTORY_TAG}-minus-2 > /dev/null 2>&1 || true - git tag -f ${BUILDHISTORY_TAG}-minus-2 ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true - git tag -f ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true + git tag -f --no-sign ${BUILDHISTORY_TAG}-minus-3 ${BUILDHISTORY_TAG}-minus-2 > /dev/null 2>&1 || true + git tag -f --no-sign ${BUILDHISTORY_TAG}-minus-2 ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true + git tag -f --no-sign ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true fi check_git_config