From patchwork Wed May 17 06:19:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 13244244 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 CFD55C77B7D for ; Wed, 17 May 2023 06:19:47 +0000 (UTC) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (EUR02-VI1-obe.outbound.protection.outlook.com [40.107.241.87]) by mx.groups.io with SMTP id smtpd.web11.43375.1684304386384198431 for ; Tue, 16 May 2023 23:19:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EJIYKMxd; spf=pass (domain: siemens.com, ip: 40.107.241.87, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cfrhTBc3Kp91NBbuO4+i/O4wV9ava+yl8zMmeGhjz749VxBVA7schGi1ebvzzpHS26t6DWymwmXyHsHyibrEj0Q7aw4pnX6R5PAinib/k5GlPBMwwnE47DkX18+cHYe99vU5i9BPwq1zzVk/uR+4iod1fSB0+MLteUwJ52AAx7grvRk+LCqzF1i+grLjRITsEm0XCblHZgwXNzJ9KfBayjiqWeRijpshU7fX9JbhCJTJ72wjKoeMGggZ5CpzrdwHNEokJDm5/gDDFmipZWYCwy53jy/t0B3Ob5y5tlk44uJw8lvgblMiF33NXQdaBNmdpPYyKlzuyIz89vmFwFyujA== 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=RikYGoDmP4fGPEeQYDZRa39WcznmzhYqyXnksmTD6Cw=; b=S9rDkW5NUqKrmXrquMGp1wU2cgCYA3mpPx6fgsL9IfMdqAKV5x3dcNXWf0c+iTzc2YypIf2AkfkpGmGWHA9pzr5E5KcUh6ggyUrU5vHFe6h9cJg7x31lKujfAUQWnoiR5TMmjtNLdRK89mTkALOs+WSlHX8kn5rxXJm0K4Th+q/6NLTlQpcZOSvpbXbulzMdAR0TtIUPsZ9n2L+4YEUuXCyQvwbEl5Xg8HpygrvWji32lJPhscOGC2zc0TWqa35frEP5vaE0imSUGAdLspoUxiKshF0igOL9dvfcwPAnRIC5/POOEMbDEtaSlNCjqrpGwYnHbMYQBog2rS9MyrAnXg== 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=RikYGoDmP4fGPEeQYDZRa39WcznmzhYqyXnksmTD6Cw=; b=EJIYKMxdsa4oxpXxs14KEpODi7rQaRnwGxSpU2JcMOnZQvFn4pXYuWeMw6lA/9bpZo30n8aK5VnJMfRmao9r7T7BxPn3Xzv8puaFhk/aPo+TBkj4Js/pG4dvNP5MlGdznsAX5QqXpMW47Uglz/hsKwc/olLPICwLNVKwHoZR8sYizrBGIw72bOKP+suG4UvzEygRbeKMRTRhVT5xuVitjvB9ok47c7RRjFo0tAik5q4Z4jsJX0XgSwAYsb1SuNfaD7EvFeCCkOmCENlLjxnA03KstEKMhBLmTNbrycqEYFHpm4TLOdnhRL7ESakaFtzY1T5V94fixNV35ZuXerEpZg== 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 AM0PR10MB3601.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:158::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.17; Wed, 17 May 2023 06:19:43 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::d638:8333:21fb:5f18]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::d638:8333:21fb:5f18%6]) with mapi id 15.20.6387.032; Wed, 17 May 2023 06:19:43 +0000 Message-ID: Date: Wed, 17 May 2023 08:19:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 From: Jan Kiszka Subject: [isar-cip-core][PATCH] linux: Factor out cip-kernel-config and use it for 6.1 mainline as well Content-Language: en-US To: cip-dev X-ClientProxiedBy: FR2P281CA0033.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::20) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AM0PR10MB3601:EE_ X-MS-Office365-Filtering-Correlation-Id: 99507134-f2ec-4090-ecd6-08db569eb41a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ytMijFm6JbilK8SauZjRgxsBBwuzIJkDwaFNo2agr96Hq15Yd9MpIV5rREfkAQltJF6uBg6YUyc+uVV4FZ1u78OE3ppETfFtePekLjhdp2hJmTstP/QiiTXjcqNtB56E1Q2hYmJ8axh6+B2IxzgD86KBpkDTmWTFT+pu0v3xFjfIAT8iAi+W6UKCdDAi+rP8ZWOUIMKy2unhEaYWWFbTtpXBNzyyeWkyyw+/KYpshffMgIy/djQYhE58cFi4rFvXeAiwKTGQrXRGREuT0oYd9dfE9MytDVNNzDH1xiGnhMCPD97dpdm7CUOSo1qi0yr4V6WGj5Ev+K8Ce0XtrU0eQEWCmejrp9dlwGHKQzUDXhzaNK/mpgTL7WPiwhiPudod1aqf9Ij9No+ZbBp0KsS+RYJLZCKhrgPxsrgtkemx9XSUPmTqX1Oua1zni98bD1Su9jbADvRSqoyk6aiC6K399GNwRuBpaBtMJp/EyyHysONk7GRyhKDMH8k/YViR/czkw57HTfSOuUYMO7tjY88FBHQIUUIJM8KjApN6IcT+blDz98hWSBg2aeY90Ia9dZI2IYO3Upp+mx6+U7rRbsKhKwo6KrzNaS9pQ7tl4hkqNB2FMrvmaJMdS+LE17UnVqdPcAIUFiG1fNXBRzLjZWZkoQ== 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)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199021)(31686004)(82960400001)(41300700001)(8676002)(2906002)(8936002)(36756003)(6916009)(5660300002)(31696002)(86362001)(316002)(38100700002)(66476007)(66556008)(66946007)(83380400001)(966005)(6512007)(6506007)(26005)(186003)(44832011)(478600001)(2616005)(6486002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?o51Hq6fOhGKu/z9tx8AYXjawM3iV?= =?utf-8?q?UI0Qyz+gyhgSHnbL2lj05S0+wJeHJuKBGxFzGax4ylnQQ7d79KULD3/Dw8WAwnHCH?= =?utf-8?q?IfUyusPiNuL774IGh56dHTbfa6722vgd3By60qeIPzaU2IbYJVJYVeDfktcRiUSFC?= =?utf-8?q?15+mL3YC8Qz7gj+I0CRZ70+0t3aaooUeQXYtlyhbL9fBYartEhuGywG7dwJ9pso+1?= =?utf-8?q?XSeJmoeXM8v60QLUpNwqPmg9ArKTsXA1XkmRHBr2/fc4jlN9ntMAEFwTzN5iMmpDn?= =?utf-8?q?HsT8Raqmx8DP4BgG3EXljhxhgoD9UTr8xI2WK3zBOy6noJS9Vwt5kGiXSg2l0mPk1?= =?utf-8?q?Hj5fMqMlxVEDO59JWsUBfLtk14zMoXvzWlh9aznzHPP50IKB+8Mria1V86+hSFR6g?= =?utf-8?q?o6DszzoeXFpR1++wFIxThJ0DOUj9aPCdXvW2PrtErNrb9QSbBhoXoEO3hSoiUkuyL?= =?utf-8?q?Bj9VIDRV2BrGJ8BLNjyZLD7shxW747PeBSTjPtrF0L47QwGyGHWUK82ve3mWy8AU+?= =?utf-8?q?rtTao185hA0hBDweIjmqvxd6yY+zH4BXBUWNsoH4/KB7ojbGLtTD6o+OJYoTEn8E5?= =?utf-8?q?5mVrW1tAEegdjkMf13P3laXZPjD95sAS80E6s20g+Fm174e4Rc4k4bAhMfSOkhkL5?= =?utf-8?q?amfv4tcjP0lJXCBM1lmyR4/EXTymA4gPWosr0rdYATwxNudhgFHglacuWFaXUetbo?= =?utf-8?q?BDj0J7C0xc6LQakfFSWpfyPf3JLAadyHDbvpCA1yl7rVBLt8TDCk51pYP/gMOzb6W?= =?utf-8?q?fgfs/oZdHE6QbWsojV4seMg3kzbx9PW3OphGk7+T8aedjShdWSKKKnhsZhRsaPfnX?= =?utf-8?q?R+o8Fa7I/wFBX2Ld0jH+j8e/N/5fxLZyrR9cy/DDFaRuO6lteoVl6Gx78j3f+hR4Z?= =?utf-8?q?OmKJs/itfZfNqjDTcMo3DYzD3AIssGDjklYWR+GFu8K3BBA3AgWizshH6RtCWboKo?= =?utf-8?q?rPaRVOEXMGB/TXxNypcKCpHiNgt7SYcRF6o2SEv/3/rzN98nvWC8/H88rLtY4bmlg?= =?utf-8?q?6XvVIYntY3b9zPmTR65GT4ZSG3twd4ef3//1FV7aQxko8l3m1RNb+MldbuX1VJP9N?= =?utf-8?q?EjJHwC7k7nidxd+ljxkC7A3DaqnWy789IVhij+9C5mdqlvT/BnrBkH6Gp5Hk0Ome1?= =?utf-8?q?eHWHns2yDye5UC9C7cAXX5Yn/nI47ffXcxg4d5FNasdvQpbgEwOYU/xNEOgPOyxw7?= =?utf-8?q?k9XBwyAO6YLPZJBesCXidlZxXmC20kXXeZmVqVZltlSLWKTh+DjMkHbU/wfl3qQh+?= =?utf-8?q?oM105X4I1/FNM47rsEsYgVgjwLLaYtb3bwMrkZj1n/+Mb257YI2Ek4kX82gfHtXBQ?= =?utf-8?q?Gci9REaIg2XB45XsgWqr0UzYc6xI7tzqRf72Kg2m1D2NrHtiDs0Vum2pFJohjEWFH?= =?utf-8?q?DoREhBgKdVYtXzrUhXq/GusNNQGnedRtVOwU6j0EMDvawFcOBrWCgYpvJC5jmSElG?= =?utf-8?q?f2Jcq1k42JVRit9owlF8SB30HHUz33zz6UCZ3SIY3R/c/1rKzSO3rJueidDM0jkbv?= =?utf-8?q?laPPHEzbdxAR?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99507134-f2ec-4090-ecd6-08db569eb41a X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2023 06:19:43.0615 (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: Hzu0NhZ3ykpkvKo8np9a4YaL77szzFO57V9Ly6P+nFakah9HR4OugyEJeWwAMgOBqHPGs+8jrBqK2pi6idf+Ww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3601 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 ; Wed, 17 May 2023 06:19:47 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/11483 From: Jan Kiszka This fixes the build of linux-mainline for targets that have USE_CIP_KERNEL_CONFIG set. Signed-off-by: Jan Kiszka --- recipes-kernel/linux/cip-kernel-config.inc | 17 +++++++++++++++++ recipes-kernel/linux/linux-cip-common.inc | 9 ++------- recipes-kernel/linux/linux-mainline_6.1.15.bb | 3 +++ 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 recipes-kernel/linux/cip-kernel-config.inc diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc new file mode 100644 index 00000000..329b9f7e --- /dev/null +++ b/recipes-kernel/linux/cip-kernel-config.inc @@ -0,0 +1,17 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2022-2023 +# +# Authors: +# Jan Kiszka +# +# SPDX-License-Identifier: MIT +# + +SRC_URI:append = " ${@ \ + 'git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;branch=master;destsuffix=cip-kernel-config;name=cip-kernel-config' \ + if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \ + }" + +SRCREV_cip-kernel-config ?= "d1efa37258380c7f4f39a8dee1bdb4d85f1c0199" diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc index a700d30e..c0f076a9 100644 --- a/recipes-kernel/linux/linux-cip-common.inc +++ b/recipes-kernel/linux/linux-cip-common.inc @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2022 +# Copyright (c) Siemens AG, 2022-2023 # # Authors: # Jan Kiszka @@ -14,15 +14,10 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" KERNEL_DEFCONFIG ?= "${MACHINE}_defconfig" require recipes-kernel/linux/linux-custom.inc +require recipes-kernel/linux/cip-kernel-config.inc SRC_URI += " \ https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \ " -SRC_URI:append = " ${@ "git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;branch=master;destsuffix=cip-kernel-config;name=cip-kernel-config" \ - if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \ - }" - -SRCREV_cip-kernel-config ?= "d1efa37258380c7f4f39a8dee1bdb4d85f1c0199" - S = "${WORKDIR}/linux-cip-${PV}" diff --git a/recipes-kernel/linux/linux-mainline_6.1.15.bb b/recipes-kernel/linux/linux-mainline_6.1.15.bb index f6cd7b8b..690f6dd0 100644 --- a/recipes-kernel/linux/linux-mainline_6.1.15.bb +++ b/recipes-kernel/linux/linux-mainline_6.1.15.bb @@ -5,9 +5,12 @@ # 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 \ file://squashfs.cfg"