From patchwork Mon Jul 3 17:16:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 13300306 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 2D40CC3063F for ; Mon, 3 Jul 2023 17:17:13 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.54]) by mx.groups.io with SMTP id smtpd.web11.39004.1688404624826641006 for ; Mon, 03 Jul 2023 10:17:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZjWJaqSr; spf=pass (domain: siemens.com, ip: 40.107.8.54, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PBNZTeXjI1xByEnQUX2LzqqGKa6ECpjzS6vPgSTWqBV8j6QdFjswswgAa8fj7fw6rdN+Usdgvn9xpfBmAHJFFCLBkLKXT/FBJlA8VTM5gJfQr0plPmZtu5YmyQbVhy9Arm7TFt9pJ6/+2sZJpahD5Sio7hFFhZXBCqbuyZXYoFor0lXgFCyvbS9OYD+cSTAHrfM1Waha9KN3U5er+iqX1vKJN+X9tW4FCphNhasYkAHr4BEZDJ4P8nwSBODH0AlSwyqEw80CaeBk/jIeOfkjE2WYITBjzE0E0/x6aM1VyQZnSyaLVX6Q4nzhvZqgyZdsXaSwsucg77NfneHi3GHZig== 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=SPdm3hhXeDF24N9umE8YsqUNmLJVzVtIizQ/vJ89kVs=; b=OqSVNuxbTDUjy9QmS11koXRm+/KiCf0PZFxt33ioiXq9bZAcyFb+eHwlJcH03cumnTZOBillxFDW23qF9hxApZOLIww1V6ChED6hFcbA914xHV7SzlDR+5DX1hSQ+koxHo2ixP2kqCbfU1HtsuH5bc4Ph5Y0MkDm1mX85xxJO8Wc7V3jeY6gmvp5tDBGtPYgCy92+p1CRtXYA9DFbFTdP3vte6jqYQjT5zeCbBiliHqgzdnsCd4c5f2OQj/46NxypFnRCh81v1umHZBgwjg+OzjaL8ovXQHJ6whIOVNSNFSrHDU3DrtWBut5yUSXAF65w8TM3kHQoEKbOfZb8L4LyQ== 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=SPdm3hhXeDF24N9umE8YsqUNmLJVzVtIizQ/vJ89kVs=; b=ZjWJaqSrl51uzXzl/bflGdtniRSXB6vAVBw2KuUbgM4mJQvP0ryW1gxuQKAZ4l2nmNwkut8jajAhb7Hkdt+ppqHgVAEvf4j5lls8ijn8IvkracFMKFdH9gatRDtrda8aWXW8Wfh+z3d3s6m6zGeq+CgZq3hmk782UC+bGTXzf0wsppAdJ/RgMcDmqw3Zfu/kmbCcVf0mFQp0HprVhLwD8Xsu8ZDowoxsg5TKSGT4wc4mRVf7ovSOJmh/yeiMbuSgktXLmv6r3xZeI9hlOw3iD6dGLJgR6jS4mVkay+MAunXB6qY84yWpbncJF8LVEhrZHlMyeqwcnXS7BXiVE3X1Rw== 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 AS1PR10MB7933.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:481::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.24; Mon, 3 Jul 2023 17:17:01 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::53c2:174a:8b13:ce94]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::53c2:174a:8b13:ce94%3]) with mapi id 15.20.6544.024; Mon, 3 Jul 2023 17:17:01 +0000 Message-ID: <99667736-0756-1be0-38b2-3d4e05fd3877@siemens.com> Date: Mon, 3 Jul 2023 19:16:53 +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] Make CIP_IMAGE_OPTIONS reusable outside of isar-cip-core Content-Language: en-US To: cip-dev Cc: Srinuvasan A X-ClientProxiedBy: FR2P281CA0179.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::15) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS1PR10MB7933:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ef9d1ff-457f-45a2-98b4-08db7be950ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c2Mi/zn1A2ViuKjwVwg+cwJL3G15GJ6NHkulsf0B85JFC4K+ZHIEe6j4RoAMpls5TzOCCtDZJX0XxX2Urg0Lzsj5yDxX1B6wKCijriqw9jstBMcHo5W4mmFh+pE0lL858CX8BitICu/k+o7Galoij0oBqZ8WQK/WCMXI4bSx45rF90kmByyNLvRBNjEATZO9Ehz39zu+hWgEfspIltqCz0irYnxmMX2+ZZMPqDueKTb+aVEQJ6NYA1YD6qYm22Zkn3Pwu7TDnO0enwDffPIB/xG2YyHS0VrCQ347mphC4MftRDuNctDj43t8Iwx/yqNHvHnWFT0w2ZUnSXPR5lZmDk++tq0Ytw+YYDO+KAA0Pzw9XiZazqJJeK7NVR47eX4aSvHWQ+o5ERpSpRNOMrcOUcxufDj3nCbPMmRZD9k4heLg/QVuSZZ5oQNfxAvLPyYKPH7mTdOC8ftRjAKfc1aZHyEU3G5nkJxFTwBj1eYn8PTrADe/6ZS7Qc1BqTjD+OejHGLWZ5OSjiCWcgj/XyBebArqBMAMoprdM2oLLLx38HOWZUJpBGF8405iZfFS/3/roxPgXRm0I3CHa25Fbw8+dD1qYtLA8JKVbeMPjzBHr98CQmR2ipEs9SXmz0ONBZy9ld52hWrowRseNjIWrfpvUg== 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)(346002)(136003)(376002)(396003)(451199021)(4326008)(316002)(31686004)(66556008)(66476007)(6916009)(66946007)(31696002)(6512007)(6506007)(26005)(86362001)(186003)(107886003)(83380400001)(82960400001)(2616005)(2906002)(6486002)(38100700002)(6666004)(44832011)(5660300002)(478600001)(8676002)(8936002)(41300700001)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ICrLiYtaIFZzNhWIaKOn5SWhoBOW?= =?utf-8?q?PckEAisg2rKcjpyBrIUeDN1ywz3hutx5lYg2ZViEePsY03s3PedGk/Fxf8Z2qRHx3?= =?utf-8?q?BKOLOQmBRpB5iz07opRRyyGUsuHdvZ9eht2oXk+Hd51MNGd0ZR7d1PChIQDNo21V1?= =?utf-8?q?GxlBwKNDtAG4XUs/VPyRbti9SEBdOOjkKpfmVGSHdMKaQ+NGfLEnjwV56w1LEkrRT?= =?utf-8?q?p1POzlF23U9rsCYpWLB5ykb+mAHft9HMr1hK2oMyMmaS/4zhGqmBzOLuPwqSYs3u/?= =?utf-8?q?7+LYKJGCvtgHWVK6FQdhPmPacMYscKZKS/hNXeUSXa+rqL4O80q4v+dE1nHpPDjRu?= =?utf-8?q?pqtyt3yOzXCE6Ntu/xlQ5ZLSKFcij+G5LljjW1HC6Qxlxfz0V+6IMjV5KfRxjdtdR?= =?utf-8?q?x6fRxShYydKOvo7GBK0Npq/cRkJHyAGF5OzPX/lHhigbkQzJ78GZ98wwaPF2Qpuc7?= =?utf-8?q?3p6ByZ0CdBH3awYntg/9y7WsMrBLJMsVjAtJzbj7wDoHuX9p6+hPAyIlyMOPf/FOw?= =?utf-8?q?/6nD6NKQFtzaSPRKG6RTgJhl220+J/BIS/R717o8+y/PfV96nUz5ZH8e+04SMPboT?= =?utf-8?q?hvfnEdf8WWLWrv0SK7H/YVinMqjAr0rTeVDqjMzdpEjQW7ehZWdIsTP5s48XfRCRJ?= =?utf-8?q?a2KPfL7zvTBK+sfLit1Qav43GX8wKJvbZBBKsp+NjlAG4TYel7LOFptubyfPdN72J?= =?utf-8?q?3howSF0R9jmUP9B1HtYD78d6ZHDmwqEX2TGDQYwjxYE2zYRoZlyeuBLOpbUHSj3fm?= =?utf-8?q?/f9TCSdDNPVsbvqU9gvChrs9l0tbWnR4eF/3nyO/qLzXFPqvcl1e7TkIk6xLzBfrK?= =?utf-8?q?0X0OnE8kv5L9SU4lFruc1rmsHP72Npta5OTRC1IMSm7EjhQe1/MUKxvGpAEzR3eWM?= =?utf-8?q?MD+ZZJ2cslgSolJlh8VHuKnDVc6vwKKekiXJnzNZenhMNgg4NjUlsKYx9JDap4oAf?= =?utf-8?q?icI1Jy3YS+UuazGndanYmFUkMn0jRLNlzNhvBlNwKsAwcGpqyTsX8SGkqbgqa3UyJ?= =?utf-8?q?0gUVBmh1nYOnlXSANfkumxZ6WGQ7yb3/0hC4/qJft2uw8DcZJcx8mqBmN+RNDjZHK?= =?utf-8?q?BzlAGLiV+ws3/Lil7yOdyo4iLtGvwbsVVi7S1MnXGqYjop1eWDrjm4mRbtw53UeeS?= =?utf-8?q?xrOcl3s58J1rbeVDOsWx8JZdPw14tMfnnv/DuFNkkKMY5i+rSfaRpmJ0fegcnj6Jp?= =?utf-8?q?0tzRWyDk+0fi5OBeXHNE3KFS+8cjI6vVZ7N3uAlgZYQK9xnI8NDvKH3OXXG9HC8o2?= =?utf-8?q?RQeXOniZpDTO2b91LP5NO3yHARoNhSHhUyE3Xt34XJCYG6mLX2dYiJTDyqNpt41dJ?= =?utf-8?q?2jhgGmx8tI5zX9O+ftEI1CYcaHvDmQRvZ6IPdLdm7bF3dunRnwwzQ6r9Ev4uYEq10?= =?utf-8?q?v1koF2F16BJhZMHJghxnK8YohqyyauNrDliubTQiv7dL3WorUpQQaVG5pqV8LYLDy?= =?utf-8?q?1LWRrvyipkIhFRATf/3V0qOudvOYWXnnXdgYjcfnbE1TZySKuM+tcOzhdmhKDJrV+?= =?utf-8?q?JPieiPm7anY3ToUJoPKkmc+Z0kFgLWD4aw=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ef9d1ff-457f-45a2-98b4-08db7be950ae X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2023 17:17:01.5468 (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: Cr161EfzWJuLW3AAPGTiQ0rCo8pKBdn7LGpwwCb0aNExSkLIRHx2vbT9ALmC2eURW1Z2il56ThB5tOTG0ZaiZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR10MB7933 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 ; Mon, 03 Jul 2023 17:17:13 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/12195 From: Jan Kiszka Prepend the needed recipe paths so that downstream layers can use kas fragments and also include CIP_IMAGE_OPTIONS. Move the default definition of CIP_IMAGE_OPTIONS to the common config file so that it does not need to be set in downstream as well. Signed-off-by: Jan Kiszka --- conf/distro/cip-core-common.inc | 4 +++- kas/opt/ebg-swu.yml | 4 ++-- kas/opt/swupdate.yml | 2 +- recipes-core/images/cip-core-image.bb | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conf/distro/cip-core-common.inc b/conf/distro/cip-core-common.inc index 5cd1603e..5d3ce106 100644 --- a/conf/distro/cip-core-common.inc +++ b/conf/distro/cip-core-common.inc @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2023 # # Authors: # Jan Kiszka @@ -12,3 +12,5 @@ KERNEL_NAME ?= "cip" WKS_FILE ?= "${MACHINE}.wks" + +CIP_IMAGE_OPTIONS ?= "" diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml index 1c12ad56..c90142ba 100644 --- a/kas/opt/ebg-swu.yml +++ b/kas/opt/ebg-swu.yml @@ -20,12 +20,12 @@ local_conf_header: SWUPDATE_BOOTLOADER = "efibootguard" IMAGE_INSTALL:remove = "u-boot-script" ebg_swu_image_options: | - CIP_IMAGE_OPTIONS:append = " efibootguard.inc" + CIP_IMAGE_OPTIONS:append = " recipes-core/images/efibootguard.inc" initramfs: | INITRAMFS_INSTALL:append = " initramfs-abrootfs-hook" firmware-binaries: | # Add ovmf binaries for qemu - CIP_IMAGE_OPTIONS:append:qemu-amd64 = " deploy-ovmf.inc" + CIP_IMAGE_OPTIONS:append:qemu-amd64 = " recipes-core/images/deploy-ovmf.inc" # not needed for Debian 11 and later DISTRO_APT_SOURCES:append:qemu-amd64:buster = " conf/distro/debian-buster-backports.list" DISTRO_APT_PREFERENCES:append:qemu-amd64:buster = " conf/distro/preferences.ovmf-snakeoil.conf" diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml index 1528b090..b0293cef 100644 --- a/kas/opt/swupdate.yml +++ b/kas/opt/swupdate.yml @@ -16,7 +16,7 @@ header: local_conf_header: image-option-swupdate: | - CIP_IMAGE_OPTIONS:append = " swupdate.inc" + CIP_IMAGE_OPTIONS:append = " recipes-core/images/swupdate.inc" OVERRIDES .= ":swupdate" wic-swu: | diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.bb index 0ec72208..f7370c49 100644 --- a/recipes-core/images/cip-core-image.bb +++ b/recipes-core/images/cip-core-image.bb @@ -16,5 +16,4 @@ DESCRIPTION = "CIP Core image" IMAGE_INSTALL += "customizations" -CIP_IMAGE_OPTIONS ?= "" require ${CIP_IMAGE_OPTIONS}