From patchwork Tue May 14 13:26:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 13664162 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 05960C04FFE for ; Tue, 14 May 2024 13:26:54 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.63]) by mx.groups.io with SMTP id smtpd.web10.15523.1715693210934913203 for ; Tue, 14 May 2024 06:26:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pFkSCprz; spf=pass (domain: siemens.com, ip: 40.107.6.63, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jYvtNDANbX82dJXi+QDCU2j8OG9d47IM5JoCIN7lSc67rKFfwpAkvZIzxZqrw5hpA+14lhncSLkPIyAIPj/uHRryrVfwGJg8mbBjP4TT5rKGLO1GDny6/+QW6kxIaKDLUfcg7HfQvr3Cbj7RMGuSDa/McbDZ5UvlDXSdW+AF2JghCY3mSUjXzZW+yebEj1ZZIJXUq/to2ycuZssjMSw1HUMGI4U3LmK0SjgiLErtx7iitjvaACQdHHcEWvETaQthmWcLbCG4BHnFxBbLqUWacTToFkO7ZU/Ayp6Q6vkMEr/i2mcHYqIV3mltBieohBmT1PCndVHgZl9ItIm/tgltMg== 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=b2aorIQ0iSk34MmkxtIdGcNm8QS1S4eyOQn99bgUuz4=; b=Igq9nB/cOyniioHZrCCl/Xbhz+4AbnqICp/wx3atgNXmxCofWoiHE+6jbZRIuIPB0L+KocgitrQxZEi47AlunWntlYohWhyzSsFy1aE7wYGYQTUzOAsGy73/I2bQxXFfBtzxDu8ZdKShVUyaszMEjJtniG9TBrvyBSC+BPG9XWfbyaB9HfSE+Wth1NmmSdTMeRZ/EIwaGG2chxTCNX0MPmbP3j9KSyqMn79Ha4nqpTjAB9QVo1H5er7LQxGMkdVLI6Q5U1OvLPvQCMgalrbQiT+MiS7mrUCkbDNXBTn7VKIiWLgYD5bad9CJFZMetcNLQcClAiZrvvNsg1KjeNfjqA== 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=b2aorIQ0iSk34MmkxtIdGcNm8QS1S4eyOQn99bgUuz4=; b=pFkSCprzmj7vA4tLaiLRRew2eSKDMF9fATjj4JY01iOSkf0TG9wa9axssN1WrO6zMcvoDDo+N8Ledu7/B7L5ZqG2diT3YR82V2a8UPwjjJd9nFceLJTqrAQQRUjsAHN3+bwiLxHgBaLhY2L3tZfU2y+Qnc021ly7spfXqIE0lvzFhZicFtaR0XjoHwdezOwRBc5bJGpmS7hyBnsHfG7CBtAYeUQGFn3gbQyI5A9KfrQCec6b5NksHzLwIW2CqyxwNQLDZ6HFqvPCacx4RqJLSrsKVQpDambzn6D42v9d/SDBmO6qAAgHyIcAy+VAkFw7fqFxN93qykLADz7dVorZPA== 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 DB4PR10MB6167.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:388::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.25; Tue, 14 May 2024 13:26:47 +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.052; Tue, 14 May 2024 13:26:47 +0000 Message-ID: <2f21e81b-a87c-4d15-af8a-d50c201461c7@siemens.com> Date: Tue, 14 May 2024 15:26:45 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka To: cip-dev Subject: [isar-cip-core][PATCH v5] Update ISAR to latest version Content-Language: en-US Cc: Rakesh Kumar , "Moessbauer, Felix (T CED SES-DE)" , Quirin Gylstorff X-ClientProxiedBy: FR0P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::7) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|DB4PR10MB6167:EE_ X-MS-Office365-Filtering-Correlation-Id: 276c5a24-4323-4a75-6860-08dc7419816d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?utf-8?q?j1QDDQKq+VeLrZK6qz3kmCZ8xQcDXmc?= =?utf-8?q?pwy5w38pDMITweJumibrZjk+flu32M5yTB3xwer9wV896ojnCYzZEtDRGbqjJt8Ku?= =?utf-8?q?rMGrjq0hjkWhMXNNZqOt+9Udq9v3qklcxukOvpDAHQdANdhzP+q8PfUgWT1s9JeD4?= =?utf-8?q?//2TKscN8GBxQmkQK2qZqrdUHjrujKKNEtLwTwTqKNOWLrP9MbjZC5ios3wQqoNqo?= =?utf-8?q?qzGTWTVQCuro3wyzCiituAax+mZpjikGgNJ1oIlN4qtIgcLVUKVUZUXQVYTxQYFeB?= =?utf-8?q?lh1CcBZ8XTT/ltYRSay4vlfunWQzAdPTw+oNCwbhBZMHmKs0OCPPUU/A7AIaB53iW?= =?utf-8?q?o1FpQQM+PWVE4wWxXW+UwGpolVoU/umAygnznikVROw/FWKHpUybzYTi6OKwsDW/f?= =?utf-8?q?WlLXPvTtjLJLseNFg62/rWieB/mnhPe5l1W9K3X/OFr4tWZH+W8ckgJ3JZWDA2j2B?= =?utf-8?q?wLK+lszDw5dgmNyf0TGqYu1Yvf8QyT8SvwFcE8gIEvfhYYioJvZGvaAJXGF0SYu5K?= =?utf-8?q?O98zH1Due3ohndf7egfJl2QlDLcUHL90YeIt3+DDPd62c2Vr+50bZ7ShulDS6/4Ae?= =?utf-8?q?Xk1f5u9w8n31Hqpy7u9E9Qrn2aKzd8faS4e6U+9YOnV75dwtTQTBvV46FORYX0QIS?= =?utf-8?q?TCkkrxzPH1uurHf/Krw/VA28zAeujr1OqP7Ji9fzw2xAPJ7SLviWuxfMDqngN8dO9?= =?utf-8?q?o4mf4xZ5Fq2F639TgrnOlO7DoZE/2LbjPuWrA6ajXJfFd/wP/H+AyPcrRasUMRxAK?= =?utf-8?q?jCfubXLaN4GKcOMYZIJCpUyC1s0OI6tLTZl4njelnmh3tflL2IOp/43UzhSl0PCuF?= =?utf-8?q?1J0x461sCm0lo6hNKfSDMYh3gkqUloko6FyyEgQQ8I+c7XHi4Qgrbq/yHmqRvGmyH?= =?utf-8?q?S10b7iCnaTBBb2HoqghywJwnjd2cCXWYLqX2UyDx727ZVNFGNysmfSSuMtFsCB1DM?= =?utf-8?q?n3X9IUsIy0DE06mzzKvjad/me8h8l6pfVjpbDvVaSSIZqUIQYBuwSSA4BN+Hnl3Q+?= =?utf-8?q?rDzO4firC8cWZI5G5tFOWU9bmq0dlcyGD2l+am/IevKnqGSHIJXEplVCku53M7Cjx?= =?utf-8?q?1f26BF/CnAxtnCYIOPz2KEIBR+C7ffRAhJI0Qqrxtj7oN5y5p19HqOpQQrCkUh/pl?= =?utf-8?q?TW8kWVDOgNkavObatir/x6H+qTPKGnL8SXsaBczu1JHmUQER2Tueyy46Sg=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)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?vISXTtA5vTNjcxApS7zWjMpJcX6n?= =?utf-8?q?XX31Jztnr3l1AjaMEgsGIwsTN0ybTIyGVToqPiUVscgQYCqmzkUnroIbeUBrRLNIB?= =?utf-8?q?n2hGG5mMQ+OjDbLa8j/ROaM0Lk/F4ujH9v8DX4WeL/SGPSJHMP+nGcD8gORSxzEuq?= =?utf-8?q?wnMtVjjzq6x5yYUX86SDDwrQllTKcTKHQq6qs5Z1knn3iDHWQ1X2HqUPtnvI2lI9O?= =?utf-8?q?2LbFECoetFyPFoQ8MvPbUVLb1pGyh3jIOb7b48PLbrRk+Zyu2LJExuY4qF6Wb46pi?= =?utf-8?q?MjKOhuFmTn4RstaG+ODMvUYlquCT2wT6Tl0+w9z0xRaDXVOh8sIBurehwa7SWjH4S?= =?utf-8?q?EhW4EETDjlwNbJ+DmKxBGc9CN/cFiUX6u//Eo908OJ+dmmL9GcbnA9WmvQMO3/Wfs?= =?utf-8?q?jgaJPhOyMy55+Tb/sLjfSsWpkzQcflLgYHG/62l3JuEI98zVOf7oZiQQVJl+Pq71I?= =?utf-8?q?YsPwK5p7+IohIko6hNwor/piCZKo6SEVf0icTZb9mXttvjIhuqiMWOt+v9+I2uhPA?= =?utf-8?q?1wgdb46MEBl8q+Dnecru+fBDnxSTxgKZqnlumABJM2rmnmDp6Is08uGR1JFWkitJO?= =?utf-8?q?X4LWQt3lP6MOe3C7xjUaMwWCOrdjEHEQLjkndkGie3DFToWKCXbUieEJ/kuNgbMGI?= =?utf-8?q?QS34I6AJUfdCg7oxRa2WiSKiupvAmquZrHRhpBEtBWX8uPjSWwcQWYxy0wPAQVTPN?= =?utf-8?q?Fvg8qnoYktQ9Tp/wAjLYiBkQsfgxWibcMgU/fWDrWEh1ghN+oJ3CUyHxD0UcohA5L?= =?utf-8?q?MoDBqeZSjQkRzmYjHGXwX3hjTJ7jGIt715YqZ1BicTrcJ7yxZzuFUSbKUavXlKwDl?= =?utf-8?q?lZIf1iGcryxxLfzpuJ7qEtTie8yFapxuy/jLBdMlyzwk6WODW0qdniWDLf/g+RwZW?= =?utf-8?q?PDm2I3uDANtDe16EAgz8TnimG8fyYyt9+7GIQ0penEczjqn828HJU0mzzFZ6QbtKN?= =?utf-8?q?7v27x3qEHdqrY69xQzt1iGRvwxUuxB2Vx4dInjl46boqfi6Y941ETVJtAKimFPXvm?= =?utf-8?q?1nutwC1FoTLflsqiYqYwjCBGnD3UqhZn7wlzuGpUa8cdIw/k+HBXUxKikGe6e4sEd?= =?utf-8?q?EnubBjYKYvTboiOb3POmIWbkT1Ivd1CU9MR3eLcyg69jOEpdm8fR1ojteuMhns/p4?= =?utf-8?q?z3LTpKq+vxV9N8vARV1WCN93c2S8cgtBUzGWNHR2aiKUpdk6fYLz+q2lB/M4HiCcs?= =?utf-8?q?lDQKLE+zjtIqNI8116crFeeR6kW9F+mqnIymczHM1MOqCOMD4pY+4NNTKk6pa5aTY?= =?utf-8?q?fwYQWUMS+/YX3Ya8NaaIiiuo157jUzR0G+wnxY4NlEkxFQpYA6vbULdamrfOb1x0Z?= =?utf-8?q?fYi8ghE0ixlyDXg5F0kkEH9mgBasYNIoz85qT+5NAGXL4VS2eufydvysWPYKAbddn?= =?utf-8?q?Fd0DY4BHv6fANKlr4vq20wQyWX1Sib8dad9b5uRVwvI10/XVldJTOoXbTCkbQQYMO?= =?utf-8?q?1DqJsR5jgSc+ZtRXcKRyxTJ1hgGPmsO74j9S+0qfR7C5dewProOtncEOZWLuwpL0F?= =?utf-8?q?Vr++NiwK7zBDFxMVxtIedPIe1ARWWXsfJA=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 276c5a24-4323-4a75-6860-08dc7419816d X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2024 13:26:47.5843 (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: 3f2TzhCMYBZSS7DqyvTPP9au9uV7XqH0nfNJsQgwFKhCldSV3wBf91qfwrTIBT2ij+V7zzrIuVKFPEHQmEBDvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR10MB6167 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, 14 May 2024 13:26:54 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/15893 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 --- Changes in v5: - added new linux-cip targets to PREFERRED_VERSION definitions (reported by Quirin) Note that upstream isar still has a few open issues with the new kbuild model. We are trying to sort them out, and I will likely have to wait with the v1.4 release on them. classes/squashfs.bbclass | 6 ------ conf/distro/cip-core-bookworm.conf | 6 +++++- conf/distro/cip-core-bullseye.conf | 6 +++++- conf/distro/cip-core-buster.conf | 6 +++++- conf/distro/cip-core-sid.conf | 4 ++++ kas-cip.yml | 4 ++-- kas/opt/4.19.yml | 6 +++++- kas/opt/4.4.yml | 5 +++++ kas/opt/5.10.yml | 6 +++++- kas/opt/6.1.yml | 6 +++++- .../secure-boot-secrets/secure-boot-secrets.inc | 4 +--- .../swupdate-certificates/swupdate-certificates-key.inc | 4 +--- .../swupdate-certificates/swupdate-certificates.inc | 4 +--- 13 files changed, 44 insertions(+), 23 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/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf index a827c254..16fce25e 100644 --- a/conf/distro/cip-core-bookworm.conf +++ b/conf/distro/cip-core-bookworm.conf @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2023 +# Copyright (c) Siemens AG, 2023-2024 # # Authors: # Quirin Gylstorff @@ -14,4 +14,8 @@ require cip-core-common.inc PREFERRED_VERSION_swupdate ?= "2023.12%" PREFERRED_VERSION_linux-cip ?= "6.1.%" +PREFERRED_VERSION_linux-cip-native ?= "6.1.%" +PREFERRED_VERSION_linux-cip-kbuildtarget ?= "6.1.%" PREFERRED_VERSION_linux-cip-rt ?= "6.1.%" +PREFERRED_VERSION_linux-cip-rt-native ?= "6.1.%" +PREFERRED_VERSION_linux-cip-rt-kbuildtarget ?= "6.1.%" diff --git a/conf/distro/cip-core-bullseye.conf b/conf/distro/cip-core-bullseye.conf index 110f3343..fc8981f9 100644 --- a/conf/distro/cip-core-bullseye.conf +++ b/conf/distro/cip-core-bullseye.conf @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2021-2022 +# Copyright (c) Siemens AG, 2021-2024 # # Authors: # Jan Kiszka @@ -17,4 +17,8 @@ DISTRO_APT_PREFERENCES:append:swupdate = " conf/distro/preferences.swupdate-bull PREFERRED_VERSION_swupdate ?= "2023.12%" PREFERRED_VERSION_linux-cip ?= "5.10.%" +PREFERRED_VERSION_linux-cip-native ?= "5.10.%" +PREFERRED_VERSION_linux-cip-kbuildtarget ?= "5.10.%" PREFERRED_VERSION_linux-cip-rt ?= "5.10.%" +PREFERRED_VERSION_linux-cip-rt-native ?= "5.10.%" +PREFERRED_VERSION_linux-cip-rt-kbuildtarget ?= "5.10.%" diff --git a/conf/distro/cip-core-buster.conf b/conf/distro/cip-core-buster.conf index 4e9a4a73..e30603fd 100644 --- a/conf/distro/cip-core-buster.conf +++ b/conf/distro/cip-core-buster.conf @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2024 # # Authors: # Jan Kiszka @@ -14,4 +14,8 @@ require cip-core-common.inc PREFERRED_VERSION_swupdate ?= "2021.11%" PREFERRED_VERSION_linux-cip ?= "4.19.%" +PREFERRED_VERSION_linux-cip-native ?= "4.19.%" +PREFERRED_VERSION_linux-cip-kbuildtarget ?= "4.19.%" PREFERRED_VERSION_linux-cip-rt ?= "4.19.%" +PREFERRED_VERSION_linux-cip-rt-native ?= "4.19.%" +PREFERRED_VERSION_linux-cip-rt-kbuildtarget ?= "4.19.%" diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf index 48f26ff5..42eb311c 100644 --- a/conf/distro/cip-core-sid.conf +++ b/conf/distro/cip-core-sid.conf @@ -16,4 +16,8 @@ DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list" HOST_DISTRO_APT_SOURCES = "${DISTRO_APT_SOURCES}" PREFERRED_VERSION_linux-cip ?= "6.1.%" +PREFERRED_VERSION_linux-cip-native ?= "6.1.%" +PREFERRED_VERSION_linux-cip-kbuildtarget ?= "6.1.%" PREFERRED_VERSION_linux-cip-rt ?= "6.1.%" +PREFERRED_VERSION_linux-cip-rt-native ?= "6.1.%" +PREFERRED_VERSION_linux-cip-rt-kbuildtarget ?= "6.1.%" 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/kas/opt/4.19.yml b/kas/opt/4.19.yml index bad4293d..799b890e 100644 --- a/kas/opt/4.19.yml +++ b/kas/opt/4.19.yml @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2021 +# Copyright (c) Siemens AG, 2021-2024 # # Authors: # Jan Kiszka @@ -15,4 +15,8 @@ header: local_conf_header: kernel-version: | PREFERRED_VERSION_linux-cip = "4.19.%" + PREFERRED_VERSION_linux-cip-native = "4.19.%" + PREFERRED_VERSION_linux-cip-kbuildtarget = "4.19.%" PREFERRED_VERSION_linux-cip-rt = "4.19.%" + PREFERRED_VERSION_linux-cip-rt-native = "4.19.%" + PREFERRED_VERSION_linux-cip-rt-kbuildtarget = "4.19.%" diff --git a/kas/opt/4.4.yml b/kas/opt/4.4.yml index c0c5c055..3b9239c1 100644 --- a/kas/opt/4.4.yml +++ b/kas/opt/4.4.yml @@ -2,6 +2,7 @@ # CIP Core, generic profile # # Copyright (c) Toshiba corp., 2019 +# Copyright (c) Siemens AG, 2024 # # Authors: # Daniel Sangorrin @@ -15,4 +16,8 @@ header: local_conf_header: kernel-version: | PREFERRED_VERSION_linux-cip = "4.4.%" + PREFERRED_VERSION_linux-cip-native = "4.4.%" + PREFERRED_VERSION_linux-cip-kbuildtarget = "4.4.%" PREFERRED_VERSION_linux-cip-rt = "4.4.%" + PREFERRED_VERSION_linux-cip-rt-native = "4.4.%" + PREFERRED_VERSION_linux-cip-rt-kbuildtarget = "4.4.%" diff --git a/kas/opt/5.10.yml b/kas/opt/5.10.yml index f3a6d86b..a9cbe25b 100644 --- a/kas/opt/5.10.yml +++ b/kas/opt/5.10.yml @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2021 +# Copyright (c) Siemens AG, 2021-2024 # # Authors: # Jan Kiszka @@ -15,4 +15,8 @@ header: local_conf_header: kernel-version: | PREFERRED_VERSION_linux-cip = "5.10.%" + PREFERRED_VERSION_linux-cip-native = "5.10.%" + PREFERRED_VERSION_linux-cip-kbuildtarget = "5.10.%" PREFERRED_VERSION_linux-cip-rt = "5.10.%" + PREFERRED_VERSION_linux-cip-rt-native = "5.10.%" + PREFERRED_VERSION_linux-cip-rt-kbuildtarget = "5.10.%" diff --git a/kas/opt/6.1.yml b/kas/opt/6.1.yml index 7ac27359..f140c273 100644 --- a/kas/opt/6.1.yml +++ b/kas/opt/6.1.yml @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2023 +# Copyright (c) Siemens AG, 2023-2024 # # Authors: # Felix Moessbauer @@ -15,4 +15,8 @@ header: local_conf_header: kernel-version: | PREFERRED_VERSION_linux-cip = "6.1.%" + PREFERRED_VERSION_linux-cip-native = "6.1.%" + PREFERRED_VERSION_linux-cip-kbuildtarget = "6.1.%" PREFERRED_VERSION_linux-cip-rt = "6.1.%" + PREFERRED_VERSION_linux-cip-rt-native = "6.1.%" + PREFERRED_VERSION_linux-cip-rt-kbuildtarget = "6.1.%" 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 -}