From: Jan Kiszka <jan.kiszka@siemens.com>
To: cip-dev <cip-dev@lists.cip-project.org>
Cc: Srinuvasan A <srinuvasan.a@siemens.com>
Subject: [isar-cip-core][PATCH] Make CIP_IMAGE_OPTIONS reusable outside of isar-cip-core
Date: Mon, 3 Jul 2023 19:16:53 +0200 [thread overview]
Message-ID: <99667736-0756-1be0-38b2-3d4e05fd3877@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
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 <jan.kiszka@siemens.com>
---
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 <jan.kiszka@siemens.com>
@@ -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}
--
2.35.3
reply other threads:[~2023-07-03 17:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=99667736-0756-1be0-38b2-3d4e05fd3877@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=cip-dev@lists.cip-project.org \
--cc=srinuvasan.a@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.