Code Review
/
pti
/
rtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
docs/release-notes.rst: fix the version date
[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
cb09707
..
f5f88b7
100644
(file)
--- 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
DISTRO_NAME = "O-RAN-INF"
# Set software versions
-PREFERRED_VERSION_dpdk ?= "1
7
%"
-PREFERRED_VERSION_kubernetes ?= "1.1
5
.2%"
+PREFERRED_VERSION_dpdk ?= "1
9.11
%"
+PREFERRED_VERSION_kubernetes ?= "1.1
6
.2%"
GOVERSION ?= "1.12%"
# Set preferred providers
GOVERSION ?= "1.12%"
# Set preferred providers
@@
-51,3
+51,7
@@
IMAGE_FSTYPES += "tar.bz2 wic.qcow2"
# Use the default splash
SYSLINUX_SPLASH = ""
# 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"