From patchwork Tue Jul 18 19:32:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 13317655 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 D0697EB64DC for ; Tue, 18 Jul 2023 19:33:05 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.66]) by mx.groups.io with SMTP id smtpd.web11.4950.1689708775696109279 for ; Tue, 18 Jul 2023 12:32:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xfMeJao/; spf=pass (domain: siemens.com, ip: 40.107.21.66, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nL1xYD/rUxvOA/32nXUD9dsWXdIZNmfiK/GbV0Ntr2uCXBi1S13vOO4QYNBdYMZj4jsKtP7FrOMyuaWyf39AZMKEhA4OTWJqLrqjx40jwx8xbqm4lHovzk5pseTWtGUlCnVqzGlgGvfuNtr3B+V60Mg5S4MIwPbbGEs1pJ8FkAyNsw98+TC/7PLENHRF3oa4sYBOiqTVF9xMS6mCSqKzM2EkbyWeNCEmzCRV85Qp/tQe3TWm1LcnlEIkMQgG02Kk/cNqTCRMf8MyAbYf9V1ztc09mmpXKllkN5ucGXA7938HQpa6hmqhbVG8oyrDqG4Z526qULaZSrx6MfVf+3hY/g== 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=gTf9d2YQiN/FJICGgkssMXmrrQf0y/MvLRfB/ZlHuOQ=; b=hd9A1Ljiv09aSRA70upiLh5vpZR7DFq4/6NrBSUFd3p3dEemzBZaBqUG28EO5dhkkh1q1P85JganYjAY5golA8Z9D2+tm5QKG5JdqB1DUeNbEWAm12baMZ/yNkaPGAsXGygBS2zv06AqOS+96hqzdGzo6BW5knPg6Du41h5kpJAM734Eq+3pn0e4n2YFuTAgHsrAq+zHww08yu7RS7/Yu0sXwQfwBtqREVb8/oRy5d+OosNlRzLdw2w2H2kS5VEj5j2LJeXLO7NvWMn3Rri/kTLuaSQtRoZIusPXvs/8VpQDSg8xR90DNg0Q5FHbfs3/V3cFfBuSbjgqO99kk+EbqQ== 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=gTf9d2YQiN/FJICGgkssMXmrrQf0y/MvLRfB/ZlHuOQ=; b=xfMeJao/GDdKuUKVS6v/00eUtVNTquHQs6+Ki8ZRrLsx6fc6+LuJpLolr25PapGrvHf/aJg5H0tf7cTAjENuIiMpwNe8ttAzBzv7bJzXX/sHHXlF/94HDyyt8t07uY8DfF0ZAx4cXKeuABcadKW/r0P9mQxEuUGnUKIAmq/22VLWuYxYRhv/0IR6kAUJuOM38t65NnrmyOPxrFwiLoaXuQhQin9A6dGTsSUmYCX0z8xVCj+H67ZEQ0mHRiwbmK/ioo92XJdzr6K89M7dpQIkkQVdIa5sYaEpeVR+ZFUEcAQk/I5PrLK4uxrIaLkFMOmWvyaDk0xfxpfcpKE4iF1Waw== 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 DB8PR10MB3863.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:168::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 19:32:52 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::77d2:3a68:9741:67cf]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::77d2:3a68:9741:67cf%4]) with mapi id 15.20.6588.031; Tue, 18 Jul 2023 19:32:52 +0000 Message-ID: <00856a85-3d39-cb39-d8a9-e86e257ef4ed@siemens.com> Date: Tue, 18 Jul 2023 21:32:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 From: Jan Kiszka Subject: [isar-cip-core][PATCH] linux-cip: Switch to 6.1-cip release Content-Language: en-US To: cip-dev X-ClientProxiedBy: FR3P281CA0136.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::9) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|DB8PR10MB3863:EE_ X-MS-Office365-Filtering-Correlation-Id: fb4cece2-35ba-4791-2d8b-08db87c5c702 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kMzVcJiz+BpfiqHtP357iJfr6ugKz1BWOf8weeHe1pzVpkCa1oSSUyZY7xRtNZfmL0RkdXJ5mEriV4N9daNg9gYFUByZaYGLibKDkyQ5V0ZMpoLdMJpXygUpa8goyQ8T4SOLIOLznEq8zo4sUgzT4BNTHehwndxP9F4x6n/IUUxoFszewepfKTb1ZsAkB2w+KcNlnl1aHidjQVkY42IdCq5Zq+oTgRZJEXhmvRak36pTeco5MH9K1XEn3p0XSXQmlpVNkd8nRkRbpfNj3QlKQ69FeaduVck0cFiCb/uu5BBhTqrl8nwpFCI7HzXGU8ZnQY9vHV6So7UAbkhHcQhKT77fO/WMAAhpCQh9XIRPXdHOAhynn8VF7Mk4YO6sJ3SIkFngLs1l9To5z+4bAfi8ZwH1znD9f5sgZYA//J66QYmxfcBLK9GwXM/ZJ/zbdfVNKtgtNhnKVuKr3zmRZ1j3TBTOh1bZK24e66sfTMGief7zdzHqkyZGFR3VJ0/GldaOllVDl1dceoszHTL1SWiz9PmJb/s4fgM9DKo/CaA+w0cne+iJCHhJQ/cYHoaW7bWwSkBYISry/ZH/+DC1VHIiVtCiYYLW+Om0SfkO8fp+d6ZEqsCzKnOAbdbg+NhRjLebM8mjy6OBuPW3jKbEo/xTqQ== 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:(13230028)(4636009)(366004)(39860400002)(376002)(396003)(346002)(136003)(451199021)(26005)(6506007)(41300700001)(316002)(83380400001)(31686004)(2616005)(186003)(966005)(6512007)(6486002)(66899021)(82960400001)(478600001)(44832011)(66476007)(66556008)(66946007)(6916009)(38100700002)(86362001)(31696002)(5660300002)(8936002)(8676002)(36756003)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?3Glhc7bKcB1FLsI/n5vSxg5+YeE8?= =?utf-8?q?03MfppTGrPTlLFY5BGEbGkDPDm79h/VPRAKXDY6MiN2sWrjXa49qVpqrQje433+U0?= =?utf-8?q?mqbIIeX7pn1qTmtV5EiL90myaGYY3jiedYsX/CpRy4ujQUJ9PJva4KabC+ix4jxoo?= =?utf-8?q?vZdWRhUEGTzsFokzisDfeLq5XS/kof95IRydqjcR4M0fXVqoc75C0pk6kOYqP9TuS?= =?utf-8?q?0XbAQYM4pUTLBjMD1pLAC9uZA1tmF6NrB+GLseYkJYsL8o3Ms0EkwEH7dvAMan/FY?= =?utf-8?q?uHT0UQwQykNkXXRbB3X+J4dOjRJZFp9qBV+fRJR2jxRR/hTVYHEDXiV8th5GnDO3I?= =?utf-8?q?n1wBGUZ3WuK4caMHBMFkl9OwsQ7juG4VXo52pOXtwjniUYaPv91t3gMqfdjaJEem3?= =?utf-8?q?9lgUELfy6k0ZNFe8rhQ6VxGlpfQjzSqr14yeWajqPZBewB5JBBqk9NjJ8Tq2R4mPq?= =?utf-8?q?i+BNPcOlS8Ddcs1uZOZ7XnG3Xq51+4F80hqW4x48BHbnj0GAXV2WJd7jA92rKqa/Z?= =?utf-8?q?/9mARjqYOINvMFcuiQiBjTjKv75XWh/tWvLCoSBG2fGld0axBuvauYoSewhZ5UaiA?= =?utf-8?q?GTaasYmGopIsElg2YUmrbmnjroMboVku/IqGKfLUk+aVIJSZf6+DsG4q2RkKNdUE1?= =?utf-8?q?nwGfkozVuacVK7OF/uLN0GR15iLH7gpeo+4VgFylHb06ge+gUehXaNEYRGZPUkP9i?= =?utf-8?q?BPOt3OECa9TVrI7UWrSRRcd7q7Lgzz+uFZzdnNPfoNyufemVkiW2D4Ph7yHN7tDq6?= =?utf-8?q?sS5seDIY16SBFWYYAAVFJxqcmc5GrcL+XXee0jkGDeJbRCpCRPzc9xw4pEtRom902?= =?utf-8?q?uIkFUqwx+gl2s5WuSBaxplCQtvfXBnHu/yI9GmkTxuei6ovQd3I+YdMtvrs/yvBm4?= =?utf-8?q?MmSxClKD7wzlnbkgNAt4T1Y7+yErXb1334K+n+ofkhMHsPiRKlT1QFyRTm9Qxkep2?= =?utf-8?q?/z11Jzq12ka1Cqe1FuzM3qbdmp5mjaiX9zNXH2ymmXglDLyMRg1FfKZj+DaKNNZMs?= =?utf-8?q?Lh79Zy8F+E0W9iO2zr0lwtfZ/Xy7sKvbiQh1V+gP2dgzSBzqYUscIAIOvclSlHZNQ?= =?utf-8?q?BIzLbw7Xgh8InaTFxY3c+KZjW4vDQWOU5NQo5q/l5BZjEK4Cb96/I1ZyhJxSqZcO5?= =?utf-8?q?m1oPBd73EyqMAHGFgfK/VxSFqYxOYtaKC/4ecCyX1q0LF7DEAoNa077tWO9Oq+bAC?= =?utf-8?q?VBO+J7tMlOmVqs58h8Ksa4vo4Uw9fKXZKej9aXGGc4h6OZ6b59xspzzpL0+c3zuWE?= =?utf-8?q?4ywm5aUztE5ksckaEahHNLns81JDbEpLTC5Qr5QfOqESO42Cl/JuE9P5xSaQ7Vrei?= =?utf-8?q?PLp/glsn0badVIoAroDmn0KBsJ1gEBjH75zd2kKOEGTuhxod6dnlew/E/erzTNm8V?= =?utf-8?q?TsVDmn4SiYu1zTKJryQeb3/iByHwk9ntUb0Nbdf3ANpiLZiBZhQqVrIM8QH8C6Fxi?= =?utf-8?q?Dvkyr5f4VNjVXTLCcqbCT3my1PMxP3c+3Y4urKdrg0ZkOPNS5JVo9JxMhqmO0/xAU?= =?utf-8?q?IYuqdkDpXVtegVb60Af2LP+7Qp1vSGWJGg=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb4cece2-35ba-4791-2d8b-08db87c5c702 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 19:32:52.0990 (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: dafnva9UwH3T23QzK7TlBk7EoMDW7H9ufAz+kkWahR+FjPgMmTD/ixEFX4W40ZaiGaBOe16Nzz4SfpAf8zO2WA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3863 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, 18 Jul 2023 19:33:05 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12415 From: Jan Kiszka We have now an official CIP kernel for 6.1, so switch over from the mainline recipe. Also switch bookworm builds to 6.1-cip by default. Signed-off-by: Jan Kiszka --- Kconfig | 9 ++++----- conf/distro/cip-core-bookworm.conf | 4 ++-- kas/opt/{6.1-mainline.yml => 6.1.yml} | 3 ++- .../linux/linux-cip-rt_6.1.38-cip1-rt1.bb | 12 ++++++++++++ recipes-kernel/linux/linux-cip_6.1.38-cip1.bb | 12 ++++++++++++ recipes-kernel/linux/linux-mainline_6.1.15.bb | 19 ------------------- 6 files changed, 32 insertions(+), 27 deletions(-) rename kas/opt/{6.1-mainline.yml => 6.1.yml} (72%) create mode 100644 recipes-kernel/linux/linux-cip-rt_6.1.38-cip1-rt1.bb create mode 100644 recipes-kernel/linux/linux-cip_6.1.38-cip1.bb delete mode 100644 recipes-kernel/linux/linux-mainline_6.1.15.bb diff --git a/Kconfig b/Kconfig index 94e807a1..ec49631e 100644 --- a/Kconfig +++ b/Kconfig @@ -97,8 +97,8 @@ config KERNEL_4_19 config KERNEL_5_10 bool "Kernel 5.10.x-cip" -config KERNEL_6_1_MAINLINE - bool "Kernel 6.1.x-mainline" +config KERNEL_6_1 + bool "Kernel 6.1.x-cip" endchoice @@ -107,12 +107,11 @@ config KAS_INCLUDE_KERNEL default "kas/opt/4.4.yml" if KERNEL_4_4 default "kas/opt/4.19.yml" if KERNEL_4_19 default "kas/opt/5.10.yml" if KERNEL_5_10 - default "kas/opt/6.1-mainline.yml" if KERNEL_6_1_MAINLINE + default "kas/opt/6.1.yml" if KERNEL_6_1 config KERNEL_RT bool "Real-time CIP kernel" depends on !ARCH_RISCV64 - depends on !KERNEL_6_1_MAINLINE config KAS_INCLUDE_KERNEL_RT string @@ -187,7 +186,7 @@ if IMAGE_FLASH && !KERNEL_4_4 && !KERNEL_4_19 config IMAGE_SWUPDATE bool "SWUpdate support for root partition" - depends on TARGET_QEMU_AMD64 || TARGET_SIMATIC_IPC227E || TARGET_QEMU_ARM64 || TARGET_QEMU_ARM || TARGET_BBB || ( TARGET_QEMU_RISCV64 && KERNEL_6_1_MAINLINE ) || TARGET_HIHOPE_RZG2M + depends on TARGET_QEMU_AMD64 || TARGET_SIMATIC_IPC227E || TARGET_QEMU_ARM64 || TARGET_QEMU_ARM || TARGET_BBB || ( TARGET_QEMU_RISCV64 && KERNEL_6_1 ) || TARGET_HIHOPE_RZG2M config IMAGE_SECURE_BOOT bool "Secure boot support" diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf index adafc92e..9bcf5593 100644 --- a/conf/distro/cip-core-bookworm.conf +++ b/conf/distro/cip-core-bookworm.conf @@ -13,5 +13,5 @@ require conf/distro/debian-bookworm.conf require cip-core-common.inc PREFERRED_VERSION_swupdate ?= "2023.05%" -PREFERRED_VERSION_linux-cip ?= "5.10.%" -PREFERRED_VERSION_linux-cip-rt ?= "5.10.%" +PREFERRED_VERSION_linux-cip ?= "6.1.%" +PREFERRED_VERSION_linux-cip-rt ?= "6.1.%" diff --git a/kas/opt/6.1-mainline.yml b/kas/opt/6.1.yml similarity index 72% rename from kas/opt/6.1-mainline.yml rename to kas/opt/6.1.yml index 0dcf3364..ac12adff 100644 --- a/kas/opt/6.1-mainline.yml +++ b/kas/opt/6.1.yml @@ -14,4 +14,5 @@ header: local_conf_header: kernel-version: | - KERNEL_NAME = "mainline" + PREFERRED_VERSION_linux-cip = "6.1.%" + PREFERRED_VERSION_linux-cip-rt = "6.1.%" diff --git a/recipes-kernel/linux/linux-cip-rt_6.1.38-cip1-rt1.bb b/recipes-kernel/linux/linux-cip-rt_6.1.38-cip1-rt1.bb new file mode 100644 index 00000000..a1ba50a9 --- /dev/null +++ b/recipes-kernel/linux/linux-cip-rt_6.1.38-cip1-rt1.bb @@ -0,0 +1,12 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +require linux-cip-common.inc + +KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip" + +SRC_URI[sha256sum] = "5e4dd386aa8a4cce341b8efeec76320feed53770ead67c838ffb321edd47b157" diff --git a/recipes-kernel/linux/linux-cip_6.1.38-cip1.bb b/recipes-kernel/linux/linux-cip_6.1.38-cip1.bb new file mode 100644 index 00000000..417de504 --- /dev/null +++ b/recipes-kernel/linux/linux-cip_6.1.38-cip1.bb @@ -0,0 +1,12 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +require linux-cip-common.inc + +KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip" + +SRC_URI[sha256sum] = "188c2ee35a13058858d71aa9121ad9f75c3834126bd93d019ab1687ce0027aa7" diff --git a/recipes-kernel/linux/linux-mainline_6.1.15.bb b/recipes-kernel/linux/linux-mainline_6.1.15.bb deleted file mode 100644 index 9b45f28e..00000000 --- a/recipes-kernel/linux/linux-mainline_6.1.15.bb +++ /dev/null @@ -1,19 +0,0 @@ -# CIP Core, generic profile -# -# Copyright (c) Siemens AG, 2018-2023 -# -# SPDX-License-Identifier: MIT - -require recipes-kernel/linux/linux-custom.inc -require recipes-kernel/linux/cip-kernel-config.inc - -ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if d.getVar('PV').endswith('.0') else d.getVar('PV') }" - -KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip" - -SRC_URI += " \ - https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz" - -SRC_URI[sha256sum] = "2c16dfe2168a2e64ac0d55a12d625ebfb963818bb48b60c1868c7c460644c4fd" - -S = "${WORKDIR}/linux-${ARCHIVE_VERSION}"