From a652a95b70b6f53c914fd2e783ca94875ce0fcb6 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Mon, 21 Oct 2019 17:41:10 +0800
Subject: [PATCH] oran-image-inf-host: add all oran packagegroups

packagegroup-oran depends on all the following:
 - packagegroup-oran-base
 - packagegroup-oran-docker
 - packagegroup-oran-k8s
 - packagegroup-oran-vm
 - packagegroup-oran-trace-tools
 - packagegroup-oran-lttng-toolchain
 - packagegroup-oran-glusterfs

Issue-ID: INF-4
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I6d93f3af84b3dfb27f4797a878331b6504c5ebb2
---
 meta-oran/recipes-base/images/oran-image-inf-host.bb      | 4 +---
 meta-oran/recipes-base/packagegroups/packagegroup-oran.bb | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta-oran/recipes-base/images/oran-image-inf-host.bb b/meta-oran/recipes-base/images/oran-image-inf-host.bb
index efef37b..688ffa3 100644
--- a/meta-oran/recipes-base/images/oran-image-inf-host.bb
+++ b/meta-oran/recipes-base/images/oran-image-inf-host.bb
@@ -19,9 +19,7 @@ IMAGE_INSTALL += " \
     kernel-modules \
     openvswitch \
     packagegroup-base-extended \
-    packagegroup-oran-docker \
-    packagegroup-oran-glusterfs \
-    packagegroup-oran-lttng-toolchain \
+    packagegroup-oran \
     packagegroup-wr-base \
     packagegroup-wr-base-net \
     python-pyparsing \
diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
index 0f88bf3..bbafcf0 100644
--- a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
+++ b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
@@ -13,7 +13,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 PROVIDES = "${PACKAGES}"
-PACKAGES = " \
+PACKAGES += " \
     ${PN}-base \
     ${PN}-docker \
     ${PN}-k8s \
-- 
2.16.6