X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-oran%2Fconf%2Fdistro%2Foran-inf.conf;h=f5f88b700563c46f1a34f9ab1753960d7af51cbe;hb=218cfab34c89aaface704c0d8c72687080a3655b;hp=b49b4e2e7a5003a11e8fc674fbb4d040d1db4379;hpb=bf045628a1807d666e6129cf4816241022013c36;p=pti%2Frtp.git

diff --git a/meta-oran/conf/distro/oran-inf.conf b/meta-oran/conf/distro/oran-inf.conf
index b49b4e2..f5f88b7 100644
--- 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,7 +20,8 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
 PREFERRED_VERSION_linux-yocto-rt = "4.18%"
 
-require conf/distro/wrlinux-ovp.conf
+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).
@@ -13,8 +29,8 @@ require conf/distro/wrlinux-ovp.conf
 DISTRO_NAME = "O-RAN-INF"
 
 # Set software versions
-PREFERRED_VERSION_dpdk ?= "17%"
-PREFERRED_VERSION_kubernetes ?= "1.15.2%"
+PREFERRED_VERSION_dpdk ?= "19.11%"
+PREFERRED_VERSION_kubernetes ?= "1.16.2%"
 GOVERSION ?= "1.12%"
 
 # Set preferred providers
@@ -28,3 +44,14 @@ MONITORING_FEATURES ?= "nagios core"
 
 DISTRO_FEATURES_append = " virtualization kvm"
 NON_MULTILIB_RECIPES_append = " ceph"
+
+# For images
+IMAGE_OVERHEAD_FACTOR ="1.1"
+IMAGE_FSTYPES += "tar.bz2 wic.qcow2"
+
+# Use the default splash
+SYSLINUX_SPLASH = ""
+
+# The recipe in oe-core is only capable of running "make scripts" and compiling
+# kernel modules, so add it into bbmask and use the one in meta-oran
+BBMASK += "/oe-core/meta/recipes-kernel/linux/kernel-devsrc.bb"