From e5b84457e9cb060f8bd5654177d91eb1034adf8f Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Fri, 31 Aug 2018 06:34:03 -0400
Subject: meta-arm: Move layer content from common/

Adopt a more conventional directory hierarchy.  The current hierarchy
was copied from meta-openpower which has also changed in a similar
fashion.

(From meta-arm rev: fee619108bf8d10a6a570fcca619339932d61f42)

Change-Id: I485fd5ee62e9310ae13e09254fa12f8daed59a66
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../packagegroups/packagegroup-arm-apps.bb         | 36 ----------------------
 meta-arm/conf/layer.conf                           |  4 +--
 .../packagegroups/packagegroup-arm-apps.bb         | 36 ++++++++++++++++++++++
 3 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 meta-arm/common/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb
 create mode 100644 meta-arm/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb

diff --git a/meta-arm/common/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb b/meta-arm/common/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb
deleted file mode 100644
index 4a32e6e98..000000000
--- a/meta-arm/common/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "OpenBMC for ARM Server - Applications"
-PR = "r1"
-
-inherit packagegroup
-inherit obmc-phosphor-license
-
-PROVIDES = "${PACKAGES}"
-PACKAGES = " \
-        ${PN}-chassis \
-        ${PN}-flash \
-        ${PN}-system \
-        "
-
-PROVIDES += "virtual/obmc-chassis-mgmt"
-PROVIDES += "virtual/obmc-system-mgmt"
-
-RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
-RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
-RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
-
-SUMMARY_${PN}-chassis = "ARM Server Chassis"
-RDEPENDS_${PN}-chassis = " \
-        obmc-button-power \
-        obmc-control-chassis \
-        obmc-op-control-power \
-        "
-SUMMARY_${PN}-flash = "ARM Server Flash"
-RDEPENDS_${PN}-flash = " \
-        obmc-flash-bmc \
-        obmc-mgr-download \
-        obmc-control-bmc \
-        "
-SUMMARY_${PN}-system = "ARM Server"
-RDEPENDS_${PN}-system = " \
-        obmc-mgr-system \
-        "
diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf
index 38f0a0d41..42b1b8524 100644
--- a/meta-arm/conf/layer.conf
+++ b/meta-arm/conf/layer.conf
@@ -2,8 +2,8 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \
-            ${LAYERDIR}/common/recipes-*/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "arm"
 BBFILE_PATTERN_arm = "^${LAYERDIR}/"
diff --git a/meta-arm/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb b/meta-arm/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb
new file mode 100644
index 000000000..4a32e6e98
--- /dev/null
+++ b/meta-arm/recipes-phosphor/packagegroups/packagegroup-arm-apps.bb
@@ -0,0 +1,36 @@
+SUMMARY = "OpenBMC for ARM Server - Applications"
+PR = "r1"
+
+inherit packagegroup
+inherit obmc-phosphor-license
+
+PROVIDES = "${PACKAGES}"
+PACKAGES = " \
+        ${PN}-chassis \
+        ${PN}-flash \
+        ${PN}-system \
+        "
+
+PROVIDES += "virtual/obmc-chassis-mgmt"
+PROVIDES += "virtual/obmc-system-mgmt"
+
+RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
+RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
+RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
+
+SUMMARY_${PN}-chassis = "ARM Server Chassis"
+RDEPENDS_${PN}-chassis = " \
+        obmc-button-power \
+        obmc-control-chassis \
+        obmc-op-control-power \
+        "
+SUMMARY_${PN}-flash = "ARM Server Flash"
+RDEPENDS_${PN}-flash = " \
+        obmc-flash-bmc \
+        obmc-mgr-download \
+        obmc-control-bmc \
+        "
+SUMMARY_${PN}-system = "ARM Server"
+RDEPENDS_${PN}-system = " \
+        obmc-mgr-system \
+        "
-- 
cgit v1.2.1