Merge "build_oran.sh: add support for nxp-lx2xxx"

[pti/rtp.git] / meta-oran / conf / layer.conf

diff --git a/meta-oran/conf/layer.conf b/meta-oran/conf/layer.conf
index 34e906f..3c7b8ad 100644 (file)
--- a/meta-oran/conf/layer.conf
+++ b/meta-oran/conf/layer.conf
@@ -1,6 +1,17 @@
 #
 # Copyright (C) 2019 Wind River Systems, Inc.
 #
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
 
 # We have a conf and classes directory, add to BBPATH
 BBPATH =. "${LAYERDIR}:"
@@ -9,7 +20,7 @@ BBPATH =. "${LAYERDIR}:"
 BBFILES += " \
     ${LAYERDIR}/recipes-*/*/*.bb \
     ${LAYERDIR}/recipes-*/*/*.bbappend \
-    "
+"
 
 BBFILE_COLLECTIONS += "meta-oran"
 BBFILE_PATTERN_meta-oran = "^${LAYERDIR}/"
@@ -23,21 +34,20 @@ LAYERSERIES_COMPAT_meta-oran = "thud wrl"
 LAYER_PATH_meta-oran = "${LAYERDIR}"
 
 LAYERDEPENDS_meta-oran = " \
+    cloud-services-layer \
     core \
+    dpdk \
+    realtime \
+    virtualization-layer \
     wr-template \
     wrlinux \
     wrlinux-distro \
-    wrlinux-ovp \
-    virtualization-layer \
-    cloud-services-layer \
-    realtime \
-    dpdk \
-    "
+"
 
 LAYERRECOMMENDS_meta-oran = " \
     meta-anaconda \
-    "
+"
 
-PNWHITELIST_LAYERS_remove = "meta-oran"
+PNWHITELIST_LAYERS_remove = "meta-oran wrlinux-distro"
 
 TEMPLATES_PATH = "${LAYER_PATH_meta-oran}/templates"