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

[pti/rtp.git] / meta-oran / conf / distro / oran-inf.conf

diff --git a/meta-oran/conf/distro/oran-inf.conf b/meta-oran/conf/distro/oran-inf.conf
index 1f3a1b0..cb09707 100644 (file)
--- a/meta-oran/conf/distro/oran-inf.conf
+++ b/meta-oran/conf/distro/oran-inf.conf
@@ -1,3 +1,18 @@
+#
+# 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.
+
 #@TYPE: Distro
 #@NAME: O-RAN INF
 #@DESCRIPTION: O-RAN INF Distribution
@@ -5,6 +20,9 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
 PREFERRED_VERSION_linux-yocto-rt = "4.18%"
 
+require conf/distro/wrlinux.conf
+require conf/distro/include/oran-whitelist.conf
+
 # Note that layer.conf will only add items to BBFILES for
 # the wrlinux-oran distro (this one).
 #
@@ -28,5 +46,8 @@ DISTRO_FEATURES_append = " virtualization kvm"
 NON_MULTILIB_RECIPES_append = " ceph"
 
 # For images
-IMAGE_OVERHEAD_FACTOR="1.1"
-IMAGE_FSTYPES += "tar.bz2 live wic.vmdk wic.vdi wic.qcow2"
+IMAGE_OVERHEAD_FACTOR ="1.1"
+IMAGE_FSTYPES += "tar.bz2 wic.qcow2"
+
+# Use the default splash
+SYSLINUX_SPLASH = ""