From b73f98d575e296ab518d7c7ad20357a88c150c6e Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 10 Jun 2020 16:10:41 +0800
Subject: [PATCH] packagegroup-oran: fix build for ARM

- 'turbostat' and 'msr-tools' is only compatible with x86/x86-64,
  so do not add them for other arch.

- Add 'cpupower' into the whitelist.

Issue-ID: INF-159
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I5f7230aa9e478b6770c4e2d220649b6816e9ebc9
---
 meta-oran/conf/distro/include/oran-whitelist.conf         |  1 +
 meta-oran/recipes-base/packagegroups/packagegroup-oran.bb | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/meta-oran/conf/distro/include/oran-whitelist.conf b/meta-oran/conf/distro/include/oran-whitelist.conf
index d3e8ac4..f491a83 100644
--- a/meta-oran/conf/distro/include/oran-whitelist.conf
+++ b/meta-oran/conf/distro/include/oran-whitelist.conf
@@ -80,6 +80,7 @@ PNWHITELIST_openembedded-layer_append = " \
     openldap \
     byacc \
     cpufrequtils \
+    cpupower \
     msr-tools \
     htop \
 "
diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
index e967b13..550a3dc 100644
--- a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
+++ b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
@@ -51,13 +51,21 @@ RDEPENDS_${PN}-base = "\
     tunctl \
     udev \
     udev-extraconf \
-    turbostat \
     cpupower \
     cpufrequtils \
-    msr-tools \
     htop \
 "
 
+RDEPENDS_${PN}-base_append_x86 = "\
+    turbostat \
+    msr-tools \
+"
+
+RDEPENDS_${PN}-base_append_x86-64 = "\
+    turbostat \
+    msr-tools \
+"
+
 RDEPENDS_${PN}-docker = "\
     docker \
     docker-registry \
-- 
2.16.6