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=refs%2Fchanges%2F02%2F4602%2F1;hp=131c2ad3535abdea771f0b124985fe147a91c2f8;hpb=54049b42f917ecefd11e2170931371abc0f37e02;p=pti%2Frtp.git

diff --git a/meta-oran/conf/distro/oran-inf.conf b/meta-oran/conf/distro/oran-inf.conf
index 131c2ad..f5f88b7 100644
--- a/meta-oran/conf/distro/oran-inf.conf
+++ b/meta-oran/conf/distro/oran-inf.conf
@@ -29,8 +29,8 @@ require conf/distro/include/oran-whitelist.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
@@ -47,7 +47,11 @@ NON_MULTILIB_RECIPES_append = " ceph"
 
 # For images
 IMAGE_OVERHEAD_FACTOR ="1.1"
-IMAGE_FSTYPES += "tar.bz2 live wic.vmdk wic.vdi wic.qcow2"
+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"