From fd0411d38d889b74958bcb6e461c80f65133d737 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Tue, 26 Dec 2023 23:33:36 +0900 Subject: [PATCH] Move cluster core package to cluster demo image This patch is a workaround. Current guest-image-minimal is used by guest-image-cluster-demo and guest-image-ivi-demo. The cluster core package is include at guest-image-minimal. In this case, cluster core package is install to cluster and ivi image. That cause twin cluster service run on one system. This patch fix this issue, but it's only a workaronud. Will be re-structure for image-recipes. Bug-AGL: SPEC-4990 Change-Id: I5b9a23042e0796b49ed7703b5860c8a600007251 Signed-off-by: Naoto Yamaguchi --- .../recipes-platform/images/guest-image-cluster-demo.bb | 1 + meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb index b987370c..be3a8848 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb @@ -4,6 +4,7 @@ LICENSE = "MIT" require guest-image-minimal.bb IMAGE_INSTALL += " \ + packagegroup-agl-ic-core \ weston \ weston-init-guest \ weston-ini-conf-guest \ diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb index ea19f5ed..ea66f248 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb @@ -5,7 +5,6 @@ SUMMARY = "A minimal container guest image" IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}" IMAGE_INSTALL += " \ - packagegroup-agl-ic-core \ packagegroup-agl-container-feature-logging-guest \ " -- 2.16.6