From patchwork Fri May 10 11:19:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 13661355 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 08F2DC41513 for ; Fri, 10 May 2024 11:19:43 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.50]) by mx.groups.io with SMTP id smtpd.web11.10137.1715339978680993538 for ; Fri, 10 May 2024 04:19:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@siemens.com header.s=selector2 header.b=B74aFWzt; spf=pass (domain: siemens.com, ip: 40.107.6.50, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EKTOhilB9xoWYV5sFlRN54M2luHz0U4vw/kFcw08kAuoWQnSBzPXCx8EmNuyC4Z4rAucagVXdFXMUb1kS/eYDt11Z5hfijaDLsPdMAnc+hN6EUwzwXZSrkdQd0IiTEWCGDEqaeRCtPxddeZ2lOc3w/LdG7zspkVVkpvR+ZzlFDd9er7O8CAhuCQUEmxXAO2P18j2+6oXfVG6PsApkRP2tvnCRnJVmKKhdEOFMhgcPdbGrvizw3xJOGf5DsJVWmH5++UNNJhyQgRLhqCbylblDiM9hMy935WzsMBYbzIl1LMjkz2uyV9r+57ghXg8mreNjAdMvddUFOnWWFTb5kJgnA== 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=QZzaBikPVahQ9BK+RUlk4cpge+iqM7GU2hSIQQE1Ggo=; b=ImrSO7TsqSbtaQdvVspDbEYHjsm/Q+VIF2tBJbUq/fD1K+WbRmw4HN5Ik3MoS1JdX6+RACKvRwcDHIHdbEMqbM1yiDTzRbe9Dqrdp/Hmw71iGrKjOd5U+LKM5CLPevU3BjTvT7CDyh88uNaJbRpb4fta51lNDQjkfpTgNwHEgm+dVf9q4erqxBI3KWQ5w6Mm9VG6J4zh87OqnEl/6hMKjOrjlmVnJLJO9tH78yOAZclNk+B0hP0y2F84Vq6RPCP+zBqzpdbEZEedOn5U7bjqMLZMVX8PQXQsIpXMYFoJSSaJcxOBYSt3KRC50PYecArQvjgBtHjCfIJG8qBFwTLGiA== 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=QZzaBikPVahQ9BK+RUlk4cpge+iqM7GU2hSIQQE1Ggo=; b=B74aFWztGsaLAMWjY5d3GK2w83glQ5RILuMlscxldcTXSTLnKiFLlc/KBpLRi0jGdhjQ9B7juvWhT1GJPTc3XLFwWpk5qdU7+QWdIwageQ25VuVjYlJAHoGz3FJIPj+Zo2EHA8EXeRaP1mwGWX0Dqj87lVmcIaaqMfBOtZ3qHmMKENlt3vCAuvU78kjzTqDuVfAlz3YRJ4lYrlFvzepugF36fXvIiVH858uJZXEiFYLobZ2kfNnDpLEDILxGrzw4Tbmr1jg9r4uF4I6GUANRcTCsZCfmhioqABCFepinV9wtdr0aKFbFBNax+vI5vqHw5m0qR/uHGrwDTO5uF3z08A== 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 GV2PR10MB6140.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:79::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 10 May 2024 11:19:35 +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.7544.048; Fri, 10 May 2024 11:19:35 +0000 Message-ID: <3f91291f-7e40-4060-b66a-90a135bb6015@siemens.com> Date: Fri, 10 May 2024 13:19:33 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka To: cip-dev Subject: [isar-cip-core][PATCH v4] Update ISAR to latest version Content-Language: en-US Cc: Rakesh Kumar , "Moessbauer, Felix (T CED SES-DE)" X-ClientProxiedBy: FR3P281CA0047.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::10) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|GV2PR10MB6140:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c63a24e-b982-4648-b6eb-08dc70e312bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|1800799015|366007; X-Microsoft-Antispam-Message-Info: =?utf-8?q?9b+iqTI4LSwslqXD6ZW3avWdiV3W1c3?= =?utf-8?q?36SAR4uu05ka8aQe5L1RjjBteCYV1Lmpn4lxKnk4l3tCHMc/qq4l3+aFs0McS8nii?= =?utf-8?q?+WSuHzufuJl/DX2rxucqIV00a+iCkjWqEX3PG+PJBC3LOxI5BjjkgSQyiUUTtV0xI?= =?utf-8?q?qLv9RNsgafqklYEm4KaLL74R6gEPMp7ToZ+BMqgjdKPtky2uShKCGUZaPfTYNle9R?= =?utf-8?q?ADniCXxdv3HjVsOoNb6MWepMKT59rVWN7uInGPoDVTjLet60isvS/4MeRRCmRmSKP?= =?utf-8?q?cA0+F2nObqBBjVIBFvNYxx2VCTlSFnuQOGE3wY5spbK0ZKhcsoFjKFDRmca3JQe/w?= =?utf-8?q?kzWdq5/jzMRleR3yXefODDghHe1OwGMr4CnpJnea9TCG5N7wbERZAgxlhWRDsk30c?= =?utf-8?q?pFvxtpvzkcz5zIippX0G7Grah9ox44AH+vvL/4e+qtVlveHIYSW/Bw/bKsl/TvBrO?= =?utf-8?q?BG8dNpKcES194L1x0nqrhDSrVjrGMkFLxYmEvZK8CfxjNbrJmFwdlx+SyPqcK3ShJ?= =?utf-8?q?W9HKY3bCZnKSYxuWhkVBdHvBpvtfimEyvYVIT/Vg4JJQ+NsvkPkvzahZQ4No3zury?= =?utf-8?q?p5bguQPio042gAoDq153gdhmkoWbgIMw0typk9c/+/9k3WCbO1xim7QcxKCksBdDE?= =?utf-8?q?7W+5TSay7Pnf0JhbWdJFU9k5FH0i8KKnSuwotMNamMoVlc3VbVqIqNbVgfDr92EQf?= =?utf-8?q?uwHHVJf1n58qvL4tyDp8qmJHeHYAviZ3Ovq0xwEozy5z9u3vE/FU3dClcvnTgPUSA?= =?utf-8?q?x/OjqiraXw0ZSoN+WV+QLujMNfQl27saJMYOXtfV+aMTe5GU+JSlXD2qcIsEmRPFT?= =?utf-8?q?vBoOsObW2DxTbdf7REuhzI4V5aGR5jUbmTCLqnnVZHiruLSIfQvUidEDeunecA077?= =?utf-8?q?jvxnfPPYmYmLQtWlp/ao7DJvnP6d8LMjPXy6ThLgsQinT7dNLYXaddnFmKxxTN/kT?= =?utf-8?q?nS45yIsAI4F3QeT5s0VJmlMf7Ykp7QZ0M1vctCts8gC1tC0vHYYjY+EJGxTjhFsQb?= =?utf-8?q?QDmeBGkp3tU0piI3sbFFoRPmNotdBb/4yrhL8Lw7GOkpegqKxw8rN7PGKTUlqcx1n?= =?utf-8?q?2HujKh7ii/oePpJ3PZy3hQE3zo9DrONi3wujtsVKadEjspBDRI8sSqiSFAwNZaKTj?= =?utf-8?q?zSePVM1yAPhKN3MO1SlSw7I1H3Q8TR8SItLiKQ6Jpka3wT9KdheXyCfPkI=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)(376005)(1800799015)(366007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?HsUfo5nwaYStmxt35YgPELXEHAX6?= =?utf-8?q?zv/IjMbDQqCnNIt7Ts4H8fjQZQtQPExdt96nMUs9aPUiyQC+DvwjWo+JtRuvoqWMi?= =?utf-8?q?dLIvKBFEIYn/fDlRogWMfkIuYcS3k+H9MoiDuU6romw2rwYGYnCAd0aVP5dqGpLHp?= =?utf-8?q?zELQoAlJKaNXpvrW3D0VD0smQXW6wZqdMMTPwPgzZ0ewRV/WHE+KpN33gyD+adTJS?= =?utf-8?q?Ydf+LyWtFYPRz23+Be9vOH/+hm+a0LR7/nmB+oE5Rxm2vjqCS1bzEEWjHAu3T7Ztv?= =?utf-8?q?ZyJsz/IXin+IeEGw6D2u0W7DpQcHxEAgXse9Ao6lg2etcVxBvix6DVnnJl3e//PGI?= =?utf-8?q?GU0ZiUlTbeEUWD3HWL0hxOx7GEocNOrfO65XVwLzxzPinkPphGW26SLBbVSTvYgcC?= =?utf-8?q?CGV0HBdGu3qSvvB5RcgIno+fqMH/Jg2XOUM7wnIWudfqbPy9Q5bx7E4mCk/a2n3wD?= =?utf-8?q?KB9wgl9l4KBEpRHVl35uZbv61M29fkf2vpK0WgB98xI/9wgOXrFzg/BicmMkGQRjX?= =?utf-8?q?tsoRD/mtX15dIFeqCimG0Ue8Vrmlks4tZpOZVHG7JpLOKoyxPh9Jt8ilkJYM2ihJ3?= =?utf-8?q?wF6KVjno1vn+q2hkAWm1eSunBKoDAkWRrQoRH0iueOeqa57vu/5zXpCoJAS6Tg0oa?= =?utf-8?q?cS9Mv5W+cjYh92NMZNssgOJKlPUXmke6YIAgb/tsDjsOjlHwBZxxoWoSwNSX6khrN?= =?utf-8?q?OjqfaodZlYdMWNJFEKpzzNvzyKWJ+YvwMyu4p2Vj8ygnOItFcAjAwcluMK+RFSTvs?= =?utf-8?q?367Hgh9Ke7Up9qkW1RiTzt9O4IPuauSuMEbAd5kyzUr3/GviogKTQ6HLyB37qqqwH?= =?utf-8?q?xOcB7Re0GGdpo2WCOzVNcNoZWxdcLU9Xw9aC4HR3ryNTO6eSnL/VmozWtW1VbT2Kl?= =?utf-8?q?b8jqmEkTx6NYTGOrTmhaLOAcQBG15G6jGeo1rHtCoe+QgPJVXLNGXk/H18dCAJ3j0?= =?utf-8?q?oR18UuGHNpySCcsV98T0GIHJiONE8i48dN+8YTPYC2KrugiWrT+degWF4lsU6uUKd?= =?utf-8?q?E0cxolTTMVVqS8Xvp2vGGS78eFHRY4e+OxFNpsX6cFzbLN0Pmyv1Dd9548xizv6Zl?= =?utf-8?q?YNzNpvMny5ONYl6nN6YAdt9waLxsubOdd+f60a7bW3rG95V6ndZzmK8Aqpy6Eu7tT?= =?utf-8?q?DQwD8nT3goyhFkg7LEvgSsNdAH0fa/uffx+AUOncmEb7bZbPIWkUsttNwQjYoHvI3?= =?utf-8?q?em3xCqeoeIosmUxOPkYVjOjKOK2u0loM5XUgVm2Mhb25EkFVZyFOr6e1GLsCABlbN?= =?utf-8?q?Ga7IKPfok95h3UbgDSh1zmfoCAmS2jnEWRBFRL5866xGxcDVTPJU2C0Q8eOLdIciY?= =?utf-8?q?PJjtQUAVNbAuEgL1te1uJcusOQnvxegtGfBU1s8TVKabu6H7Hpy8GTK+RCNApR4Xf?= =?utf-8?q?Lc3qC52AwlxhnMw2CbmwiOTQo5vxOWYcZVcoTZkwSGwFVANIKivzwJCUsvcEb/iQq?= =?utf-8?q?mIeNaDlaE248KA4c5hmOnSiy4bE4j7Y2XMrOipu4MjTfP0z3wkbq5qZ414ERSbexi?= =?utf-8?q?MQyRBGuVImAGtNo551XkXo0I7JVHmL3X+A=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c63a24e-b982-4648-b6eb-08dc70e312bb X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2024 11:19:35.4834 (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: 07+2RPgX37ve6LIHPBGcLliDnQQr6USiZlSYvCQKe4fhTRQJ90Png+4F7SilUlWBpwpgpjMrjeqQ0gIuT5ACJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB6140 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 ; Fri, 10 May 2024 11:19:43 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/15874 From: Jan Kiszka This update requires to resolve duplicate "Provides:" statements in secrets/certificates recipes (based on original patch by Rakesh Kumar). We furthermore need to drop the now obsolete SOURCE_DATE_EPOCH variable injection in squashfs.bbclass and define SOURCE_DATE_EPOCH_FALLBACK, rather than SOURCE_DATE_EPOCH directly as this is now handled by isar itself. Signed-off-by: Jan Kiszka Acked-by: Felix Moessbauer --- Changes in v4: - bump isar to include required fixes - fix DEBIAN_PROVIDES - address SOURCE_DATE_EPOCH changes classes/squashfs.bbclass | 6 ------ kas-cip.yml | 4 ++-- .../secure-boot-secrets/secure-boot-secrets.inc | 4 +--- .../swupdate-certificates/swupdate-certificates-key.inc | 4 +--- .../swupdate-certificates/swupdate-certificates.inc | 4 +--- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/classes/squashfs.bbclass b/classes/squashfs.bbclass index bf72133e..b39be0cd 100644 --- a/classes/squashfs.bbclass +++ b/classes/squashfs.bbclass @@ -31,12 +31,6 @@ SQUASHFS_MEMLIMIT ?= "${@int(get_free_mem() * 3/4)}" SQUASHFS_CREATION_LIMITS = "-mem ${SQUASHFS_MEMLIMIT} -processors ${SQUASHFS_THREADS}" python __anonymous() { - # Set file timestamps for reproducible builds - source_date_epoch = d.getVar('SOURCE_DATE_EPOCH') - if source_date_epoch: - args = " -fstime {time}".format(time=source_date_epoch) - d.appendVar('SQUASHFS_CREATION_ARGS', args) - exclude_directories = d.getVar('SQUASHFS_EXCLUDE_DIRS').split() if len(exclude_directories) == 0: return diff --git a/kas-cip.yml b/kas-cip.yml index 2c3c8b0b..52e53061 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 9dc362cd7115074c0f60843e687ed89db5c9339a + commit: 3d863aad5e12c7bef382cb6fb3f1f5e18b236156 layers: meta: @@ -42,7 +42,7 @@ local_conf_header: USER_root[password] = "root" USER_root[flags] = "clear-text-password" source_epoch: | - SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip-core} log -1 --pretty=%ct | tr -d '\n'")[0]}" + SOURCE_DATE_EPOCH_FALLBACK := "${@bb.process.run("git -C ${LAYERDIR_cip-core} log -1 --pretty=%ct | tr -d '\n'")[0]}" env: DISTRO_APT_PREMIRRORS: "" diff --git a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc index 2164b121..f11e93d2 100644 --- a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc +++ b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc @@ -14,6 +14,7 @@ inherit dpkg-raw DPKG_ARCH = "all" DEBIAN_MULTI_ARCH = "foreign" PROVIDES += "secure-boot-secrets" +DEBIAN_PROVIDES = "secure-boot-secrets" SB_KEY ??= "" SB_CERT ??= "" @@ -31,6 +32,3 @@ do_install() { install -m 0700 ${WORKDIR}/${SB_CERT} ${TARGET}/secure-boot.pem } -do_prepare_build:append() { - echo "Provides: secure-boot-secrets" >> ${S}/debian/control -} diff --git a/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc b/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc index 944c2dce..93cf255e 100644 --- a/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc +++ b/recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc @@ -15,6 +15,7 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" DPKG_ARCH = "all" PROVIDES += "swupdate-certificates-key" +DEBIAN_PROVIDES = "swupdate-certificates-key" SWU_SIGN_KEY ??= "" SWU_SIGN_SCRIPT ??= "sign-swu-cms" @@ -35,6 +36,3 @@ do_install() { install -m 0600 ${WORKDIR}/${SWU_SIGN_KEY} ${TARGET}/swupdate-sign.key } -do_prepare_build:append() { - echo "Provides: swupdate-certificates-key" >> ${S}/debian/control -} diff --git a/recipes-devtools/swupdate-certificates/swupdate-certificates.inc b/recipes-devtools/swupdate-certificates/swupdate-certificates.inc index dec9a836..2532de6d 100644 --- a/recipes-devtools/swupdate-certificates/swupdate-certificates.inc +++ b/recipes-devtools/swupdate-certificates/swupdate-certificates.inc @@ -16,6 +16,7 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" DPKG_ARCH = "all" DEBIAN_MULTI_ARCH = "foreign" PROVIDES += "swupdate-certificates" +DEBIAN_PROVIDES = "swupdate-certificates" SWU_SIGN_CERT ??= "" @@ -30,6 +31,3 @@ do_install() { install -m 0700 ${WORKDIR}/${SWU_SIGN_CERT} ${TARGET}/swupdate-sign.crt } -do_prepare_build:append() { - echo "Provides: swupdate-certificates" >> ${S}/debian/control -}