[isar-cip-core][PATCH v5 2/3] kas/opt/swupdate: Move the package installation to swupdate.inc


Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@...>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...>
---
kas/opt/ebg-secure-boot-snakeoil.yml | 4 ----
kas/opt/swupdate.yml | 4 ----
recipes-core/images/swupdate.inc | 3 +++
3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml
index 2822cef..3202076 100644
--- a/kas/opt/ebg-secure-boot-snakeoil.yml
+++ b/kas/opt/ebg-secure-boot-snakeoil.yml
@@ -18,10 +18,6 @@ local_conf_header:
image-options-swupdate: |
CIP_IMAGE_OPTIONS_append = " swupdate.inc"

- swupdate: |
- IMAGE_INSTALL_append = " swupdate"
- IMAGE_INSTALL_append = " swupdate-handler-roundrobin"
-
secure-boot-image: |
IMAGE_CLASSES += "verity"
IMAGE_FSTYPES = "wic"
diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index c2bd15c..8ba03c9 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -15,10 +15,6 @@ header:
version: 10

local_conf_header:
- swupdate: |
- IMAGE_INSTALL_append = " swupdate"
- IMAGE_INSTALL_append = " swupdate-handler-roundrobin"
-
image-option-swupdate: |
CIP_IMAGE_OPTIONS_append = " swupdate.inc"

diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
index e0252df..edc41a0 100644
--- a/recipes-core/images/swupdate.inc
+++ b/recipes-core/images/swupdate.inc
@@ -12,6 +12,9 @@
inherit swupdate
inherit read-only-rootfs

+IMAGE_INSTALL += " swupdate"
+IMAGE_INSTALL += " swupdate-handler-roundrobin"
+
ROOTFS_PARTITION_NAME = "${IMAGE_FULLNAME}.wic.p4.gz"

FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
--
2.35.1