f08c85737a
As we add kata container support for StarlingX
with the latest kata containers stable version 3.1.3.
We need to upgrade qemu to 7.2.0 version to make them
compatible.
Test plan:
PASS - Build qemu package.
PASS - Build /install image on AIO-SX.
PASS - Verify the package is installed in the system.
PASS - Verify the qemu-utils correctly installed by
running qemi-image -V
PASS - Verify the qemu x86_64 correctly installed by
running qemu-system-x86_64 --version
PASS - Verify stx-openstack works correctly with sanity
and regression tests.
PASS - Verify that the kata-runtime check command print
system is capable of running kata containers.
PASS - Verify that kubectl could create pod with kata
containers runtime, and pod start successfully.
Story: 2010781
Task: 48183
Change-Id: Ie9fba13999023e3dce37c620864710707bc679ed
Signed-off-by: David Liu <david.liu@windriver.com>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 93451fe51ab37bf8663a766ce1d77d3ac883ee1f Mon Sep 17 00:00:00 2001
|
|
From: Paul Barrette <paul.barrette@windriver.com>
|
|
Date: Fri, 26 Apr 2019 17:41:04 -0300
|
|
Subject: [PATCH] STX: qemu: add compile define for CONFIG_DPDK
|
|
|
|
Dpdk build linkage will be detected if --dpdkdir is specified at
|
|
configure time, which is the default. In the dpdk=yes section, add a
|
|
compile time define that can be used internally.
|
|
|
|
Signed-off-by: Paul Barrette <paul.barrette@windriver.com>
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Signed-off-by: Rafael Falcao <Rafael.VieiraFalcao@windriver.com>
|
|
[Rebased original changes to the qemu 7.2 version]
|
|
Signed-off-by: david.liu <david.liu@windriver.com>
|
|
---
|
|
configure | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 6b92b5cb..1eed8512 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -2411,8 +2411,9 @@ if test "$dpdk" = "yes"; then
|
|
echo "No dpdkdir given"
|
|
exit 1
|
|
fi
|
|
+ echo "CONFIG_ENABLE_DPDK=y" >> $config_host_mak
|
|
echo "dpdk_dir=`eval echo $rte_sdk`" >> $config_host_mak
|
|
- echo "dpdk_lib_dir=\$(dpdk_dir)/x86_64-default-linuxapp-gcc/lib" >> $config_host_mak_
|
|
+ echo "dpdk_lib_dir=\$(dpdk_dir)/x86_64-default-linuxapp-gcc/lib" >> $config_host_mak
|
|
echo "dpdk_inc_dir=\$(dpdk_dir)/x86_64-default-linuxapp-gcc/include" >> $config_host_mak
|
|
echo "" >> $config_host_mak
|
|
echo "dpdk_libs=\$(dpdk_lib_dir)/librte_eal.a \\" >> $config_host_mak
|
|
--
|
|
2.30.2
|
|
|