From patchwork Thu Mar 10 18:50:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12776850 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 6E881C433F5 for ; Thu, 10 Mar 2022 18:50:43 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.44]) by mx.groups.io with SMTP id smtpd.web12.590.1646938241868373318 for ; Thu, 10 Mar 2022 10:50:42 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=wX5rEWOb; spf=pass (domain: siemens.com, ip: 40.107.20.44, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JQbceGLGmwk212IOpxgLskLywqpyQdDSDsvZs0z6ZtA27G8PsKCGFTT+Y7f/caeN/j/WL54Gj1hYjBtAEq8tz1SIaT8gwEf5PYmWG9Bj1eIfzapuqhP+J9jscfguJXishaNeT7Z/ca7n4atN2f6iFQ/yf89O8CSw6yq7JOtVH4JlgldvDXaiEbQKH53iqihPkBzcXwRu+L4QC/CfHZ60lUoVmKnfmCHXv4wRwdZkDQPErNe0rri+L+83dusJRqa1zKzhXMMkoZXxTusg4mv+9jaEhVGvSs4cPt482R87z0J6Tn/54XBS6Gx4qbpvIAJdb/J96PsYz0JRcHcooSiZcw== 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=svvcICe51JimtmP8y7tthZhAOCIbmO973wUYGuQzL3M=; b=dQYDrveZE+CEkzsKPswsNQGuZca5mv9WZBfq9coN06beo9N7d+rePLJ4B4hIwfVhVccx52Zob3ADaWZFJM8n2loUI0bFcfwR0UIe6HnriNGp0YPdcX86VH/0fAHLqiO637dL7zLSwT/Hcmru6oXop82S/yRDnabvmZbF2sUWVVbwOzPSjztqVd6wv1zdKUwl9q8V4AWPFML9KQgS01pPqHb3OKDKrP4ExW0DiNJbfWTdxZm/quHcwOqr68fnzCum1dKJToBQmRWDmYx3rCSmOVOosNZLxy1wSalZF+z5io+6uvB8o6pLaRKLrrPZbIavICvm5smP6vaQq596aQ9R8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=svvcICe51JimtmP8y7tthZhAOCIbmO973wUYGuQzL3M=; b=wX5rEWOb5KdAa6LCgZesAxSBsGeB7EuvB2y10ipmwy9OYHfufBSiXH4exEiXZvQzDJpdNlEkqt5KnAovVV6/EHyhZ79otvcrc6cln+bHBiJUIP//cCh2TwN7CzXBtSijiUgTBi7KNfH93ABtCvaud15LQz/u1OBZoZNWoBUDspyl2XcPF5l1tkdRdaA4W6eC9lkgJLpE+YQUAq9SInyGKTNqt1kHYTS1YJTkXLN+YXm0ajrJpnMGttYqANj/sY7FvW0mpCL0BT8U1HpxhlPuXT86d8InOOzEMVET+gTT/LhD3NVZUAsYl+LEpRI/B03iKckWE9joFmzpcPVrlgTQYg== Received: from AS8PR07CA0010.eurprd07.prod.outlook.com (2603:10a6:20b:451::8) by VI1PR10MB1776.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:802:33::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 10 Mar 2022 18:50:38 +0000 Received: from VE1EUR01FT018.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:451:cafe::bc) by AS8PR07CA0010.outlook.office365.com (2603:10a6:20b:451::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.7 via Frontend Transport; Thu, 10 Mar 2022 18:50:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by VE1EUR01FT018.mail.protection.outlook.com (10.152.2.221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5061.22 via Frontend Transport; Thu, 10 Mar 2022 18:50:38 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Mar 2022 19:50:37 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.0.196) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Mar 2022 19:50:37 +0100 From: Jan Kiszka To: CC: Quirin Gylstorff Subject: [isar-cip-core][PATCH 1/2] Drop redundant SWU_DESCRIPTION_FILE assignment Date: Thu, 10 Mar 2022 19:50:27 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.0.196] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42dd2746-742f-4e02-1979-08da02c6de60 X-MS-TrafficTypeDiagnostic: VI1PR10MB1776:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gCxXUW7I75wjEtYn2LTx66eJF8J3iLCZic/onSeYcnR71abgrxKxqZAjdnXJ+4XvN52ZCuZ1OAR+HmVhFCL8+U811chMbbCxZ5Pqly1u90XqVbaMGk5eGSt2YaH9MtE0J7ANeT5dC2rotLieo6p059FacFUPQJ0/m4P4pkxVJNijqvUn3hi4p53I9vAVbGkbE7/nn3pXQgPT5ghi1iTGwrEVsD31CJNLg9jxGLFyLjJext6seqGliAyZqqCiAnaWS/905L2+hL0WJ6pRd3KaJZpzCcc1L41cf4lQ4vHuALM/R7YOVvYwY5Ka7OWx00BKdOUl1y/6yJaDgfAkDhHuWsZdy25nYrdzB/YXH4WD6381KLIqpycEjdhzOuZZyYTb8T8NL5egLUD7HQ3K3Ya6P6sSdDKQIqspsOk3eJLbA49ImVGRjafjZbFPfYka/s13CqWkKFiG9tvDTibWf0kyTxBdymRhZC0B8WdMgBsoLKhmc4x5iEzP4BnGRivEh0TJrm2ibgMjKWohZFI3GSl5K9yubR37Gk6j31ia9LsJgseI8zClBfb2VO7lchMJd+4fE5LQQDm9gJCii3xAfJ/1aJQJHppNdydTGDT1iEut37hNq/cRg7igGeaISQq/0gDuwF0sVlpvou6e9kJXmYyKvzvcjuwY+wGNaC7/53DbV8UgK4P257pH2q4XjNRXJpS3BPimhO/D9TZk4y41zNlEQA== X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(8936002)(2906002)(4744005)(6916009)(86362001)(70586007)(44832011)(6666004)(82960400001)(508600001)(316002)(36860700001)(16526019)(956004)(2616005)(26005)(186003)(336012)(47076005)(356005)(82310400004)(70206006)(36756003)(8676002)(5660300002)(4326008)(83380400001)(107886003)(81166007)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 18:50:38.3497 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 42dd2746-742f-4e02-1979-08da02c6de60 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT018.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB1776 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 ; Thu, 10 Mar 2022 18:50:43 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7690 From: Jan Kiszka Already set as default in swupdate-img.bbclass. Signed-off-by: Jan Kiszka --- recipes-core/images/secureboot.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-core/images/secureboot.inc b/recipes-core/images/secureboot.inc index b619b50..950b41a 100644 --- a/recipes-core/images/secureboot.inc +++ b/recipes-core/images/secureboot.inc @@ -19,5 +19,4 @@ TEMPLATE_FILES += "sw-description.tmpl" TEMPLATE_VARS += "PN ROOTFS_PARTITION_NAME" -SWU_DESCRIPTION_FILE = "sw-description" SWU_ADDITIONAL_FILES += "linux.signed.efi ${ROOTFS_PARTITION_NAME}" From patchwork Thu Mar 10 18:50:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12776851 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 5871BC433EF for ; Thu, 10 Mar 2022 18:50:44 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.70]) by mx.groups.io with SMTP id smtpd.web11.585.1646938242699546962 for ; Thu, 10 Mar 2022 10:50:43 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@siemens.com header.s=selector2 header.b=b0wLOkbO; spf=pass (domain: siemens.com, ip: 40.107.22.70, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U7b32IglA78Rx6ETpRE1PI4KVjfWOg0Dn9j3baOxlnDuzqr6CXL8ipSOIaqVHEK0k3m++BRxy5cWQJgjpvLxaXZMwT64NlvhrZt7MpnwSyS1iJSLTPasB/ybpvOIeyLjLmAR4BA9fvqCZXsEIZZ50X07saGrHd+WRQvEpKGqOH2C14+g12bqL2FlVKNgbFTB5tqD3qVhF++7fTSY04Gp/7yqmNSOOEeUfpJxUM9PMhaxZzzzCkhKgFbXr+1zU/Fmo/3fIgo32KJykaqSuKJfjrkEeihHy/x3H46LxZfdVqVCna26WM+uWk3HwmvVoXWTmsq0FSq277rgnmgdMyct9Q== 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=vthh/u10s+dyo2U5QgPwjbk5D2VeA1DlgftMpC87JgQ=; b=aF89vj9UwfvNgK7U01YNuDPfuomzzajgb2P3M1gpQo3ZcfKHmLTm3mP2LI1Yyi6JVb6sfNSre2Y0abBFBbHMclrKiYQ/pmQ4nIF6zK5Tjes5805/si2bbPLedoTXnEa3mjX0AHCzlQUnMAzN6iWYHcbSwNqyg9Ixnysl3J6nIMiCTvYBEyvyY2dtrwIYzkCok+qtO30gb/3OMGTwKXkrg/R+kif34XHiBM/Tzzhwbh2sztNz3p//6tMCo8axurb1JWawwJ9nNs5jrj+vmXddlumXYVScQxnG6FvOChkBmhnCai5mVPr8sdoR+Q+SRE24+vQnXkapfhF/ybzWpebcvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vthh/u10s+dyo2U5QgPwjbk5D2VeA1DlgftMpC87JgQ=; b=b0wLOkbOB4YFyIc5V8V3dH7oO/XS6miOLiVTq85h5RbAFhuNfm9VrEJDUNKOeUDUXdmrxpVKSOa65wzHUktnjLsft8DG9tIHQYLC5Td0zkZAsNIP/Y1yfnz8grNnwety4CRJ2nWN/84adwEMdOTbGQVEx2e/a79+xfVDOZUVx3nm3giRZKyhFl3dPrpmO5T1z08ZGqkAuA9MT72QB95lX854YZXf67Ve9n6vP35d/rsX/npBCTBVBcqyytI8ZKren5PZudL8Jtj09CtaW5/XWfU8q2Agnp414yOOIvg416rFwrYzNrHxXNjREUjL6X+U7jX1n1ZU5mvVrRzYow4FfA== Received: from AM3PR05CA0101.eurprd05.prod.outlook.com (2603:10a6:207:1::27) by DB9PR10MB4700.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:261::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.15; Thu, 10 Mar 2022 18:50:39 +0000 Received: from VE1EUR01FT016.eop-EUR01.prod.protection.outlook.com (2603:10a6:207:1:cafe::21) by AM3PR05CA0101.outlook.office365.com (2603:10a6:207:1::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.22 via Frontend Transport; Thu, 10 Mar 2022 18:50:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by VE1EUR01FT016.mail.protection.outlook.com (10.152.2.227) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5061.22 via Frontend Transport; Thu, 10 Mar 2022 18:50:38 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Mar 2022 19:50:38 +0100 Received: from md1q0hnc.ad001.siemens.net (167.87.0.196) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Mar 2022 19:50:37 +0100 From: Jan Kiszka To: CC: Quirin Gylstorff Subject: [isar-cip-core][PATCH 2/2] swupdate-img: Add support for automatically compressing files Date: Thu, 10 Mar 2022 19:50:28 +0100 Message-ID: <6e5722e86c9ddf733464c7484158555df707cddc.1646938228.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [167.87.0.196] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9019a81-6c61-495f-f104-08da02c6de8d X-MS-TrafficTypeDiagnostic: DB9PR10MB4700:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 48vDDC8JLGyoUOedTBdPXLb+afcjrt5luD6UjABJb4fgMA+vD94tDGTX778WAtESD75qM/U2TWhGJjf5Ra9c8mCMoaZznL03RlRfYApo2ebrIl84pefdi0x9Qo4Gsf05ig9VhcEYQ88V3lNPSeA61l6ufWXu60lTbzNdT1y97MxOlk+z/+Sk/fhF46EYuf5WNfiTq06duxKGjstFySYHSPj+ouc+fik2XlewSct8OvQLwNEGxSFZlWITQ70ymu+QgQexky2FVssogNcdVbbEAxysdGY2JN6nXoo1lyDIUxii25PsoG/BSw+IrJBtJNZsU/AEkg4jGii3gYg8M0yjWT0wzYwvwYM8HdYWL4Bg8WjD1c+5MzhsYh2e/9ic5N3typzjzQ3vlB2czdnkI1yKxKFQj5u7EE06NX6lNgIr7ley3ZRON2dM35MUpLeS5OsyNtgBF9b9/ww/WrjFQGoZpDF+VqF8922Xchxksdhjr8TIXYxPqeY1TSZpgxAVMFZWuoK2t+xkrVhDmGHwThkaSnF4tVIwxm2oTpaGdWYFFVkNtG532PIuv6suP4HtSlwxXUSc+oyZCxgM6jYtzDCyLRhLj+fJxW10mO6iRq8rJjJBDG4xMRxHtFZfpQSBqIsIhZ+aYlhqkMvNlLZbMXeFT0g3KxtmZJasvPs2D3M/HWVAQ1VZEO+dXxJCTA9b/wChUqJwWv+qj6cGp2KV4+AZZQ== X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(6666004)(8936002)(2616005)(956004)(8676002)(107886003)(2906002)(4326008)(70206006)(508600001)(5660300002)(83380400001)(36756003)(86362001)(26005)(70586007)(316002)(36860700001)(186003)(44832011)(16526019)(6916009)(82960400001)(336012)(7636003)(7596003)(40460700003)(356005)(82310400004)(47076005)(403724002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 18:50:38.6502 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c9019a81-6c61-495f-f104-08da02c6de8d X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT016.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB4700 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 ; Thu, 10 Mar 2022 18:50:44 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7692 From: Jan Kiszka Automatically gzip files specified in SWU_ADDITIONAL_FILES if they end on .gz and there is an uncompressed version (without .gz suffix) in the search path. This obsoletes the extra compress_swupdate_rootfs class and makes the usage more convenient. Signed-off-by: Jan Kiszka --- classes/compress_swupdate_rootfs.bbclass | 21 --------------------- classes/secure-swupdate-img.bbclass | 4 +--- classes/swupdate-img.bbclass | 15 +++++++++++++++ classes/wic-swu-img.bbclass | 5 +---- recipes-core/images/secureboot.inc | 3 +-- recipes-core/images/swupdate.inc | 4 ++-- 6 files changed, 20 insertions(+), 32 deletions(-) delete mode 100644 classes/compress_swupdate_rootfs.bbclass diff --git a/classes/compress_swupdate_rootfs.bbclass b/classes/compress_swupdate_rootfs.bbclass deleted file mode 100644 index 2a01e59..0000000 --- a/classes/compress_swupdate_rootfs.bbclass +++ /dev/null @@ -1,21 +0,0 @@ -# -# CIP Core, generic profile -# -# Copyright (c) Siemens AG, 2022 -# -# Authors: -# Quirin Gylstorff -# -# SPDX-License-Identifier: MIT -# - -EXTRACT_PARTITIONS ?= "${IMAGE_FULLNAME}.wic.img.p4" - -do_compress_swupdate_rootfs () { - for PARTITION in ${EXTRACT_PARTITIONS}; do - if [ -e ${DEPLOY_DIR_IMAGE}/${PARTITION} ]; then - rm -f ${DEPLOY_DIR_IMAGE}/${PARTITION}.gz - gzip ${DEPLOY_DIR_IMAGE}/${PARTITION} - fi - done -} diff --git a/classes/secure-swupdate-img.bbclass b/classes/secure-swupdate-img.bbclass index 1715c8a..330f619 100644 --- a/classes/secure-swupdate-img.bbclass +++ b/classes/secure-swupdate-img.bbclass @@ -21,12 +21,10 @@ INITRD_IMAGE = "${INITRAMFS_RECIPE}-${DISTRO}-${MACHINE}.initrd.img" inherit verity-img inherit wic-img -inherit compress_swupdate_rootfs inherit swupdate-img SOURCE_IMAGE_FILE = "${WIC_IMAGE_FILE}" addtask do_verity_image after do_${SECURE_IMAGE_FSTYPE}_image addtask do_wic_image after do_verity_image -addtask do_compress_swupdate_rootfs after do_wic_image -addtask do_swupdate_image after do_compress_swupdate_rootfs +addtask do_swupdate_image after do_wic_image diff --git a/classes/swupdate-img.bbclass b/classes/swupdate-img.bbclass index 7b7154f..97e833e 100644 --- a/classes/swupdate-img.bbclass +++ b/classes/swupdate-img.bbclass @@ -24,6 +24,21 @@ do_swupdate_image() { rm -f '${SWU_IMAGE_FILE}' cp '${WORKDIR}/${SWU_DESCRIPTION_FILE}' '${WORKDIR}/swu/${SWU_DESCRIPTION_FILE}' + # Compress files if requested + for file in ${SWU_ADDITIONAL_FILES}; do + basefile=$(basename "$file" .gz) + if [ "$basefile" = "$file" ]; then + continue + fi + for uncompressed in "${WORKDIR}/$basefile" "${DEPLOY_DIR_IMAGE}/$basefile"; do + if [ -e "$uncompressed" ]; then + rm -f "$uncompressed.gz" + gzip "$uncompressed" + break + fi + done + done + # Create symlinks for files used in the update image for file in ${SWU_ADDITIONAL_FILES}; do if [ -e "${WORKDIR}/$file" ]; then diff --git a/classes/wic-swu-img.bbclass b/classes/wic-swu-img.bbclass index 3a09721..5e6de40 100644 --- a/classes/wic-swu-img.bbclass +++ b/classes/wic-swu-img.bbclass @@ -9,12 +9,9 @@ # SPDX-License-Identifier: MIT # - inherit wic-img -inherit compress_swupdate_rootfs inherit swupdate-img SOURCE_IMAGE_FILE = "${WIC_IMAGE_FILE}" -addtask do_compress_swupdate_rootfs after do_wic_image -addtask do_swupdate_image after do_compress_swupdate_rootfs +addtask do_swupdate_image after do_wic_image diff --git a/recipes-core/images/secureboot.inc b/recipes-core/images/secureboot.inc index 950b41a..3e6eef8 100644 --- a/recipes-core/images/secureboot.inc +++ b/recipes-core/images/secureboot.inc @@ -11,8 +11,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files/secure-boot:" -EXTRACT_PARTITIONS = "${IMAGE_FULLNAME}.wic.img.p4" -ROOTFS_PARTITION_NAME="${IMAGE_FULLNAME}.wic.img.p4.gz" +ROOTFS_PARTITION_NAME = "${IMAGE_FULLNAME}.wic.img.p4.gz" SRC_URI += "file://sw-description.tmpl" TEMPLATE_FILES += "sw-description.tmpl" diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc index 2e9094a..c23c103 100644 --- a/recipes-core/images/swupdate.inc +++ b/recipes-core/images/swupdate.inc @@ -11,11 +11,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -EXTRACT_PARTITIONS = "${IMAGE_FULLNAME}.wic.img.p4" -ROOTFS_PARTITION_NAME="${IMAGE_FULLNAME}.wic.img.p4.gz" +ROOTFS_PARTITION_NAME = "${IMAGE_FULLNAME}.wic.img.p4.gz" SRC_URI += "file://sw-description.tmpl" TEMPLATE_FILES += "sw-description.tmpl" + TEMPLATE_VARS += "PN ROOTFS_PARTITION_NAME KERNEL_IMAGE INITRD_IMAGE" SWU_ADDITIONAL_FILES += "${INITRD_IMAGE} ${KERNEL_IMAGE} ${ROOTFS_PARTITION_NAME}" From patchwork Thu Mar 10 19:25:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12776864 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 14D9CC433EF for ; Thu, 10 Mar 2022 19:26:00 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.40]) by mx.groups.io with SMTP id smtpd.web11.994.1646940358445585829 for ; Thu, 10 Mar 2022 11:25:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@siemens.com header.s=selector2 header.b=KjhVFBX1; spf=pass (domain: siemens.com, ip: 40.107.21.40, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fu4Mrehm+0KIfJ9yFsnINMbNRdBvl5O7w8NrC9ydTrrqvaCX20yjxktUH3QLhBV3tBWaDy/RKWQLIsDpptvOFp0Ed/QcdWcZUDXhlvDvxxusmALmF/6K2D5Arf0tSILjOYFB0ZWMFY7amwLmgiTnhcMuTkmJFfePBc+vfbYuyoj2VWLke9heVFDflj2+Ouy/+ntqfRnm65ZF/omZzEhzasKCe2QXSyx2Z95TZlHqcWYXI894gJ0VJtwopjrJBZLsLzuJvBnIBI5RTIk2Kssbn39HEZ3crU1KfOxSLdJCQebpbK0gueiolm3w2WoCt6sHM65C3Y3G3trdHGaoJm3ejg== 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=Ee1x2fPe0ytGUxFNoMQq2WOhdJyfSoLC4389E5kTabU=; b=ihM6DDJEStxK/L/OJlwQLvVqTwWj3B8mvGRfmh/ZU2ZIm4+hP+71uVg7qrWVg0+CJ0MdM3MyaGNdawnMJSs+zwt+F4LlXMxTGkc+rWCr59cThOKZUFlE2ljpj9rGK7vsS28oSFYnq+NYYBrkxU/BS2Cy+k1h1KrJrwUVyG/zOnwBrR4kBJ073zOjTO7AQs/5wIuTZIlrTUFFJpPTf3vov4OTvTmG7xtZ9qXxD76x4qkQrbdYW2m6pHg5RhzlQYM+2+UMsq5FM1kLy5E9DvEzffwploXoqZWeEglDoA9k2RSyCyncyo0Hi2jughpPAqIzZwFELLa2+TF70gklZ3wk3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=lists.cip-project.org smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ee1x2fPe0ytGUxFNoMQq2WOhdJyfSoLC4389E5kTabU=; b=KjhVFBX1dMfk2HdaIpzl5BXg4i7vGDXgOtWLqGhNrAc7okiRCvtKdUWI8jWdotYHHTpn/IRyEx1SwU1+2Sjbhzh3yIHICIqGkHNuaJXaKjCW9DxgcdBAOD5OoTcc2sB4V04qBNSc+5agG8NICSQ8Yg9VtdXO7YExQ7xDlYImGCXbjAL20dKWuwdl92nKnbgXl036dUvQBdoMk/i7zv9NMeld02NUDaxxWFzkhEwTl290PN12q1oZ6bVbp7P3PJOGWwQywSX1Cj+PnjI2ZoBsQHyd+YlmBZZldinE3aw9Xbloxfx6t7qQkwUZTCDixf/vCHnNXwfXw/B7L55i4w5mnw== Received: from FR3P281CA0075.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::23) by AM0PR10MB3154.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:182::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.21; Thu, 10 Mar 2022 19:25:55 +0000 Received: from VE1EUR01FT048.eop-EUR01.prod.protection.outlook.com (2603:10a6:d10:1f:cafe::82) by FR3P281CA0075.outlook.office365.com (2603:10a6:d10:1f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.7 via Frontend Transport; Thu, 10 Mar 2022 19:25:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by VE1EUR01FT048.mail.protection.outlook.com (10.152.3.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5061.22 via Frontend Transport; Thu, 10 Mar 2022 19:25:54 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Mar 2022 20:25:53 +0100 Received: from [167.87.0.196] (167.87.0.196) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Mar 2022 20:25:53 +0100 Message-ID: <145c6730-0b18-5e97-42b3-4dde925d7598@siemens.com> Date: Thu, 10 Mar 2022 20:25:53 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [isar-cip-core][PATCH 3/2] swupdate-img: Use pigz where available Content-Language: en-US From: Jan Kiszka To: CC: Quirin Gylstorff References: <6e5722e86c9ddf733464c7484158555df707cddc.1646938228.git.jan.kiszka@siemens.com> In-Reply-To: <6e5722e86c9ddf733464c7484158555df707cddc.1646938228.git.jan.kiszka@siemens.com> X-Originating-IP: [167.87.0.196] X-ClientProxiedBy: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c485056-b57f-49b4-5ed2-08da02cbcb94 X-MS-TrafficTypeDiagnostic: AM0PR10MB3154:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pDqEJo0n5gVkHpEB3CKbju5Pl0rUoiTPJD+nQBjMZ5mZYxoBKeHySZk1crTjZsaZFQFjesv/56RHh1LM6z8YfDwGB+MKXrnNFiCH0r8f1nU6Fpm0XCsGH9LCLuCmZmvIKwUfcUJ8306lTnebGgzoonnfNH/3vG0oXz7uHWC5vqPNn8coXLXAmU4IQ3O4APCC/KqhgIvIY0acRf3fYIUvAyGVL6ZWBLA5YjSiEbbB1m1JasvlMp/XpIPMlEl2+Q+KUiWzYNuo5kffalJ/Df8HXmqSImZz4hC+Cb5jvHOwL3fvDj1g/oqz3kueOXS4CeMBTP+X0MfYXlz203h8rPeICceChZFfT2FvF/RcLADC5HOPE39fdLWuja6ranAOUhVJV8kYUktZGjiOA7CLdfiUPhuPhgzc/uLRYTiuC1xQ8EzWDUbvsgtjuvdSIj0/ozQ43SyHx5E7C0IGeCSMA7w89BauUHpgNcfjHQKzVksT335hm6B05+f+FWprSAcufteT6By6ZKbh5lLlj0cCuS3K1d+TC8ZQ28gvGifeLvyGifwyyKS/a5rQuAZhWHIHsP51I9r+EDh+HXA3BUKWKWGDbZEApRZYTGAQd03tnqGEmv4fEANEOyUUtWF/Fc1B2ETL25FgccRStYvhQ4Dx2f3qiBrRwrARJmu4kqCh6eyWZ6ep9BqcoI7xqpd0Dseo7V3D6Rb4DOUh5FkC2feF/ngmCNMZpa0JwMvPsl0NnUlXNAeZCWtZB7r2hE/dakc8UcRrXSI+xkaPi3QyRE3+obFANA== X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(4744005)(40460700003)(44832011)(336012)(5660300002)(82310400004)(2616005)(83380400001)(70586007)(36756003)(16576012)(356005)(36860700001)(8676002)(6916009)(31696002)(26005)(81166007)(316002)(8936002)(31686004)(86362001)(508600001)(6706004)(956004)(47076005)(107886003)(4326008)(186003)(2906002)(82960400001)(16526019)(70206006)(3940600001)(43740500002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 19:25:54.2836 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4c485056-b57f-49b4-5ed2-08da02cbcb94 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT048.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3154 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 ; Thu, 10 Mar 2022 19:26:00 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/7693 From: Jan Kiszka Accelerates the compression by using multiple cores. Signed-off-by: Jan Kiszka --- classes/swupdate-img.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/swupdate-img.bbclass b/classes/swupdate-img.bbclass index 97e833e..1437c07 100644 --- a/classes/swupdate-img.bbclass +++ b/classes/swupdate-img.bbclass @@ -33,7 +33,11 @@ do_swupdate_image() { for uncompressed in "${WORKDIR}/$basefile" "${DEPLOY_DIR_IMAGE}/$basefile"; do if [ -e "$uncompressed" ]; then rm -f "$uncompressed.gz" - gzip "$uncompressed" + if [ -x "$(command -v pigz)" ]; then + pigz "$uncompressed" + else + gzip "$uncompressed" + fi break fi done