From patchwork Thu May 23 16:56:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 13672069 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 3C499C25B75 for ; Thu, 23 May 2024 16:56:55 +0000 (UTC) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (EUR03-AM7-obe.outbound.protection.outlook.com [40.107.105.62]) by mx.groups.io with SMTP id smtpd.web11.11.1716483407889131633 for ; Thu, 23 May 2024 09:56:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ly76uznE; spf=pass (domain: siemens.com, ip: 40.107.105.62, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vu5IqiQPXYzU5dKdGsru50YMMNKYEq85Dn30wjeFXUFyGoR55c6EuKzEZpTJrDRkvRYdkKcyKhPH2TxXNDpPIpptIZxHz3JlcddZgJh8f4zCmRJqapkV94ah1TYnvxRqXiMAB3FiyYXmv0pS0WOglLIa/N09GfUqR2RcvF4/1ZT68MRMWFXE8DUzu6DKWoM5pm0KGcsX8thsCJqH5X5PR/hrHanxRjYO/7/bIUeWo3CBSMe3HPzoKLXxRadgdr1FJ3YGJSwcG5iy/s1Bu1+Eisg5vDD4dexVEsqzSmq0rJ+bHztzUI3XSMpLYsVXrbYaJD1BNk8TygYO41eoEJmgsQ== 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=nhcaic44inSXeYi0dZciwtJ+oESZCtWtrT9TwQvX7qc=; b=f8v+5eWzgUZJ32qheVc7lu7pK76/jLycnNAaCpOecOjfLzpl+krMxin5EZcD7gPEBvHitqM24aQ4N+ZUiJG7kqp3hfoMGMn1JGfx7EPZSGE94ys552S4MV2LLqQJT/ei2yTUnS8B9Li1p3nzHHtwcGsUpqxWFCeBkqtheGcIH+oIm5yiJDsZGwyRIXeD9ZYKyVDtQMRa+ZMI9OtDjKcLBnZsanV5eTT5n5YBFNzNJ/6HF4vHbcHqG/G3+m8VJPicjmUU2Eux3LYRDdB4zJUbSxW0H5joDiUgUD8ehwaWBue5RvKhC7kKMizOUrNk6I3FLiqt8X51TKHca0D5O01YQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; 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=nhcaic44inSXeYi0dZciwtJ+oESZCtWtrT9TwQvX7qc=; b=ly76uznEWYHtnyQPQqwt+mhEIZHY8cLX43bgG7BKe47/g13eVqAfUyp4nwhs/fmob/GpCYLktwiDWKG4WbYHyM28SYZuPryeBc5Lt0u85FNlq+vwP+jyJ666UtBsBgJmdw6a3xDMIApVj0EFy6ZMbKMR+CU3vMTYmbmrjOD46xlfnyHmvDQyZ1tligqIvg6sAyHfDgJ9RHHXoYcgQYW8BPRyMRAmtHzrrLNThDen3+T3sgyPsjE/yzIqL0bgD7bqK60CZyneBHICx0oJ5rAx3ECg8HllnBjsCxY4RwxFlSaFXJVwA/aIvXio8MBtZDfnYt9R+JVNqVWHZrDY8q4MzA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS4PR10MB5370.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4ba::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.36; Thu, 23 May 2024 16:56:44 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408%7]) with mapi id 15.20.7587.035; Thu, 23 May 2024 16:56:44 +0000 Message-ID: <7eb6ec4e-fc57-4725-852e-1b1e1fcc1b86@siemens.com> Date: Thu, 23 May 2024 18:56:43 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka To: cip-dev Subject: [isar-cip-core][PATCH] cip-core-images: Make ISAR_RELEASE_CMD available to them all Content-Language: en-US Cc: Adithya Balakumar X-ClientProxiedBy: FR3P281CA0151.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::12) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS4PR10MB5370:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a1eddae-b7bb-4a45-bac2-08dc7b4953c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|1800799015|376005; X-Microsoft-Antispam-Message-Info: =?utf-8?q?mb/L12OdHyJBTacNVI1zlHSnD0OAenS?= =?utf-8?q?b0NsFFDr0IzvTX4d/N81pGFaV3WgKoCGg0/J3ciNTaZiPzS3DmZEdSUg4GMDEEzJJ?= =?utf-8?q?S9F7gnwsv2rj8Tn+eKBfo8krHmut45sh38jN3FNzbT+MR1unPzQ+utCazNBqOkM//?= =?utf-8?q?OJ+VNm4jncj0kx0ZtLFdIdbM5VnOlcmDiwwZtw2cw71aA6Zn3y7DIH2/U0ZhaRCjf?= =?utf-8?q?cF2cWltXxGbadd+k3nR23mOmDPRo1eYym+ZqeXH6deWRXt1CweFh/pMfzaW0zc3FO?= =?utf-8?q?i60pXInekFc6sIYUgPm8Z2RjGxv2vajjeLTZvtPpPzKHhG92F7u7JHHT2zycQLFHw?= =?utf-8?q?r8ja6txQRIEJby1t5j3gPNdLXpknYndseGpEAT1uc+i24fWv/H7gHZb0RuF18LGgd?= =?utf-8?q?30feII8vucnAIXN/CL1AEj8X/EkpJw33TuZO+D/p6dVRW4HvBLvN+d8syJGydsKwC?= =?utf-8?q?Ipgq9Y+O8dW8Cdgz4POjQEPCBiBvXF4LWlHB7tyAkYhCMk83cRNOI7wYnL5XXkQq3?= =?utf-8?q?6zTV7ngtWwKpr9bisJrJdiGEXOsQFgKwwYOAdI6cwX3XtrJYqmRva6+4LSNRCB1Hj?= =?utf-8?q?KmS0udoroPxsXEax4O1F0eXTtCg0WXaGoEa6xHu+u2DuQ8cI0ZTfykn3od9ba3+J5?= =?utf-8?q?leUhy9z168MufAW3rRBrCx8jxkeDikNVZBuEsr7ey+/KAfFmYs0lTI7akuPOm53B/?= =?utf-8?q?7CjniqCAEX+OdBBEHVG7mRlZAQDK1S8ppTqfmQwRHRHZVJ19kMB3zPTJ/UMNAkuXL?= =?utf-8?q?ulJd9T08In/6XvoK6X4KxiFti8wwtGY50rgsI3p21Z9zWL1qVdpEj6VVObN2b6JAp?= =?utf-8?q?EHttMsGySUmScyF1woC+9VjX6C30UuYA4kZr/VEcWCcbTvk1gN8K6bRbpZM1kfpUs?= =?utf-8?q?xHrzqW4WynHA/BXG7Bj2So0jMJHSb5us9At7gAeI11kWkiwsKDKn8ftCviLwCpJh9?= =?utf-8?q?2YgYLSAlikz+YDOPThr84T6OHd1EXITkUjMkL/28pQVJ93DE3ELwrOlnM/YQwmvCo?= =?utf-8?q?7mznSMKejcZ/Lzx/Qt6nETBc6ZYFQRVFfR9gD3/NraFb9i0VWh4JC4thcKn/Ax76A?= =?utf-8?q?/f7OGspOlxdAmLEv9MhwkNjJgxYA6mKkz/HZp6qqhKGzMbcDJ2OLuetFcQJ/R4LLi?= =?utf-8?q?9BcsGnGkv78+YvrUIXykgiOPPIYXTlItlIfaaZyI9ETgN8v6wGWOChTLi4=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?L9/mYPVH2nFdlUJDFZidOG9Hj+wZ?= =?utf-8?q?4/JKez4lQDN0hcbML2z4gG27hGyX/0nOkrLsrJVc2+kaE+3JLz3UVqn1tjifvjimO?= =?utf-8?q?rRjpqftMbZPjllExooldTIrrabKi97YTBKj3jjv3uUMATOJms3BI9wbOh4oBgF1MU?= =?utf-8?q?2WiyvsqKlzXTsQWaDXCQxI67x/HBjyu+evbg7kXXzmR7qbwrOUOoFE3iOAXUxbBx7?= =?utf-8?q?1kC8mU94ADKuXlK2ZJEb6GFezktCKLKvU3cAgvunjpJ0nmaxezJbvrjMyBARUbyUa?= =?utf-8?q?e4RRNkq0Id1X4/oSXsvt7G7ljy4SFhPtX4H5qjkMk1nUgce7S74/kmylC8LUEVNQH?= =?utf-8?q?4Nkloq0ZFNEWHz84jBHXMMz5Z5nC85ylkMwmLZVmY3akFJWCumFtJTFryokjZ5Y5W?= =?utf-8?q?XqPug3XeYkJ5UoVZgnOWeIaZOds7DoBDqWwtnj0SdN2s2fFdBcoMLkjVOtuMh9K0F?= =?utf-8?q?M51VFUcRw8SnLtZwHYKrzVzoHyesT91LjLnqkEOoCNHLGu1Yhyf4VM7E3s0ChIP7k?= =?utf-8?q?HSDcFXNGVEsPcic3aeIL2aPBImo5KeM9PLFdRqQmjL0BNR+YzcUMNbd6MEA0b6C+p?= =?utf-8?q?lJLC4OhHCcrTkoxb1DXipML9SZinTbaDbfwh/mCheCvsH8uUv/bFmx5POytGJ+dTK?= =?utf-8?q?++J/3lrpnfQRHJN5N387VVW5W4gPr2Uv5ktg/DRhhvBrmqS+HZ4a6jcbR/Oga0okW?= =?utf-8?q?NeHIXOl4pjYnPpMvEv0ydCHuj+YSI9OdPQKLGk9/q/dohHValEyT6vKNXEQ2liS2r?= =?utf-8?q?fknORujmPz+P86+3LdBti7/C0R1gZ3ugdvmXnhkrzE3iQxtAcriWVNNSfkKjkF6TX?= =?utf-8?q?EvkZ9IpINswhyBi6AQd5hicD6mZjU/rZ+LVBvd46VnWZfMBPOENDaa8LaYu55knuP?= =?utf-8?q?6an/XgMkyyY3uRm3iA7c8TRUb0RNRjF8P10X9atWSjly9fH6aPMfJvORerwvoF/0J?= =?utf-8?q?ds+7CaxFYljrcSSQKk+W3ZJqNTdhnjbUQre7iured8U/SbyvTRyneWYNCXqQUVEJv?= =?utf-8?q?YL9H+y+0IjNsSYlEzrcoFwU3gjj18NIQQiSATHkVxFvYB3pEjp/r7TkQfg7CvzSVz?= =?utf-8?q?517sTxP+MesS8syNurpYP66EETZOrM4/0U/uH47R34IDGAXjcH5cvlZmhde/1kBcG?= =?utf-8?q?Id9wr6J78TBekieGpxpc9MUiUhrE1VkzKrNN9GaHvIIplBu4KbBZDw97JAymiW3DP?= =?utf-8?q?UpfNp9nTp3JPa3bJR5NNkuMHB+Wqlr2DD29gIYySA4rJ5A3p1M21+7FMzgiI8T+nM?= =?utf-8?q?3OHwzaSD50w80INwzQZgD/7lGhu1YzvL+Ab+Vs+y/0Ulsn5fWX+A5cSzKTs2QBhNn?= =?utf-8?q?bYigiC1t/RUDukN8TfYf+qGkZvIHn6bvZwnwI3Yz+KxGwb6UPt42Oo2tDdi2jtF+W?= =?utf-8?q?lnbxDX0FGZOBA06a6Bg1hXBgV/5qZ3GuAZvMoM1zb41bT47DH6pGObahKFGREgrNT?= =?utf-8?q?AlY4Jpqtx3HpXFqWyoVWd7mP7XbJza8CWwyXgUIzGd1UXGNiFaSCwlAUym4+MMDFR?= =?utf-8?q?ES6hv7c3tvr1x/AjHk8tx09fQwHwEdJ4UA=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a1eddae-b7bb-4a45-bac2-08dc7b4953c3 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2024 16:56:44.8815 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XPtxZrf+zcVDxlvMPxtnSaPEunMtCjQisI9T13UG8cIuMfaFfKX3ypCGfRaEctJ6L1/hkR5ZmSoANyfAY+0sDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5370 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, 23 May 2024 16:56:55 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/15938 From: Jan Kiszka This was missing so far and was also impacting the reproducibility test. Signed-off-by: Jan Kiszka --- Here, e.g., are the reproducibility improvements visible: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/jobs/6923388188 Still not green, though, but not longer rootfs issues. recipes-core/images/cip-core-image-kernelci.bb | 2 +- recipes-core/images/cip-core-image-security.bb | 2 +- recipes-core/images/cip-core-image.bb | 3 +-- .../images/{cip-core-image.bb => cip-core-image.inc} | 10 ++-------- 4 files changed, 5 insertions(+), 12 deletions(-) copy recipes-core/images/{cip-core-image.bb => cip-core-image.inc} (54%) diff --git a/recipes-core/images/cip-core-image-kernelci.bb b/recipes-core/images/cip-core-image-kernelci.bb index 479c14c9..849c0761 100644 --- a/recipes-core/images/cip-core-image-kernelci.bb +++ b/recipes-core/images/cip-core-image-kernelci.bb @@ -9,7 +9,7 @@ # SPDX-License-Identifier: MIT # -inherit image +require cip-core-image.inc DESCRIPTION = "CIP Core image for KernelCI" diff --git a/recipes-core/images/cip-core-image-security.bb b/recipes-core/images/cip-core-image-security.bb index 525a3464..eea50ee7 100644 --- a/recipes-core/images/cip-core-image-security.bb +++ b/recipes-core/images/cip-core-image-security.bb @@ -9,7 +9,7 @@ # SPDX-License-Identifier: MIT # -inherit image +require cip-core-image.inc DESCRIPTION = "CIP Core image including security packages" diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.bb index 0ec72208..4a9cea9d 100644 --- a/recipes-core/images/cip-core-image.bb +++ b/recipes-core/images/cip-core-image.bb @@ -9,9 +9,8 @@ # SPDX-License-Identifier: MIT # -inherit image +require cip-core-image.inc -ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always --match 'v[0-9].[0-9]*'" DESCRIPTION = "CIP Core image" IMAGE_INSTALL += "customizations" diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.inc similarity index 54% copy from recipes-core/images/cip-core-image.bb copy to recipes-core/images/cip-core-image.inc index 0ec72208..7b0f7b04 100644 --- a/recipes-core/images/cip-core-image.bb +++ b/recipes-core/images/cip-core-image.inc @@ -1,7 +1,7 @@ # -# CIP Core, generic profile +# CIP Core # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2024 # # Authors: # Jan Kiszka @@ -12,9 +12,3 @@ inherit image ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always --match 'v[0-9].[0-9]*'" -DESCRIPTION = "CIP Core image" - -IMAGE_INSTALL += "customizations" - -CIP_IMAGE_OPTIONS ?= "" -require ${CIP_IMAGE_OPTIONS}