diff --git a/kata-integration.spec b/kata-integration.spec index 469b4930f06c4b3a3121ce71633d466381fc2d6f..db9206d0d6f0a8bf129e07cca72396230ea35db4 100644 --- a/kata-integration.spec +++ b/kata-integration.spec @@ -1,6 +1,6 @@ %global debug_package %{nil} %define VERSION v1.0.0 -%define RELEASE 2 +%define RELEASE 3 Name: kata-integration Version: %{VERSION} @@ -28,6 +28,12 @@ This is a usefult tool for building Kata Container components. %doc %changelog +* Wed Aug 18 2021 yangfeiyu - 1.0.0-3 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:adapt with kata-containers upgrade + * Sat Sep 5 2020 jiangpengf - 1.0.0-2 - Type:enhancement - ID:NA diff --git a/patches/0002-kata_integration-adapt-with-new-kata-containers.patch b/patches/0002-kata_integration-adapt-with-new-kata-containers.patch new file mode 100644 index 0000000000000000000000000000000000000000..2a650a476514d22eae4929826989e655ae5fec62 --- /dev/null +++ b/patches/0002-kata_integration-adapt-with-new-kata-containers.patch @@ -0,0 +1,67 @@ +From c26cf7520b4fe94dff39742b32168ac0bd36c212 Mon Sep 17 00:00:00 2001 +From: holyfei +Date: Wed, 18 Aug 2021 10:50:26 +0800 +Subject: [PATCH] kata_integration: adapt with new kata-containers + +reason: adapt with new kata-containers + +Signed-off-by: holyfei +--- + Makefile | 2 +- + hack/config-kata-arm64 | 2 +- + hack/config-kata-x86_64 | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index f22fc80..db6b799 100644 +--- a/Makefile ++++ b/Makefile +@@ -55,7 +55,7 @@ agent: + test: + docker run -ti --rm --runtime=kata-runtime busybox sh + +-initrd: agent ++initrd: + sh ./scripts/make_kata_container_initrd.sh + + debug-initrd: runtime +diff --git a/hack/config-kata-arm64 b/hack/config-kata-arm64 +index 253af36..425bb52 100644 +--- a/hack/config-kata-arm64 ++++ b/hack/config-kata-arm64 +@@ -548,7 +548,7 @@ CONFIG_ACPI_GTDT=y + CONFIG_ACPI_PPTT=y + CONFIG_VIRTUALIZATION=y + # CONFIG_KVM is not set +-# CONFIG_VHOST_NET is not set ++CONFIG_VHOST_NET=y + CONFIG_VHOST_VSOCK=y + CONFIG_VHOST=y + # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set +diff --git a/hack/config-kata-x86_64 b/hack/config-kata-x86_64 +index 452f903..7c57225 100644 +--- a/hack/config-kata-x86_64 ++++ b/hack/config-kata-x86_64 +@@ -583,8 +583,8 @@ CONFIG_FIRMWARE_MEMMAP=y + CONFIG_HAVE_KVM=y + CONFIG_VIRTUALIZATION=y + # CONFIG_KVM is not set +-# CONFIG_VHOST_NET is not set +-# CONFIG_VHOST_VSOCK is not set ++CONFIG_VHOST_NET=y ++CONFIG_VHOST_VSOCK=y + # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set + + # +@@ -1261,7 +1261,7 @@ CONFIG_DNS_RESOLVER=y + # CONFIG_OPENVSWITCH is not set + CONFIG_VSOCKETS=y + CONFIG_VSOCKETS_DIAG=y +-# CONFIG_VIRTIO_VSOCKETS is not set ++CONFIG_VIRTIO_VSOCKETS=y + # CONFIG_NETLINK_DIAG is not set + # CONFIG_MPLS is not set + # CONFIG_NET_NSH is not set +-- +2.23.0 + diff --git a/series.conf b/series.conf index d31db34dfb99a565132839ff506fbf197dd3b306..13423e56d0f35eceeb2798e504a5269bac8293a8 100644 --- a/series.conf +++ b/series.conf @@ -1 +1,2 @@ 0001-kata-containers-disable-netmon-by-default.patch +0002-kata_integration-adapt-with-new-kata-containers.patch