From ef5ef3b7358062306c1ea3960643b60b53ed003e Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Thu, 12 May 2022 15:38:04 -0300 Subject: [PATCH 01/65] kata-containers-2.4.0 --- .gitignore | 4 ++++ 15-dracut-rhel.conf | 25 ------------------------- 15-dracut-fedora.conf => 15-dracut.conf | 0 kata-containers.spec | 22 ++++++---------------- kata-osbuilder.sh | 2 -- sources | 4 ++-- 6 files changed, 12 insertions(+), 45 deletions(-) delete mode 100644 15-dracut-rhel.conf rename 15-dracut-fedora.conf => 15-dracut.conf (100%) diff --git a/.gitignore b/.gitignore index 42982e3..53d1f87 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,7 @@ /kata-containers-2.3.2-vendor.tar.gz /kata-containers-2.3.3.tar.gz /kata-containers-2.3.3-vendor.tar.gz +/kata-containers-2.4.0-rc0.tar.gz +/kata-containers-2.4.0-rc0-vendor.tar.gz +/kata-containers-2.4.0-vendor.tar.gz +/kata-containers-2.4.0.tar.gz diff --git a/15-dracut-rhel.conf b/15-dracut-rhel.conf deleted file mode 100644 index 89edb10..0000000 --- a/15-dracut-rhel.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Custom RHEL dracut config for kata initrd/rootfs generation - - -# Fedora: kernel drivers we want in the initrd. -drivers+=" " -# virtio vsock -drivers+="vmw_vsock_virtio_transport " -# virtio net -drivers+="virtio_net " -# virtio fs -drivers+="virtiofs " -# virtio block -drivers+="virtio_blk " -# virtio scsi -drivers+="virtio_scsi " -# virtio serial. Could be dropped eventually, vsock covers us -drivers+="virtio_console " -# vfio -drivers+="vfio-pci vfio vfio_iommu_type1 irqbypass vfio_virqfd" - - -# Fedora: extra dracut modules -dracutmodules+=" " -# These aid debugging -dracutmodules+="bash rescue " diff --git a/15-dracut-fedora.conf b/15-dracut.conf similarity index 100% rename from 15-dracut-fedora.conf rename to 15-dracut.conf diff --git a/kata-containers.spec b/kata-containers.spec index 4e81a27..7a49dc8 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -33,7 +33,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 2.3.3 +Version: 2.4.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -66,11 +66,7 @@ Source0: https://%{download}/archive/%{version}%{?rcstr}/%{repo}-%{version}%{ Source1: https://%{download}/releases/download/%{version}/%{repo}-%{version}%{?rcstr}-vendor.tar.gz Source2: kata-osbuilder.sh Source3: kata-osbuilder-generate.service -%if 0%{?fedora} -Source4: 15-dracut-fedora.conf -%else -Source4: 15-dracut-rhel.conf -%endif +Source4: 15-dracut.conf Source5: 50-kata # Keep this patch downstream as it'd be hard to justify such change upstream @@ -97,10 +93,7 @@ BuildRequires: protobuf-compiler # %%check requirements BuildRequires: dracut BuildRequires: kernel - -%if 0%{?fedora} BuildRequires: busybox -%endif %if 0%{?bundled_rust_deps} BuildRequires: cargo @@ -142,10 +135,7 @@ BuildRequires: crate(rustjail/default) >= 0.0.0 BuildRequires: crate(ttrpc/default) >= 0.0.0 %endif -%if 0%{?fedora} Requires: busybox -%endif - Requires: dracut Requires: kernel Requires: qemu-kvm-core >= 4.2.0-4 @@ -159,7 +149,7 @@ Conflicts: kata-runtime Conflicts: kata-shim # The following architectures lack the required qemu support -ExcludeArch: %{arm} %{ix86} s390 +ExcludeArch: %{arm} %{ix86} s390 s390x %description %{common_description} @@ -349,7 +339,6 @@ fi %{_bindir}/kata-collect-data.sh %dir %{katalibexecdir} %{katalibexecdir}/VERSION -%{katalibexecdir}/kata-netmon %dir %{katadatadir} %dir %{katadefaults} %{katadefaults}/configuration.toml @@ -376,13 +365,14 @@ fi %exclude %{kataosbuilderdir}/rootfs-builder/centos %exclude %{kataosbuilderdir}/rootfs-builder/clearlinux %exclude %{kataosbuilderdir}/rootfs-builder/debian -%exclude %{kataosbuilderdir}/rootfs-builder/fedora %exclude %{kataosbuilderdir}/rootfs-builder/template -%exclude %{kataosbuilderdir}/rootfs-builder/suse %exclude %{kataosbuilderdir}/rootfs-builder/ubuntu %changelog +* Fri Apr 01 2022 Eduardo Lima (Etrunko) - 2.4.0-1 +- kata-containers-2.4.0 + * Wed Mar 09 2022 Eduardo Lima (Etrunko) - 2.3.3-1 - kata-containers-2.3.3 diff --git a/kata-osbuilder.sh b/kata-osbuilder.sh index 3fcd2d4..15c7842 100755 --- a/kata-osbuilder.sh +++ b/kata-osbuilder.sh @@ -170,7 +170,6 @@ generate_rootfs() # obuilder script inflexibility for now, which expect that some rootfs.sh # code is called on a fully populated distro root. - local agent_dir="${AGENT_DIR_PREFIX}/usr/libexec/kata-containers/agent" if [ -n "${TEST_MODE}" ] ; then @@ -188,7 +187,6 @@ generate_rootfs() dracut \ --confdir "${dracut_conf_dir}" \ --no-compress \ - --conf /dev/null \ ${tmp_initrd} ${KVERSION} # Extract the generated rootfs diff --git a/sources b/sources index 4157c64..2f12b9c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-2.3.3.tar.gz) = b0fd08016892ce84808eab327979316ebd08f6ae293ba82ad35711f903ad9cec5eaef17b4ee346db50e6a961df678add9a01b260b0ffdc8dd607ace0ed7b75cd -SHA512 (kata-containers-2.3.3-vendor.tar.gz) = 7b113008a3fb4ff3cb835b7210e95aecb88c31b4f94ed6f397ef302f5fece3520a20406193c7c2db772ef1841f5a3e1cb2f0b86060cdf89b7027e96b02e62cd3 +SHA512 (kata-containers-2.4.0-vendor.tar.gz) = 28daef75f24a97ff5339bb20fe90756cca9475357b495835bb8eca501180354efc523561a4ccd0fd0c528dd9db6e56891d69b232bd9cf5870e59f8cb69539d49 +SHA512 (kata-containers-2.4.0.tar.gz) = bd05fdf8d359efec3894489f71d823cd80b85e41575ccbf5fb226c500389519afd3bb563b1128f263963dd66afcfa015bcf54bb4b716e8d3edc0a87d4dc8a1ca From 2e657b24d678972139e3cefae326e97e73cdbee0 Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Thu, 12 May 2022 16:51:40 -0300 Subject: [PATCH 02/65] kata-containers-2.4.1 --- .gitignore | 2 ++ kata-containers.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 53d1f87..02fe140 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /kata-containers-2.4.0-rc0-vendor.tar.gz /kata-containers-2.4.0-vendor.tar.gz /kata-containers-2.4.0.tar.gz +/kata-containers-2.4.1.tar.gz +/kata-containers-2.4.1-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index 7a49dc8..469de1b 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -33,7 +33,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 2.4.0 +Version: 2.4.1 %global tag %{version}%{?rcstr} %global domain github.com @@ -370,6 +370,9 @@ fi %changelog +* Thu May 12 2022 Eduardo Lima (Etrunko) - 2.4.1-1 +- kata-containers-2.4.1 + * Fri Apr 01 2022 Eduardo Lima (Etrunko) - 2.4.0-1 - kata-containers-2.4.0 diff --git a/sources b/sources index 2f12b9c..45763b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-2.4.0-vendor.tar.gz) = 28daef75f24a97ff5339bb20fe90756cca9475357b495835bb8eca501180354efc523561a4ccd0fd0c528dd9db6e56891d69b232bd9cf5870e59f8cb69539d49 -SHA512 (kata-containers-2.4.0.tar.gz) = bd05fdf8d359efec3894489f71d823cd80b85e41575ccbf5fb226c500389519afd3bb563b1128f263963dd66afcfa015bcf54bb4b716e8d3edc0a87d4dc8a1ca +SHA512 (kata-containers-2.4.1.tar.gz) = 7cbb95064f76f52c1de28c7632567d20558bb31708f8dd5d11189759b6143dcea8f10a8349e80c32f447a7f37fd2f959e4aceb8bac7dacd481832a067c87ce90 +SHA512 (kata-containers-2.4.1-vendor.tar.gz) = 9e1f1f7a35b294ad95430d51e269b43a953999c6e769b1266384de347b42e953044d8896ce685e8437c53b6d3331246b157af5998d5c6f8866eae7ecaa707162 From dc10e7f21c80facaa737dde0d73073e6cd73c43b Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Tue, 14 Jun 2022 14:48:22 -0300 Subject: [PATCH 03/65] kata-containers-2.4.2 --- .gitignore | 2 ++ kata-containers.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 02fe140..6fa4e49 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ /kata-containers-2.4.0.tar.gz /kata-containers-2.4.1.tar.gz /kata-containers-2.4.1-vendor.tar.gz +/kata-containers-2.4.2.tar.gz +/kata-containers-2.4.2-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index 469de1b..0a162ad 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -33,7 +33,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 2.4.1 +Version: 2.4.2 %global tag %{version}%{?rcstr} %global domain github.com @@ -370,6 +370,9 @@ fi %changelog +* Tue Jun 14 2022 Eduardo Lima (Etrunko) - 2.4.2-1 +- kata-containers-2.4.2 + * Thu May 12 2022 Eduardo Lima (Etrunko) - 2.4.1-1 - kata-containers-2.4.1 diff --git a/sources b/sources index 45763b5..1146d4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-2.4.1.tar.gz) = 7cbb95064f76f52c1de28c7632567d20558bb31708f8dd5d11189759b6143dcea8f10a8349e80c32f447a7f37fd2f959e4aceb8bac7dacd481832a067c87ce90 -SHA512 (kata-containers-2.4.1-vendor.tar.gz) = 9e1f1f7a35b294ad95430d51e269b43a953999c6e769b1266384de347b42e953044d8896ce685e8437c53b6d3331246b157af5998d5c6f8866eae7ecaa707162 +SHA512 (kata-containers-2.4.2.tar.gz) = 475e9daf1fde479692ed0bbb63d77d57ae0797fc37639452636cedebb5f785772c1284e38a95e81fe4127ecce0450ed31cad6eaf0124841e759d22cc1df7397c +SHA512 (kata-containers-2.4.2-vendor.tar.gz) = 549b92bf8fd312ce02eab8047c792f57abcba504077fd3f0e3151b20cfd604be8bcc9ae589d626cc7878ee88cf39374868df7ee623daaa345f612d5b55e81f35 From a139ff7419a0b12b53e22981ae7b7522dc2ebfa1 Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Wed, 15 Jun 2022 11:38:10 -0300 Subject: [PATCH 04/65] osbuilder: Fix wrong config setting Resolves: rhbz#2097377 --- 15-dracut-rhel.conf | 25 ------------------------- kata-containers.spec | 20 ++++++-------------- kata-osbuilder.sh | 3 +-- 3 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 15-dracut-rhel.conf diff --git a/15-dracut-rhel.conf b/15-dracut-rhel.conf deleted file mode 100644 index 89edb10..0000000 --- a/15-dracut-rhel.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Custom RHEL dracut config for kata initrd/rootfs generation - - -# Fedora: kernel drivers we want in the initrd. -drivers+=" " -# virtio vsock -drivers+="vmw_vsock_virtio_transport " -# virtio net -drivers+="virtio_net " -# virtio fs -drivers+="virtiofs " -# virtio block -drivers+="virtio_blk " -# virtio scsi -drivers+="virtio_scsi " -# virtio serial. Could be dropped eventually, vsock covers us -drivers+="virtio_console " -# vfio -drivers+="vfio-pci vfio vfio_iommu_type1 irqbypass vfio_virqfd" - - -# Fedora: extra dracut modules -dracutmodules+=" " -# These aid debugging -dracutmodules+="bash rescue " diff --git a/kata-containers.spec b/kata-containers.spec index 4e81a27..958cdad 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -58,7 +58,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist} +Release: 2%{?rcrel}%{?dist} Summary: Kata Containers version 2.x repository License: ASL 2.0 Url: https://%{download} @@ -66,11 +66,7 @@ Source0: https://%{download}/archive/%{version}%{?rcstr}/%{repo}-%{version}%{ Source1: https://%{download}/releases/download/%{version}/%{repo}-%{version}%{?rcstr}-vendor.tar.gz Source2: kata-osbuilder.sh Source3: kata-osbuilder-generate.service -%if 0%{?fedora} Source4: 15-dracut-fedora.conf -%else -Source4: 15-dracut-rhel.conf -%endif Source5: 50-kata # Keep this patch downstream as it'd be hard to justify such change upstream @@ -98,9 +94,7 @@ BuildRequires: protobuf-compiler BuildRequires: dracut BuildRequires: kernel -%if 0%{?fedora} BuildRequires: busybox -%endif %if 0%{?bundled_rust_deps} BuildRequires: cargo @@ -142,9 +136,7 @@ BuildRequires: crate(rustjail/default) >= 0.0.0 BuildRequires: crate(ttrpc/default) >= 0.0.0 %endif -%if 0%{?fedora} Requires: busybox -%endif Requires: dracut Requires: kernel @@ -159,7 +151,7 @@ Conflicts: kata-runtime Conflicts: kata-shim # The following architectures lack the required qemu support -ExcludeArch: %{arm} %{ix86} s390 +ExcludeArch: %{arm} %{ix86} s390 s390x %description %{common_description} @@ -171,12 +163,8 @@ ExcludeArch: %{arm} %{ix86} s390 # The machine type uses a modern default # The kernel parameters workaround an issue with cgroupsv2 after kernel 5.3 # To-do: add BUILDFLAGS=gobuildflags when the macro becomes available -%if 0%{?fedora} %global qemu qemu-system-%{_arch} %global qemupath %{_bindir}/%{qemu} -%else -%global qemupath %{_libexecdir}/%{qemu} -%endif # The machine type to be used is architecture specific: # aarch64: virt @@ -383,6 +371,10 @@ fi %changelog +* Wed Mar 09 2022 Eduardo Lima (Etrunko) - 2.3.3-2 +- osbuilder: Fix wrong config setting + Resolves: rhbz#2097377 + * Wed Mar 09 2022 Eduardo Lima (Etrunko) - 2.3.3-1 - kata-containers-2.3.3 diff --git a/kata-osbuilder.sh b/kata-osbuilder.sh index 3fcd2d4..9ecdd52 100755 --- a/kata-osbuilder.sh +++ b/kata-osbuilder.sh @@ -170,7 +170,7 @@ generate_rootfs() # obuilder script inflexibility for now, which expect that some rootfs.sh # code is called on a fully populated distro root. - + local agent_dir="${AGENT_DIR_PREFIX}/usr/libexec/kata-containers/agent" if [ -n "${TEST_MODE}" ] ; then @@ -188,7 +188,6 @@ generate_rootfs() dracut \ --confdir "${dracut_conf_dir}" \ --no-compress \ - --conf /dev/null \ ${tmp_initrd} ${KVERSION} # Extract the generated rootfs From 41668bfeffb81baaeca0fd021fb5feb43aaf8f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 18 Jun 2022 12:12:21 +0200 Subject: [PATCH 05/65] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 --- kata-containers.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index 0a162ad..ac3340b 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -58,7 +58,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist} +Release: 1%{?rcrel}%{?dist}.1 Summary: Kata Containers version 2.x repository License: ASL 2.0 Url: https://%{download} @@ -370,6 +370,10 @@ fi %changelog +* Sat Jun 18 2022 Robert-André Mauchin - 2.4.2-1.1 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629 + * Tue Jun 14 2022 Eduardo Lima (Etrunko) - 2.4.2-1 - kata-containers-2.4.2 From aa486d0b4908ccd0a767897cf19229ee47a00c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Wed, 22 Jun 2022 18:11:43 +0200 Subject: [PATCH 06/65] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 --- kata-containers.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index 958cdad..0fd2da9 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -58,7 +58,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 2%{?rcrel}%{?dist} +Release: 2%{?rcrel}%{?dist}.1 Summary: Kata Containers version 2.x repository License: ASL 2.0 Url: https://%{download} @@ -371,6 +371,10 @@ fi %changelog +* Wed Jun 22 2022 Robert-André Mauchin - 2.3.3-2.1 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629 + * Wed Mar 09 2022 Eduardo Lima (Etrunko) - 2.3.3-2 - osbuilder: Fix wrong config setting Resolves: rhbz#2097377 From c84e33382225626013d6a6ba16bda69e7c78d5c8 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 19 Jul 2022 14:58:43 -0500 Subject: [PATCH 07/65] Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang --- kata-containers.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index 0fd2da9..9c3c498 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -58,7 +58,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 2%{?rcrel}%{?dist}.1 +Release: 2%{?rcrel}%{?dist}.2 Summary: Kata Containers version 2.x repository License: ASL 2.0 Url: https://%{download} @@ -371,6 +371,10 @@ fi %changelog +* Tue Jul 19 2022 Maxwell G - 2.3.3-2.2 +- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in + golang + * Wed Jun 22 2022 Robert-André Mauchin - 2.3.3-2.1 - Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 From 5d84d324b8fb2af98a65825e3a5fe0f34cacea97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:36:53 +0000 Subject: [PATCH 08/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index ac3340b..c4240bd 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -58,7 +58,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist}.1 +Release: 1%{?rcrel}%{?dist}.2 Summary: Kata Containers version 2.x repository License: ASL 2.0 Url: https://%{download} @@ -370,6 +370,9 @@ fi %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.4.2-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jun 18 2022 Robert-André Mauchin - 2.4.2-1.1 - Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 From 6a85da05ab2333932df0deba86c3a3be8e72bd4f Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Wed, 26 Oct 2022 16:19:48 -0300 Subject: [PATCH 09/65] kata-containers-2.4.3 --- .gitignore | 2 ++ kata-containers.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6fa4e49..0d71b5c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /kata-containers-2.4.1-vendor.tar.gz /kata-containers-2.4.2.tar.gz /kata-containers-2.4.2-vendor.tar.gz +/kata-containers-2.4.3.tar.gz +/kata-containers-2.4.3-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index c4240bd..ba8e2aa 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -33,7 +33,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 2.4.2 +Version: 2.4.3 %global tag %{version}%{?rcstr} %global domain github.com @@ -58,7 +58,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist}.2 +Release: 1%{?rcrel}%{?dist} Summary: Kata Containers version 2.x repository License: ASL 2.0 Url: https://%{download} @@ -370,6 +370,9 @@ fi %changelog +* Wed Oct 26 2022 Eduardo Lima (Etrunko) - 2.4.3-1 +- kata-containers-2.4.3 + * Thu Jul 21 2022 Fedora Release Engineering - 2.4.2-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 1146d4f..d15bbdf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-2.4.2.tar.gz) = 475e9daf1fde479692ed0bbb63d77d57ae0797fc37639452636cedebb5f785772c1284e38a95e81fe4127ecce0450ed31cad6eaf0124841e759d22cc1df7397c -SHA512 (kata-containers-2.4.2-vendor.tar.gz) = 549b92bf8fd312ce02eab8047c792f57abcba504077fd3f0e3151b20cfd604be8bcc9ae589d626cc7878ee88cf39374868df7ee623daaa345f612d5b55e81f35 +SHA512 (kata-containers-2.4.3.tar.gz) = 218e0d0cde76a3f54bcf933e030df5310c8a144e0622eef1c0b02b33879f1b36de6f371cb7727710f482bde3994cfe723928d4ea68ce48236a61640b679a1fb2 +SHA512 (kata-containers-2.4.3-vendor.tar.gz) = 65933d551334f9ef16805ad6269843d08e11326c7eb3ff15f2910c2fd7dd0c6e3d15494e233628d1114306778e9a15ec42ba2cd63035e689d40a161043ddb35d From 238b0cc89b796e7805a2464d1f5be827e6f8d552 Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Wed, 26 Oct 2022 17:17:34 -0300 Subject: [PATCH 10/65] kata-containers-2.5.0 --- .gitignore | 2 ++ kata-containers.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0d71b5c..f124ba9 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /kata-containers-2.4.2-vendor.tar.gz /kata-containers-2.4.3.tar.gz /kata-containers-2.4.3-vendor.tar.gz +/kata-containers-2.5.0.tar.gz +/kata-containers-2.5.0-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index ba8e2aa..93aef75 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -33,7 +33,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 2.4.3 +Version: 2.5.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -370,6 +370,9 @@ fi %changelog +* Wed Oct 26 2022 Eduardo Lima (Etrunko) - 2.5.0-1 +- kata-containers-2.5.0 + * Wed Oct 26 2022 Eduardo Lima (Etrunko) - 2.4.3-1 - kata-containers-2.4.3 diff --git a/sources b/sources index d15bbdf..e755c84 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-2.4.3.tar.gz) = 218e0d0cde76a3f54bcf933e030df5310c8a144e0622eef1c0b02b33879f1b36de6f371cb7727710f482bde3994cfe723928d4ea68ce48236a61640b679a1fb2 -SHA512 (kata-containers-2.4.3-vendor.tar.gz) = 65933d551334f9ef16805ad6269843d08e11326c7eb3ff15f2910c2fd7dd0c6e3d15494e233628d1114306778e9a15ec42ba2cd63035e689d40a161043ddb35d +SHA512 (kata-containers-2.5.0.tar.gz) = 7c9ed0483eddec827c19b8527170c7d6083136382e764e9fc94d04247d7f7c6f66fdb0e53fe2d2f35f3d7e1576c490ea2c71c72eb59d780295733ec80aa3819f +SHA512 (kata-containers-2.5.0-vendor.tar.gz) = 57c14433ad6e53e49ae940f08255548867b47180ff551a1fe2851156c6a95080607493c3a054a626704b874457cfcfa180bcca6cec86161f62068eeeaf3f252f From 31e9da9ea3c3de62f35e4c2d615945b4bf4d2b94 Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Wed, 26 Oct 2022 17:32:08 -0300 Subject: [PATCH 11/65] Update osbuilder patch --- ...osbuilder-Adjust-agent_version-for-our-builds.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/0999-osbuilder-Adjust-agent_version-for-our-builds.patch b/0999-osbuilder-Adjust-agent_version-for-our-builds.patch index 766f89c..baca5aa 100644 --- a/0999-osbuilder-Adjust-agent_version-for-our-builds.patch +++ b/0999-osbuilder-Adjust-agent_version-for-our-builds.patch @@ -1,4 +1,4 @@ -From 4f13a590c00297aea702874872074eea1cb297ef Mon Sep 17 00:00:00 2001 +From f1b45ad2295eb260d0c53f6d90ede35b4b2ad510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 1 Sep 2021 17:39:17 -0300 Subject: [PATCH] Adjust agent_version for our builds @@ -15,10 +15,10 @@ Signed-off-by: Fabiano Fidêncio 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/osbuilder/scripts/lib.sh b/tools/osbuilder/scripts/lib.sh -index e393cd7..40ff72c 100644 +index 33a01f0..4225741 100644 --- a/tools/osbuilder/scripts/lib.sh +++ b/tools/osbuilder/scripts/lib.sh -@@ -192,8 +192,7 @@ create_summary_file() +@@ -164,8 +164,7 @@ create_summary_file() local agent="${AGENT_DEST}" [ "$AGENT_INIT" = yes ] && agent="${init}" @@ -26,8 +26,8 @@ index e393cd7..40ff72c 100644 - local -r agent_version=$(cat ${agentdir}/VERSION) + agent_version=$(cat "${script_dir}/../../VERSION") - cat >"$file"<<-EOT + cat >"$file"<<-EOF --- -- -2.31.1 +2.37.2 From 52088fe4c8ff73befff12a1666f5c29cd9c8d6ab Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Wed, 26 Oct 2022 17:41:14 -0300 Subject: [PATCH 12/65] kata-containers-2.5.1 Signed-off-by: Eduardo Lima (Etrunko) --- .gitignore | 2 ++ 15-dracut.conf | 18 +++++++++--------- kata-containers.spec | 43 ++++++++++++++++++++++++------------------- sources | 4 ++-- 4 files changed, 37 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index f124ba9..30c276c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /kata-containers-2.4.3-vendor.tar.gz /kata-containers-2.5.0.tar.gz /kata-containers-2.5.0-vendor.tar.gz +/kata-containers-2.5.1.tar.gz +/kata-containers-2.5.1-vendor.tar.gz diff --git a/15-dracut.conf b/15-dracut.conf index 4dac797..195f58f 100644 --- a/15-dracut.conf +++ b/15-dracut.conf @@ -4,24 +4,24 @@ # Fedora: kernel drivers we want in the initrd. drivers+=" " # virtio vsock -drivers+="vmw_vsock_virtio_transport " +drivers+=" vmw_vsock_virtio_transport " # virtio net -drivers+="virtio_net " +drivers+=" virtio_net " # virtio fs -drivers+="virtiofs " +drivers+=" virtiofs " # virtio block -drivers+="virtio_blk " +drivers+=" virtio_blk " # virtio scsi -drivers+="virtio_scsi " +drivers+=" virtio_scsi " # virtio serial. Could be dropped eventually, vsock covers us -drivers+="virtio_console " +drivers+=" virtio_console " # virtio 9p. Could be dropped eventually, virtio-fs covers us -drivers+="9p 9pnet_virtio " +drivers+=" 9p 9pnet_virtio " # vfio -drivers+="vfio-pci vfio vfio_iommu_type1 irqbypass vfio_virqfd" +drivers+=" vfio-pci vfio vfio_iommu_type1 irqbypass vfio_virqfd" # Fedora: extra dracut modules dracutmodules+=" " # These aid debugging -dracutmodules+="bash busybox rescue " +dracutmodules+=" bash busybox rescue " diff --git a/kata-containers.spec b/kata-containers.spec index 93aef75..a2a4d00 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -1,10 +1,5 @@ # go-rpm-macros are not available on RHEL. -%if 0%{?fedora} - %global have_go_rpm_macros 1 -%else - %global have_go_rpm_macros 0 -%endif - +%global have_go_rpm_macros 1 %global with_debug 0 # Shamelessly copied from CRI-O spec file. @@ -33,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 2.5.0 +Version: 2.5.1 %global tag %{version}%{?rcstr} %global domain github.com @@ -161,12 +156,8 @@ ExcludeArch: %{arm} %{ix86} s390 s390x # The machine type uses a modern default # The kernel parameters workaround an issue with cgroupsv2 after kernel 5.3 # To-do: add BUILDFLAGS=gobuildflags when the macro becomes available -%if 0%{?fedora} %global qemu qemu-system-%{_arch} %global qemupath %{_bindir}/%{qemu} -%else -%global qemupath %{_libexecdir}/%{qemu} -%endif # The machine type to be used is architecture specific: # aarch64: virt @@ -186,6 +177,7 @@ ExcludeArch: %{arm} %{ix86} s390 s390x %global machinetype "q35" %endif +%global kata_build_dir %{repo}-%{version}%{?rcstr} %global katadatadir %{_datadir}/kata-containers %global katadefaults %{katadatadir}/defaults %global katacache %{_localstatedir}/cache @@ -213,11 +205,12 @@ ExcludeArch: %{arm} %{ix86} s390 s390x %global agent_make_vars LIBC=gnu \\\ DESTDIR=%{buildroot}%{kataagentdir} +%global log_parser_vars BINDIR=%{buildroot}%{_bindir} %prep -%autosetup -S git -p1 -n %{repo}-%{version}%{?rcstr} +%autosetup -S git -p1 -n %{kata_build_dir} -cd %{_builddir}/%{repo}-%{version}%{?rcstr} +cd %{_builddir}/%{kata_build_dir} tar -xf %{SOURCE1} # Not using gobuild here in order to stick to how upstream builds @@ -227,7 +220,7 @@ export PATH=$PATH:"$(pwd)/go/bin" export GOPATH="$(pwd)/go" mkdir -p go/src/%{domain}/%{org} -ln -s $(pwd)/../%{repo}-%{version}%{?rcstr} go/src/%{importname} +ln -s $(pwd)/../%{kata_build_dir} go/src/%{importname} cd go/src/%{importname} pushd src/runtime @@ -239,6 +232,10 @@ pushd src/agent touch kata-agent popd +pushd src/tools/log-parser +%make_build %{log_parser_vars} +popd + pushd tools/osbuilder # Manually build nsdax tool gcc %{build_cflags} image-builder/nsdax.gpl.c -o nsdax @@ -261,6 +258,10 @@ pushd src/agent %make_install %{agent_make_vars} popd +pushd src/tools/log-parser +%make_install %{log_parser_vars} +popd + pushd tools/osbuilder rm .gitignore rm rootfs-builder/.gitignore @@ -289,13 +290,10 @@ install -m 0644 -D -t %{buildroot}%{_sysconfdir}/crio/crio.conf.d %{SOURCE5} # The kernels kata-osbuilder creates are in /var/cache now, see rhbz#1792216 sed -i -e 's|^kernel = "%{_datadir}|kernel = "%{katacache}|' \ -e 's|^image = "%{_datadir}/kata-containers/kata-containers.img"|initrd = "%{katacache}/kata-containers/kata-containers-initrd.img"|' \ - %{buildroot}%{_datadir}/kata-containers/defaults/configuration.toml + %{buildroot}%{katadefaults}/configuration.toml # Enable vsock as transport instead of virtio-serial -sed -i -e 's/^#use_vsock =/use_vsock =/' %{buildroot}%{_datadir}/kata-containers/defaults/configuration.toml - -# Remove non-tested / non-supported configuration files -rm %{buildroot}%{_datadir}/kata-containers/defaults/configuration-*.toml +sed -i -e 's/^#use_vsock =/use_vsock =/' %{buildroot}%{katadefaults}/configuration.toml # We could be run in a mock chroot, where uname will report # different kernel than what we have installed in the chroot. @@ -350,6 +348,9 @@ fi %dir %{kataagentdir} %{kataagentdir}/* +#log-parser +%{_bindir}/kata-log-parser + #osbuilder %dir %{kataosbuilderdir} %dir %{katalocalstatecachedir} @@ -361,6 +362,7 @@ fi %{_sysconfdir}/crio/crio.conf.d/50-kata # Remove some scripts we don't use +%exclude %{katadefaults}/configuration-*.toml %exclude %{kataosbuilderdir}/rootfs-builder/alpine %exclude %{kataosbuilderdir}/rootfs-builder/centos %exclude %{kataosbuilderdir}/rootfs-builder/clearlinux @@ -370,6 +372,9 @@ fi %changelog +* Wed Oct 26 2022 Eduardo Lima (Etrunko) - 2.5.1-1 +- kata-containers-2.5.1 + * Wed Oct 26 2022 Eduardo Lima (Etrunko) - 2.5.0-1 - kata-containers-2.5.0 diff --git a/sources b/sources index e755c84..8595ab2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-2.5.0.tar.gz) = 7c9ed0483eddec827c19b8527170c7d6083136382e764e9fc94d04247d7f7c6f66fdb0e53fe2d2f35f3d7e1576c490ea2c71c72eb59d780295733ec80aa3819f -SHA512 (kata-containers-2.5.0-vendor.tar.gz) = 57c14433ad6e53e49ae940f08255548867b47180ff551a1fe2851156c6a95080607493c3a054a626704b874457cfcfa180bcca6cec86161f62068eeeaf3f252f +SHA512 (kata-containers-2.5.1.tar.gz) = b3b979f4888637164f2ee6c0681c03308658d54777ddc35db5b1f214fcdfb60219bf4db3d411335ce85bcb716909b5003c334366df19bfb3cb45ada857589943 +SHA512 (kata-containers-2.5.1-vendor.tar.gz) = 170a2056b54059ef69ad60d671987869edce25d24137293d40e7bc746af8ec56b4785463dd0aaae7eb378f791b2d044dd632c5bcb9b7cd0446c13eddccf4f263 From ee38b9775311f3503c9a6ba164af9761d12080f9 Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Wed, 26 Oct 2022 18:24:25 -0300 Subject: [PATCH 13/65] kata-containers-2.5.2 Signed-off-by: Eduardo Lima (Etrunko) --- .gitignore | 2 ++ 15-dracut.conf | 2 +- kata-containers.spec | 5 ++++- sources | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 30c276c..7623ec6 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ /kata-containers-2.5.0-vendor.tar.gz /kata-containers-2.5.1.tar.gz /kata-containers-2.5.1-vendor.tar.gz +/kata-containers-2.5.2.tar.gz +/kata-containers-2.5.2-vendor.tar.gz diff --git a/15-dracut.conf b/15-dracut.conf index 195f58f..c4ced5d 100644 --- a/15-dracut.conf +++ b/15-dracut.conf @@ -18,7 +18,7 @@ drivers+=" virtio_console " # virtio 9p. Could be dropped eventually, virtio-fs covers us drivers+=" 9p 9pnet_virtio " # vfio -drivers+=" vfio-pci vfio vfio_iommu_type1 irqbypass vfio_virqfd" +drivers+=" vfio-pci vfio vfio_iommu_type1 irqbypass vfio_virqfd " # Fedora: extra dracut modules diff --git a/kata-containers.spec b/kata-containers.spec index a2a4d00..eb549a5 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 2.5.1 +Version: 2.5.2 %global tag %{version}%{?rcstr} %global domain github.com @@ -372,6 +372,9 @@ fi %changelog +* Wed Oct 26 2022 Eduardo Lima (Etrunko) - 2.5.2-1 +- kata-containers-2.5.2 + * Wed Oct 26 2022 Eduardo Lima (Etrunko) - 2.5.1-1 - kata-containers-2.5.1 diff --git a/sources b/sources index 8595ab2..085b147 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-2.5.1.tar.gz) = b3b979f4888637164f2ee6c0681c03308658d54777ddc35db5b1f214fcdfb60219bf4db3d411335ce85bcb716909b5003c334366df19bfb3cb45ada857589943 -SHA512 (kata-containers-2.5.1-vendor.tar.gz) = 170a2056b54059ef69ad60d671987869edce25d24137293d40e7bc746af8ec56b4785463dd0aaae7eb378f791b2d044dd632c5bcb9b7cd0446c13eddccf4f263 +SHA512 (kata-containers-2.5.2.tar.gz) = a44ae0b8dadde922f5283fcb8da55fe960d23cfb6e05a1f0a3fe9ecf72292b2867916211973b29e7c575320a47ff0544c2627b5aa5cca37beb411d3cb3db5fea +SHA512 (kata-containers-2.5.2-vendor.tar.gz) = 7731bf8d5899d918cb87ce944209299b6da7be711e929615a25e12a2a173bd911146188a4efdc458a2a97ffd4434618a781e7fdeda6031e7ffce645da33a2609 From c2b85eb4f286a69b2ba26372bf946f433c10e756 Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Thu, 22 Dec 2022 11:38:49 -0300 Subject: [PATCH 14/65] kata-containers-3.0.0 --- .gitignore | 2 ++ kata-containers.spec | 11 ++++++++--- sources | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7623ec6..03a92d1 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ /kata-containers-2.5.1-vendor.tar.gz /kata-containers-2.5.2.tar.gz /kata-containers-2.5.2-vendor.tar.gz +/kata-containers-3.0.0.tar.gz +/kata-containers-3.0.0-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index eb549a5..8b9b4b8 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 2.5.2 +Version: 3.0.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -186,6 +186,7 @@ ExcludeArch: %{arm} %{ix86} s390 s390x %global kataagentdir %{katalibexecdir}/agent %global kataosbuilderdir %{katalibexecdir}/osbuilder +%global rust_make_vars LIBC=gnu %global runtime_make_vars QEMUPATH=%{qemupath} \\\ KERNELTYPE="compressed" \\\ @@ -203,9 +204,10 @@ ExcludeArch: %{arm} %{ix86} s390 s390x FEATURE_SELINUX="yes" \\\ DEFENABLEANNOTATIONS=['\\\".*\\\"'] -%global agent_make_vars LIBC=gnu \\\ +%global agent_make_vars %{rust_make_vars} \\\ DESTDIR=%{buildroot}%{kataagentdir} -%global log_parser_vars BINDIR=%{buildroot}%{_bindir} +%global log_parser_vars %{rust_make_vars} \\\ + BINDIR=%{buildroot}%{_bindir} %prep %autosetup -S git -p1 -n %{kata_build_dir} @@ -372,6 +374,9 @@ fi %changelog +* Wed Oct 26 2022 Eduardo Lima (Etrunko) - 3.0.0-1 +- kata-containers-3.0.0 + * Wed Oct 26 2022 Eduardo Lima (Etrunko) - 2.5.2-1 - kata-containers-2.5.2 diff --git a/sources b/sources index 085b147..30a647b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-2.5.2.tar.gz) = a44ae0b8dadde922f5283fcb8da55fe960d23cfb6e05a1f0a3fe9ecf72292b2867916211973b29e7c575320a47ff0544c2627b5aa5cca37beb411d3cb3db5fea -SHA512 (kata-containers-2.5.2-vendor.tar.gz) = 7731bf8d5899d918cb87ce944209299b6da7be711e929615a25e12a2a173bd911146188a4efdc458a2a97ffd4434618a781e7fdeda6031e7ffce645da33a2609 +SHA512 (kata-containers-3.0.0.tar.gz) = 0f6aa7fa1475b2a3b53d7a854da0d63d94cdc7e57d786f1a10269cb5619b916d562290d1eeb71719ae9fe6993d801d9c1cdfcc928dfdea7de5885a3497a56d1a +SHA512 (kata-containers-3.0.0-vendor.tar.gz) = ed61e96350cdd96e5927a85ff6eb95a35c3ca2a67cbaf3e9c680fe090be4f7542495e8ac998bdfc0ffd182486282c6d3fe3bc127e113c485ee2f5c1d9553b880 From 85b21ad02822b8352b57315401248c1a475a1d09 Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Thu, 22 Dec 2022 11:53:00 -0300 Subject: [PATCH 15/65] kata-containers-3.0.1 Signed-off-by: Eduardo Lima (Etrunko) --- .gitignore | 2 ++ kata-containers.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 03a92d1..f660f82 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ /kata-containers-2.5.2-vendor.tar.gz /kata-containers-3.0.0.tar.gz /kata-containers-3.0.0-vendor.tar.gz +/kata-containers-3.0.1.tar.gz +/kata-containers-3.0.1-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index 8b9b4b8..7539d50 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 3.0.0 +Version: 3.0.1 %global tag %{version}%{?rcstr} %global domain github.com @@ -374,6 +374,9 @@ fi %changelog +* Thu Dec 22 2022 Eduardo Lima (Etrunko) - 3.0.1-1 +- kata-containers-3.0.1 + * Wed Oct 26 2022 Eduardo Lima (Etrunko) - 3.0.0-1 - kata-containers-3.0.0 diff --git a/sources b/sources index 30a647b..51dc30c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.0.0.tar.gz) = 0f6aa7fa1475b2a3b53d7a854da0d63d94cdc7e57d786f1a10269cb5619b916d562290d1eeb71719ae9fe6993d801d9c1cdfcc928dfdea7de5885a3497a56d1a -SHA512 (kata-containers-3.0.0-vendor.tar.gz) = ed61e96350cdd96e5927a85ff6eb95a35c3ca2a67cbaf3e9c680fe090be4f7542495e8ac998bdfc0ffd182486282c6d3fe3bc127e113c485ee2f5c1d9553b880 +SHA512 (kata-containers-3.0.1.tar.gz) = 060af46e0dc6e26465d2288fe58a22536522fd4bdf88e3f3ce6a8d83fc104c0095e28ffa9339f0722302f43cc6582a07e0a9cf1809c08ac45fdd320495f16c59 +SHA512 (kata-containers-3.0.1-vendor.tar.gz) = 95878a8260a5f14468a96d020881fb5d05e9b37c7cf886825f1df300ab0e231cc960fa179cc77f9fb967b0cf3f5cb7f2ae1aff63998dae445e718214fd3f8def From 1d12ed9e97077a7463c0b3e6882766864e1cbb5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 14:06:28 +0000 Subject: [PATCH 16/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index 7539d50..8c500b8 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist} +Release: 1%{?rcrel}%{?dist}.1 Summary: Kata Containers version 2.x repository License: ASL 2.0 Url: https://%{download} @@ -374,6 +374,9 @@ fi %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.0.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 22 2022 Eduardo Lima (Etrunko) - 3.0.1-1 - kata-containers-3.0.1 From 14ca019278e9f25af5d9c2ab74d80089322db288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 27 Feb 2023 13:28:44 +0100 Subject: [PATCH 17/65] Use a package name instead of a file dependency https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies says > Packages SHOULD NOT include file dependencies outside of the following directories: > /usr/bin, /usr/sbin, /etc and also > installation path macros like %{_bindir} MUST NOT be used This is now becoming more important because dnf5 does not load filelists metadata (i.e. metadata about paths outside of the short list) by default. --- kata-containers.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index 8c500b8..a70d374 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -134,7 +134,9 @@ Requires: busybox Requires: dracut Requires: kernel Requires: qemu-kvm-core >= 4.2.0-4 -Requires: %{_libexecdir}/virtiofsd +# For /usr/libexec/virtiofsd +Requires: (virtiofsd or qemu-virtiofsd) +Suggests: virtiofsd Conflicts: kata-agent Conflicts: kata-ksm-throttler From 53025c8ae31577e0c473030cf7898c3753c2375f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:25:03 +0000 Subject: [PATCH 18/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index a70d374..d79bae6 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist}.1 +Release: 1%{?rcrel}%{?dist}.2 Summary: Kata Containers version 2.x repository License: ASL 2.0 Url: https://%{download} @@ -376,6 +376,9 @@ fi %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 3.0.1-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 3.0.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2ac1794c87717b982b9b6bfb49ea761618d15524 Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Mon, 18 Sep 2023 15:50:43 -0300 Subject: [PATCH 19/65] kata-containers-3.1.3 kata-containers-3.1.3 Signed-off-by: Emanuel Lima --- .gitignore | 2 ++ kata-containers.spec | 11 +++++++---- sources | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f660f82..534fb14 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ /kata-containers-3.0.0-vendor.tar.gz /kata-containers-3.0.1.tar.gz /kata-containers-3.0.1-vendor.tar.gz +/kata-containers-3.1.3.tar.gz +/kata-containers-3.1.3-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index d79bae6..d422a76 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 3.0.1 +Version: 3.1.3 %global tag %{version}%{?rcstr} %global domain github.com @@ -39,7 +39,7 @@ Version: 3.0.1 %global common_description %{expand: -Kata Containers version 2.x repository. Kata Containers is an open source +Kata Containers version 3.x repository. Kata Containers is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. https://katacontainers.io/.} @@ -53,8 +53,8 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist}.2 -Summary: Kata Containers version 2.x repository +Release: 1%{?rcrel}%{?dist} +Summary: Kata Containers version 3.x repository License: ASL 2.0 Url: https://%{download} Source0: https://%{download}/archive/%{version}%{?rcstr}/%{repo}-%{version}%{?rcstr}.tar.gz @@ -376,6 +376,9 @@ fi %changelog +* Mon Sep 18 2023 Emanuel Lima - 3.1.3-1 +- kata-containers-3.1.3 + * Thu Jul 20 2023 Fedora Release Engineering - 3.0.1-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 51dc30c..319be92 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.0.1.tar.gz) = 060af46e0dc6e26465d2288fe58a22536522fd4bdf88e3f3ce6a8d83fc104c0095e28ffa9339f0722302f43cc6582a07e0a9cf1809c08ac45fdd320495f16c59 -SHA512 (kata-containers-3.0.1-vendor.tar.gz) = 95878a8260a5f14468a96d020881fb5d05e9b37c7cf886825f1df300ab0e231cc960fa179cc77f9fb967b0cf3f5cb7f2ae1aff63998dae445e718214fd3f8def +SHA512 (kata-containers-3.1.3.tar.gz) = 4bf647190eb0bac2d0dc95dec5b9bfd66d4ecd04e5a78fa084be40ebd146e270f58bcb7f110fed72617163ec5e758800ca846e881e61783be0490b76949a0936 +SHA512 (kata-containers-3.1.3-vendor.tar.gz) = 561e9aa54b89d736f450ef4472cfd64a5091e1b4273e58c14b033d018155a8327c52bccdfe62b28c9f36855f478e34ce0b20e3a49b5c330dce0c7edbcfe10316 From 911efc6f51f5b3213d147538dce9c0cdd04bae2a Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Thu, 28 Sep 2023 19:26:50 -0300 Subject: [PATCH 20/65] kata-containers-3.2.0 Bump to kata-containers 3.2.0 based on the stable-3.2 branch Signed-off-by: Emanuel Lima --- .gitignore | 3 +++ kata-containers.spec | 6 +++--- sources | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 534fb14..c080309 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +generate_vendor.sh /kata-containers-2.0.0.tar.gz /kata-containers-2.0.1.tar.gz /kata-containers-2.0.2.tar.gz @@ -39,3 +40,5 @@ /kata-containers-3.0.1-vendor.tar.gz /kata-containers-3.1.3.tar.gz /kata-containers-3.1.3-vendor.tar.gz +/kata-containers-3.2.0.tar.gz +/kata-containers-3.2.0-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index d422a76..9a8703a 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 3.1.3 +Version: 3.2.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -376,8 +376,8 @@ fi %changelog -* Mon Sep 18 2023 Emanuel Lima - 3.1.3-1 -- kata-containers-3.1.3 +* Thu Sep 28 2023 Emanuel Lima - 3.2.0-1 +- kata-containers-3.2.0 * Thu Jul 20 2023 Fedora Release Engineering - 3.0.1-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 319be92..9da6f97 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.1.3.tar.gz) = 4bf647190eb0bac2d0dc95dec5b9bfd66d4ecd04e5a78fa084be40ebd146e270f58bcb7f110fed72617163ec5e758800ca846e881e61783be0490b76949a0936 -SHA512 (kata-containers-3.1.3-vendor.tar.gz) = 561e9aa54b89d736f450ef4472cfd64a5091e1b4273e58c14b033d018155a8327c52bccdfe62b28c9f36855f478e34ce0b20e3a49b5c330dce0c7edbcfe10316 +SHA512 (kata-containers-3.2.0.tar.gz) = c94e83eb29a51693d8d9667339d391872cc1aea244845f6af7629fa0be0de4fb672c6a5c89dc6f65dc93f1d515b44410f65392b1dcb318ec3a178e529e03d11c +SHA512 (kata-containers-3.2.0-vendor.tar.gz) = 3bd7af65fdf67cf4a6d9a09a3f3d8313d35a352e85fa56d20b0fe774179799db646e0d7d09c64aa717f36bfcd333f0caddae80e3225abd060db28ae3a3fb28b3 From 3ca390ba0539c61b84c1bbea012b0639386404e5 Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Mon, 6 Nov 2023 14:49:05 -0300 Subject: [PATCH 21/65] SPDX license and kata-containers-3.2.0 final Signed-off-by: Emanuel Lima --- kata-containers.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kata-containers.spec b/kata-containers.spec index 9a8703a..90ec59b 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,9 +53,9 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist} +Release: 2%{?rcrel}%{?dist} Summary: Kata Containers version 3.x repository -License: ASL 2.0 +License: Apache-2.0 Url: https://%{download} Source0: https://%{download}/archive/%{version}%{?rcstr}/%{repo}-%{version}%{?rcstr}.tar.gz Source1: https://%{download}/releases/download/%{version}/%{repo}-%{version}%{?rcstr}-vendor.tar.gz @@ -376,6 +376,10 @@ fi %changelog +* Mon Nov 06 2023 Emanuel Lima - 3.2.0-2 +- migrated to SPDX license +- kata-containers-3.2.0 final + * Thu Sep 28 2023 Emanuel Lima - 3.2.0-1 - kata-containers-3.2.0 diff --git a/sources b/sources index 9da6f97..b11ce04 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.2.0.tar.gz) = c94e83eb29a51693d8d9667339d391872cc1aea244845f6af7629fa0be0de4fb672c6a5c89dc6f65dc93f1d515b44410f65392b1dcb318ec3a178e529e03d11c -SHA512 (kata-containers-3.2.0-vendor.tar.gz) = 3bd7af65fdf67cf4a6d9a09a3f3d8313d35a352e85fa56d20b0fe774179799db646e0d7d09c64aa717f36bfcd333f0caddae80e3225abd060db28ae3a3fb28b3 +SHA512 (kata-containers-3.2.0.tar.gz) = 3292dd4779e9b901b430887fa1b4c7fa1cf9f59610bc8af146228b4d3094ac4478ff6fa0790f2625fe98fcc520aab69ee7c7745332c9fbcb2804f5d3bc20d152 +SHA512 (kata-containers-3.2.0-vendor.tar.gz) = 5da9e83850dcb52ea6d8c4f829566eb3a60317a72eed55355ff62138f49b9d1aecb33ba8c06f2b0cfbd2815a53ee1139798d5888bb61927899225e73c874cd5a From cb9b4b4002c984287edecc7882bf3cb207ca9316 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:59:44 +0000 Subject: [PATCH 22/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index 90ec59b..f6ac1a9 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 2%{?rcrel}%{?dist} +Release: 2%{?rcrel}%{?dist}.1 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -376,6 +376,9 @@ fi %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 3.2.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Nov 06 2023 Emanuel Lima - 3.2.0-2 - migrated to SPDX license - kata-containers-3.2.0 final From 5bfc833bfcfc782ae46e6c876f6522e6dea10724 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:39:59 +0000 Subject: [PATCH 23/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index f6ac1a9..f938696 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 2%{?rcrel}%{?dist}.1 +Release: 2%{?rcrel}%{?dist}.2 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -376,6 +376,9 @@ fi %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 3.2.0-2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 3.2.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8f0eb18355787ee480d9cf0a883f4ced0b7ab66e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 11 Feb 2024 23:28:41 +0000 Subject: [PATCH 24/65] Rebuild for golang 1.22.0 --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index f938696..ed09b5c 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 2%{?rcrel}%{?dist}.2 +Release: 2%{?rcrel}%{?dist}.3 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -376,6 +376,9 @@ fi %changelog +* Sun Feb 11 2024 Maxwell G - 3.2.0-2.3 +- Rebuild for golang 1.22.0 + * Wed Jan 24 2024 Fedora Release Engineering - 3.2.0-2.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 45703f2090884441a8b93966e53d93b0353b75ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 2 Apr 2024 20:26:38 +0200 Subject: [PATCH 25/65] spec: Bump Kata Containers to its 3.3.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabiano Fidêncio --- kata-containers.spec | 4 ++-- sources | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kata-containers.spec b/kata-containers.spec index ed09b5c..bd14a43 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 3.2.0 +Version: 3.3.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 2%{?rcrel}%{?dist}.3 +Release: 1%{?rcrel}%{?dist}.0 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} diff --git a/sources b/sources index b11ce04..7384aac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.2.0.tar.gz) = 3292dd4779e9b901b430887fa1b4c7fa1cf9f59610bc8af146228b4d3094ac4478ff6fa0790f2625fe98fcc520aab69ee7c7745332c9fbcb2804f5d3bc20d152 -SHA512 (kata-containers-3.2.0-vendor.tar.gz) = 5da9e83850dcb52ea6d8c4f829566eb3a60317a72eed55355ff62138f49b9d1aecb33ba8c06f2b0cfbd2815a53ee1139798d5888bb61927899225e73c874cd5a +SHA512 (kata-containers-3.3.0.tar.gz) = 54b989b1db27e56266d1e40b18d3c4f353a3f876dad358afecbba7fb7e1238da1f0856c73f627cbb24e36176f784e2a809bb1b7a990ad21644b06e7b43d64a68 +SHA512 (kata-containers-3.3.0-vendor.tar.gz) = 1f960b4357209304bac29ff00bef96a27fc09ab370c9f181ab68b15b945b150d03a1a8b325054f90ca56a674d535f4665376dba0a8043c5d3de3579494ae7e9d From ef5cf5f676b1f73d537d8899fbee33b06e70aaa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 2 Apr 2024 20:24:13 +0200 Subject: [PATCH 26/65] agent: Remove "vendored" features from openssl-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows us to link against the openssl libraries that are present on the system, be those from 3.x or 1.1, fixing a build issue seen after bumping to Kata Containers 3.3.0. Signed-off-by: Fabiano Fidêncio --- ...gent-Remove-openssl-vendored-feature.patch | 29 +++++++++++++++++++ kata-containers.spec | 1 + 2 files changed, 30 insertions(+) create mode 100644 1001-agent-Remove-openssl-vendored-feature.patch diff --git a/1001-agent-Remove-openssl-vendored-feature.patch b/1001-agent-Remove-openssl-vendored-feature.patch new file mode 100644 index 0000000..63fecb9 --- /dev/null +++ b/1001-agent-Remove-openssl-vendored-feature.patch @@ -0,0 +1,29 @@ +From b3c6c634d22f1d02b9910de169fe9ead27bc8395 Mon Sep 17 00:00:00 2001 +From: Fabiano Fidêncio +Date: Tue, 2 Apr 2024 19:05:17 +0200 +Subject: [PATCH] agent: Remove openssl vendored feature + +Otherwise openssl will try to depend on the openssl 1.1, instead of +linking against the 3.0 one. + +Signed-off-by: Fabiano Fidêncio +--- + src/agent/Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml +index 31092c0..c8aca51 100644 +--- a/src/agent/Cargo.toml ++++ b/src/agent/Cargo.toml +@@ -74,7 +74,7 @@ clap = { version = "3.0.1", features = ["derive"] } + http = { version = "0.2.8", optional = true } + reqwest = { version = "0.11.14", optional = true } + # The "vendored" feature for openssl is required for musl build +-openssl = { version = "0.10.54", features = ["vendored"], optional = true } ++openssl = { version = "0.10.54", optional = true } + + # Image pull/decrypt + image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "ca6b438", default-features = true, optional = true } +-- +2.41.0 + diff --git a/kata-containers.spec b/kata-containers.spec index bd14a43..ad0bdaf 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -67,6 +67,7 @@ Source5: 50-kata # Keep this patch downstream as it'd be hard to justify such change upstream Patch0999: 0999-osbuilder-Adjust-agent_version-for-our-builds.patch Patch1000: 1000-Remove-shebang-in-non-executable-completion-script.patch +Patch1001: 1001-agent-Remove-openssl-vendored-feature.patch %if 0%{?have_go_rpm_macros} From 3b5e58a11b52ecbbf54170689e849bf8a64df8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 2 Apr 2024 20:27:26 +0200 Subject: [PATCH 27/65] spec: Add openssl-devel as a dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need that, as the agent links against openssl. Signed-off-by: Fabiano Fidêncio --- kata-containers.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/kata-containers.spec b/kata-containers.spec index ad0bdaf..1f91d7f 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -81,6 +81,7 @@ BuildRequires: git-core BuildRequires: libselinux-devel BuildRequires: libseccomp-devel BuildRequires: make +BuildRequires: openssl-devel BuildRequires: systemd BuildRequires: gcc BuildRequires: protobuf-compiler From 208b25694ac8f6960f139e5eb5bfc392553c0282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 2 Apr 2024 20:28:35 +0200 Subject: [PATCH 28/65] spec: Build kata-ctl instead of log-parser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We do that as the log-parser is gone and became a command of kata-ctl. Signed-off-by: Fabiano Fidêncio --- kata-containers.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/kata-containers.spec b/kata-containers.spec index 1f91d7f..4f65978 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -210,8 +210,8 @@ ExcludeArch: %{arm} %{ix86} s390 s390x %global agent_make_vars %{rust_make_vars} \\\ DESTDIR=%{buildroot}%{kataagentdir} -%global log_parser_vars %{rust_make_vars} \\\ - BINDIR=%{buildroot}%{_bindir} +%global kata_ctl_vars %{rust_make_vars} \\\ + INSTALL_PATH=%{buildroot}%{_prefix} %prep %autosetup -S git -p1 -n %{kata_build_dir} @@ -238,8 +238,8 @@ pushd src/agent touch kata-agent popd -pushd src/tools/log-parser -%make_build %{log_parser_vars} +pushd src/tools/kata-ctl +%make_build %{kata_ctl_vars} popd pushd tools/osbuilder @@ -264,8 +264,10 @@ pushd src/agent %make_install %{agent_make_vars} popd -pushd src/tools/log-parser -%make_install %{log_parser_vars} +pushd src/tools/kata-ctl +%make_install %{kata_ctl_vars} +rm -f %{buildroot}%{_prefix}/.crates.toml +rm -f %{buildroot}%{_prefix}/.crates2.json popd pushd tools/osbuilder @@ -354,8 +356,8 @@ fi %dir %{kataagentdir} %{kataagentdir}/* -#log-parser -%{_bindir}/kata-log-parser +#kata-ctl +%{_bindir}/kata-ctl #osbuilder %dir %{kataosbuilderdir} From 97b066f06d7a19d18e10ef53a14bc7cfa3280c2b Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Fri, 5 Apr 2024 10:09:49 -0300 Subject: [PATCH 29/65] Bump kata-containers to v3.3.0 Also: Add clang-libs as a build dependency Apply spec-Bump-Kata-Containers-to-its-3.3.0-release.patch Apply agent-Remove-vendored-features-from-openssl-sys.patch Apply spec-Add-openssl-devel-as-a-dependency.patch Apply spec-Build-kata-ctl-instead-of-log-parser.patch Signed-off-by: Emanuel Lima --- .gitignore | 2 ++ kata-containers.spec | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index c080309..662c69e 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ generate_vendor.sh /kata-containers-3.1.3-vendor.tar.gz /kata-containers-3.2.0.tar.gz /kata-containers-3.2.0-vendor.tar.gz +/kata-containers-3.3.0.tar.gz +/kata-containers-3.3.0-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index 4f65978..792eb2f 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -85,6 +85,7 @@ BuildRequires: openssl-devel BuildRequires: systemd BuildRequires: gcc BuildRequires: protobuf-compiler +BuildRequires: clang-libs %{?systemd_requires} # %%check requirements @@ -380,6 +381,13 @@ fi %changelog +* Fri Apr 05 2024 Emanuel Lima - 3.3.0-1 +- Add clang-libs as a build dependency + Apply spec-Bump-Kata-Containers-to-its-3.3.0-release.patch + Apply agent-Remove-vendored-features-from-openssl-sys.patch + Apply spec-Add-openssl-devel-as-a-dependency.patch + Apply spec-Build-kata-ctl-instead-of-log-parser.patch + * Sun Feb 11 2024 Maxwell G - 3.2.0-2.3 - Rebuild for golang 1.22.0 From c18fc7682649b5f7974b2e8813fe468823f561ee Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Fri, 5 Apr 2024 11:09:22 -0300 Subject: [PATCH 30/65] Add dbus and dbus-daemon as build dependencies Signed-off-by: Emanuel Lima --- kata-containers.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kata-containers.spec b/kata-containers.spec index 792eb2f..f1334af 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -89,6 +89,8 @@ BuildRequires: clang-libs %{?systemd_requires} # %%check requirements +BuildRequires: dbus +BuildRequires: dbus-daemon BuildRequires: dracut BuildRequires: kernel BuildRequires: busybox From b59e881a24f5f1490fb90e7a8212180a8bd5ad61 Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Fri, 5 Apr 2024 12:20:04 -0300 Subject: [PATCH 31/65] Exclude ppc64le from the build pipeline Signed-off-by: Emanuel Lima --- kata-containers.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kata-containers.spec b/kata-containers.spec index f1334af..852e1c9 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -153,6 +153,9 @@ Conflicts: kata-shim # The following architectures lack the required qemu support ExcludeArch: %{arm} %{ix86} s390 s390x +# Building kata-ctl on ppc64le is currently being skipped +ExcludeArch: ppc64le + %description %{common_description} From 5b8e20032f9d04066077ecc78c9770a6d07e2cc4 Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Tue, 18 Jun 2024 16:55:00 -0300 Subject: [PATCH 32/65] Bump to kata-containers-3.6.0 Also fix agent-Remove-openssl-vendored-feature patch Signed-off-by: Emanuel Lima --- .gitignore | 2 ++ ...gent-Remove-openssl-vendored-feature.patch | 31 ++++++++++++------- kata-containers.spec | 6 +++- sources | 4 +-- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 662c69e..91315fd 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ generate_vendor.sh /kata-containers-3.2.0-vendor.tar.gz /kata-containers-3.3.0.tar.gz /kata-containers-3.3.0-vendor.tar.gz +/kata-containers-3.6.0-vendor.tar.gz +/kata-containers-3.6.0.tar.gz diff --git a/1001-agent-Remove-openssl-vendored-feature.patch b/1001-agent-Remove-openssl-vendored-feature.patch index 63fecb9..88addb1 100644 --- a/1001-agent-Remove-openssl-vendored-feature.patch +++ b/1001-agent-Remove-openssl-vendored-feature.patch @@ -1,29 +1,36 @@ -From b3c6c634d22f1d02b9910de169fe9ead27bc8395 Mon Sep 17 00:00:00 2001 -From: Fabiano Fidêncio -Date: Tue, 2 Apr 2024 19:05:17 +0200 +From 204495765c149c68f9afb4bcfeb296f564834cd0 Mon Sep 17 00:00:00 2001 +From: Emanuel Lima +Date: Tue, 18 Jun 2024 16:41:03 -0300 Subject: [PATCH] agent: Remove openssl vendored feature +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Otherwise openssl will try to depend on the openssl 1.1, instead of linking against the 3.0 one. -Signed-off-by: Fabiano Fidêncio +This is a rework of Fabiano Fidêncio's +patch from April that wasn't working anymore due to changes on the +Cargo.toml file. + +Signed-off-by: Emanuel Lima --- src/agent/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml -index 31092c0..c8aca51 100644 +index 27e7fd5..290f995 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml -@@ -74,7 +74,7 @@ clap = { version = "3.0.1", features = ["derive"] } - http = { version = "0.2.8", optional = true } - reqwest = { version = "0.11.14", optional = true } - # The "vendored" feature for openssl is required for musl build --openssl = { version = "0.10.54", features = ["vendored"], optional = true } -+openssl = { version = "0.10.54", optional = true } +@@ -82,7 +82,7 @@ strum_macros = "0.26.2" # Image pull/decrypt image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "ca6b438", default-features = true, optional = true } +-openssl = { version = "0.10.54", features = ["vendored"], optional = true } ++openssl = { version = "0.10.54", optional = true } + + # Agent Policy + regorus = { version = "0.1.4", default-features = false, features = ["arc", "regex"], optional = true } -- -2.41.0 +2.43.0 diff --git a/kata-containers.spec b/kata-containers.spec index 852e1c9..92bd660 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 3.3.0 +Version: 3.6.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -386,6 +386,10 @@ fi %changelog +* Tue Jun 18 2024 Emanuel Lima - 3.6.0-1 +- Bump to kata-containers-3.6.0 +- Fix agent-Remove-openssl-vendored-feature patch + * Fri Apr 05 2024 Emanuel Lima - 3.3.0-1 - Add clang-libs as a build dependency Apply spec-Bump-Kata-Containers-to-its-3.3.0-release.patch diff --git a/sources b/sources index 7384aac..14a95c6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.3.0.tar.gz) = 54b989b1db27e56266d1e40b18d3c4f353a3f876dad358afecbba7fb7e1238da1f0856c73f627cbb24e36176f784e2a809bb1b7a990ad21644b06e7b43d64a68 -SHA512 (kata-containers-3.3.0-vendor.tar.gz) = 1f960b4357209304bac29ff00bef96a27fc09ab370c9f181ab68b15b945b150d03a1a8b325054f90ca56a674d535f4665376dba0a8043c5d3de3579494ae7e9d +SHA512 (kata-containers-3.6.0-vendor.tar.gz) = 0bac0febd71e016382ca16c1756a33546381f6021783c0bdbb19589646f657270bcb63c48d9ff964415286efbbcbf2c3627ea487be94d37a78898ed792041067 +SHA512 (kata-containers-3.6.0.tar.gz) = 952d299d08ea3f77c4b8b24fcde3df65723d959412c473c97ca9e391a5829960e38baa98950e2c06275573094ad6c893174c61163496d22aea0ecfe4e1b75b39 From 0d966bf1b734c253c1cd9add1ab0d44aa3bd6483 Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Tue, 18 Jun 2024 17:10:34 -0300 Subject: [PATCH 33/65] Bump to kata-containers-3.6.0 Also fix agent-Remove-openssl-vendored-feature patch Signed-off-by: Emanuel Lima --- .gitignore | 2 ++ ...gent-Remove-openssl-vendored-feature.patch | 36 +++++++++++++++++++ kata-containers.spec | 13 ++++--- sources | 4 +-- 4 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 1001-agent-Remove-openssl-vendored-feature.patch diff --git a/.gitignore b/.gitignore index c080309..4df5647 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ generate_vendor.sh /kata-containers-3.1.3-vendor.tar.gz /kata-containers-3.2.0.tar.gz /kata-containers-3.2.0-vendor.tar.gz +/kata-containers-3.6.0-vendor.tar.gz +/kata-containers-3.6.0.tar.gz diff --git a/1001-agent-Remove-openssl-vendored-feature.patch b/1001-agent-Remove-openssl-vendored-feature.patch new file mode 100644 index 0000000..88addb1 --- /dev/null +++ b/1001-agent-Remove-openssl-vendored-feature.patch @@ -0,0 +1,36 @@ +From 204495765c149c68f9afb4bcfeb296f564834cd0 Mon Sep 17 00:00:00 2001 +From: Emanuel Lima +Date: Tue, 18 Jun 2024 16:41:03 -0300 +Subject: [PATCH] agent: Remove openssl vendored feature +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise openssl will try to depend on the openssl 1.1, instead of +linking against the 3.0 one. + +This is a rework of Fabiano Fidêncio's +patch from April that wasn't working anymore due to changes on the +Cargo.toml file. + +Signed-off-by: Emanuel Lima +--- + src/agent/Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml +index 27e7fd5..290f995 100644 +--- a/src/agent/Cargo.toml ++++ b/src/agent/Cargo.toml +@@ -82,7 +82,7 @@ strum_macros = "0.26.2" + + # Image pull/decrypt + image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "ca6b438", default-features = true, optional = true } +-openssl = { version = "0.10.54", features = ["vendored"], optional = true } ++openssl = { version = "0.10.54", optional = true } + + # Agent Policy + regorus = { version = "0.1.4", default-features = false, features = ["arc", "regex"], optional = true } +-- +2.43.0 + diff --git a/kata-containers.spec b/kata-containers.spec index ed09b5c..47875de 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 3.2.0 +Version: 3.6.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 2%{?rcrel}%{?dist}.3 +Release: 1%{?rcrel}%{?dist}.0 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -67,6 +67,7 @@ Source5: 50-kata # Keep this patch downstream as it'd be hard to justify such change upstream Patch0999: 0999-osbuilder-Adjust-agent_version-for-our-builds.patch Patch1000: 1000-Remove-shebang-in-non-executable-completion-script.patch +Patch1001: 1001-agent-Remove-openssl-vendored-feature.patch %if 0%{?have_go_rpm_macros} @@ -91,8 +92,8 @@ BuildRequires: kernel BuildRequires: busybox %if 0%{?bundled_rust_deps} -BuildRequires: cargo -BuildRequires: rust +#BuildRequires: cargo +#BuildRequires: rust %else # Generated using rust2rpm # [dependencies] @@ -376,6 +377,10 @@ fi %changelog +* Tue Jun 18 2024 Emanuel Lima - 3.6.0-1 +- Bump to kata-containers-3.6.0 +- Add agent-Remove-openssl-vendored-feature patch + * Sun Feb 11 2024 Maxwell G - 3.2.0-2.3 - Rebuild for golang 1.22.0 diff --git a/sources b/sources index b11ce04..14a95c6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.2.0.tar.gz) = 3292dd4779e9b901b430887fa1b4c7fa1cf9f59610bc8af146228b4d3094ac4478ff6fa0790f2625fe98fcc520aab69ee7c7745332c9fbcb2804f5d3bc20d152 -SHA512 (kata-containers-3.2.0-vendor.tar.gz) = 5da9e83850dcb52ea6d8c4f829566eb3a60317a72eed55355ff62138f49b9d1aecb33ba8c06f2b0cfbd2815a53ee1139798d5888bb61927899225e73c874cd5a +SHA512 (kata-containers-3.6.0-vendor.tar.gz) = 0bac0febd71e016382ca16c1756a33546381f6021783c0bdbb19589646f657270bcb63c48d9ff964415286efbbcbf2c3627ea487be94d37a78898ed792041067 +SHA512 (kata-containers-3.6.0.tar.gz) = 952d299d08ea3f77c4b8b24fcde3df65723d959412c473c97ca9e391a5829960e38baa98950e2c06275573094ad6c893174c61163496d22aea0ecfe4e1b75b39 From 9b118bd078d5dcf64df422b63a92908b93e93e2e Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Tue, 18 Jun 2024 17:16:42 -0300 Subject: [PATCH 34/65] Fix typo in spec Signed-off-by: Emanuel Lima --- kata-containers.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kata-containers.spec b/kata-containers.spec index 47875de..c7d34d6 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -92,8 +92,8 @@ BuildRequires: kernel BuildRequires: busybox %if 0%{?bundled_rust_deps} -#BuildRequires: cargo -#BuildRequires: rust +BuildRequires: cargo +BuildRequires: rust %else # Generated using rust2rpm # [dependencies] From 08616b23fd61896c10885c487ad5a8f902f93d6e Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Tue, 18 Jun 2024 17:39:53 -0300 Subject: [PATCH 35/65] Fix spec with the same changes from rawhide - Add openssl-devel as a dependency - Build kata-ctl instead of log-parser - Add clang-libs, dbus and dbus-daemon as build dependencies - Exclude ppc64le from the build pipeline Signed-off-by: Emanuel Lima --- kata-containers.spec | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/kata-containers.spec b/kata-containers.spec index c7d34d6..b012989 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist}.0 +Release: 2%{?rcrel}%{?dist}.0 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -81,12 +81,16 @@ BuildRequires: git-core BuildRequires: libselinux-devel BuildRequires: libseccomp-devel BuildRequires: make +BuildRequires: openssl-devel BuildRequires: systemd BuildRequires: gcc BuildRequires: protobuf-compiler +BuildRequires: clang-libs %{?systemd_requires} # %%check requirements +BuildRequires: dbus +BuildRequires: dbus-daemon BuildRequires: dracut BuildRequires: kernel BuildRequires: busybox @@ -149,6 +153,9 @@ Conflicts: kata-shim # The following architectures lack the required qemu support ExcludeArch: %{arm} %{ix86} s390 s390x +# Building kata-ctl on ppc64le is currently being skipped +ExcludeArch: ppc64le + %description %{common_description} @@ -209,8 +216,8 @@ ExcludeArch: %{arm} %{ix86} s390 s390x %global agent_make_vars %{rust_make_vars} \\\ DESTDIR=%{buildroot}%{kataagentdir} -%global log_parser_vars %{rust_make_vars} \\\ - BINDIR=%{buildroot}%{_bindir} +%global kata_ctl_vars %{rust_make_vars} \\\ + INSTALL_PATH=%{buildroot}%{_prefix} %prep %autosetup -S git -p1 -n %{kata_build_dir} @@ -237,8 +244,8 @@ pushd src/agent touch kata-agent popd -pushd src/tools/log-parser -%make_build %{log_parser_vars} +pushd src/tools/kata-ctl +%make_build %{kata_ctl_vars} popd pushd tools/osbuilder @@ -263,8 +270,10 @@ pushd src/agent %make_install %{agent_make_vars} popd -pushd src/tools/log-parser -%make_install %{log_parser_vars} +pushd src/tools/kata-ctl +%make_install %{kata_ctl_vars} +rm -f %{buildroot}%{_prefix}/.crates.toml +rm -f %{buildroot}%{_prefix}/.crates2.json popd pushd tools/osbuilder @@ -353,8 +362,8 @@ fi %dir %{kataagentdir} %{kataagentdir}/* -#log-parser -%{_bindir}/kata-log-parser +#kata-ctl +%{_bindir}/kata-ctl #osbuilder %dir %{kataosbuilderdir} @@ -377,6 +386,12 @@ fi %changelog +* Tue Jun 18 2024 Emanuel Lima - 3.6.0-2 +- Add openssl-devel as a dependency +- Build kata-ctl instead of log-parser +- Add clang-libs, dbus and dbus-daemon as build dependencies +- Exclude ppc64le from the build pipeline + * Tue Jun 18 2024 Emanuel Lima - 3.6.0-1 - Bump to kata-containers-3.6.0 - Add agent-Remove-openssl-vendored-feature patch From 6796dce20605230e1d9baec94a0ff96636541f4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:21:49 +0000 Subject: [PATCH 36/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index 92bd660..2fa4ff8 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist}.0 +Release: 1%{?rcrel}%{?dist}.1 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -386,6 +386,9 @@ fi %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 3.6.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 18 2024 Emanuel Lima - 3.6.0-1 - Bump to kata-containers-3.6.0 - Fix agent-Remove-openssl-vendored-feature patch From b64217f74f7ebe2582a8752f51a9d75c7aa3e345 Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Wed, 24 Jul 2024 10:57:07 -0300 Subject: [PATCH 37/65] Release kata-containers-3.7.0-1 Also: Add "io.kubernetes.cri-o.Devices" to cri-o config Remove the openssl feature patch Bump QEMU to 8.2 Add Remove-warnings-as-compilation-errors patch Signed-off-by: Emanuel Lima --- .gitignore | 4 +- ...-Adjust-agent_version-for-our-builds.patch | 17 +- ...emove-warnings-as-compilation-errors.patch | 198 ++++++++++++++++++ ...gent-Remove-openssl-vendored-feature.patch | 36 ---- 50-kata | 3 + kata-containers.spec | 18 +- sources | 4 +- 7 files changed, 229 insertions(+), 51 deletions(-) create mode 100644 1001-Remove-warnings-as-compilation-errors.patch delete mode 100644 1001-agent-Remove-openssl-vendored-feature.patch diff --git a/.gitignore b/.gitignore index 4df5647..b34d877 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -generate_vendor.sh +.vscode /kata-containers-2.0.0.tar.gz /kata-containers-2.0.1.tar.gz /kata-containers-2.0.2.tar.gz @@ -44,3 +44,5 @@ generate_vendor.sh /kata-containers-3.2.0-vendor.tar.gz /kata-containers-3.6.0-vendor.tar.gz /kata-containers-3.6.0.tar.gz +/kata-containers-3.7.0-vendor.tar.gz +/kata-containers-3.7.0.tar.gz diff --git a/0999-osbuilder-Adjust-agent_version-for-our-builds.patch b/0999-osbuilder-Adjust-agent_version-for-our-builds.patch index baca5aa..571a077 100644 --- a/0999-osbuilder-Adjust-agent_version-for-our-builds.patch +++ b/0999-osbuilder-Adjust-agent_version-for-our-builds.patch @@ -1,4 +1,4 @@ -From f1b45ad2295eb260d0c53f6d90ede35b4b2ad510 Mon Sep 17 00:00:00 2001 +From dbc78715ffe7b4011383d585548352ca2ea57f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 1 Sep 2021 17:39:17 -0300 Subject: [PATCH] Adjust agent_version for our builds @@ -10,24 +10,27 @@ As we move things around when installing osbuilder, we need to adapt where we get the agent_version from. Signed-off-by: Fabiano Fidêncio +[gkurz: rebased on top of 3.7.0] +Signed-off-by: Greg Kurz --- - tools/osbuilder/scripts/lib.sh | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + tools/osbuilder/scripts/lib.sh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/osbuilder/scripts/lib.sh b/tools/osbuilder/scripts/lib.sh -index 33a01f0..4225741 100644 +index 5e3687595953..53d544e7b1d0 100644 --- a/tools/osbuilder/scripts/lib.sh +++ b/tools/osbuilder/scripts/lib.sh -@@ -164,8 +164,7 @@ create_summary_file() +@@ -180,9 +180,7 @@ create_summary_file() local agent="${AGENT_DEST}" [ "$AGENT_INIT" = yes ] && agent="${init}" - local -r agentdir="${script_dir}/../../../" -- local -r agent_version=$(cat ${agentdir}/VERSION) +- local agent_version=$(cat ${agentdir}/VERSION 2> /dev/null) +- [ -z "$agent_version" ] && agent_version="unknown" + agent_version=$(cat "${script_dir}/../../VERSION") cat >"$file"<<-EOF --- -- -2.37.2 +2.45.2 diff --git a/1001-Remove-warnings-as-compilation-errors.patch b/1001-Remove-warnings-as-compilation-errors.patch new file mode 100644 index 0000000..a4450fa --- /dev/null +++ b/1001-Remove-warnings-as-compilation-errors.patch @@ -0,0 +1,198 @@ +From f8f40b91620577323b0167eda66b2a3885d1031e Mon Sep 17 00:00:00 2001 +From: Emanuel Lima +Date: Thu, 25 Jul 2024 12:01:32 -0300 +Subject: [PATCH] Remove warnings as compilation errors + +This is blocking kata-containers to be built with rust 1.79 + +Signed-off-by: Emanuel Lima +--- + src/agent/Makefile | 4 +- + src/dragonball/Makefile | 1 - + src/libs/Makefile | 1 - + src/runtime-rs/Makefile | 4 +- + src/tools/agent-ctl/Makefile | 4 +- + src/tools/genpolicy/Makefile | 4 +- + src/tools/kata-ctl/Makefile | 6 +- + src/tools/runk/Makefile | 2 +- + src/tools/trace-forwarder/Makefile | 2 +- + utils.mk | 1 - + 10 files changed + +diff --git a/src/agent/Makefile b/src/agent/Makefile +index e0e76a9cd..5b8b3b0d5 100644 +--- a/src/agent/Makefile ++++ b/src/agent/Makefile +@@ -134,14 +134,14 @@ static-checks-build: $(GENERATED_CODE) + $(TARGET): $(GENERATED_CODE) $(TARGET_PATH) + + $(TARGET_PATH): show-summary +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + + $(GENERATED_FILES): %: %.in + @sed $(foreach r,$(GENERATED_REPLACEMENTS),-e 's|@$r@|$($r)|g') "$<" > "$@" + + ##TARGET optimize: optimized build + optimize: show-summary show-header +- @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) ++ @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + + ##TARGET install: install agent + install: install-services +diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile +index 40bb7f915..27f12c30b 100644 +--- a/src/dragonball/Makefile ++++ b/src/dragonball/Makefile +@@ -27,7 +27,6 @@ clippy: + @echo "INFO: cargo clippy..." + cargo clippy --all-targets --all-features \ + -- \ +- -D warnings + + vendor: + @echo "INFO: vendor do nothing.." +diff --git a/src/libs/Makefile b/src/libs/Makefile +index aabaa3391..c79d437f9 100644 +--- a/src/libs/Makefile ++++ b/src/libs/Makefile +@@ -25,7 +25,6 @@ clippy: + @echo "INFO: cargo clippy..." + cargo clippy --all-targets --all-features --release \ + -- \ +- -D warnings + + format: + @echo "INFO: cargo fmt..." +diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile +index 7e1c787cc..f282facff 100644 +--- a/src/runtime-rs/Makefile ++++ b/src/runtime-rs/Makefile +@@ -559,7 +559,7 @@ static-checks-build: $(GENERATED_FILES) + $(TARGET): $(GENERATED_FILES) $(TARGET_PATH) + + $(TARGET_PATH): $(SOURCES) | show-summary +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) + + $(GENERATED_FILES): %: %.in + @sed \ +@@ -569,7 +569,7 @@ $(GENERATED_FILES): %: %.in + + ##TARGET optimize: optimized build + optimize: $(SOURCES) | show-summary show-header +- @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) ++ @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) + + ##TARGET clean: clean build + clean: clean-generated-files +diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile +index a49f88e6b..3a7354b70 100644 +--- a/src/tools/agent-ctl/Makefile ++++ b/src/tools/agent-ctl/Makefile +@@ -13,7 +13,7 @@ endif + default: build + + build: +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) + + static-checks-build: + @echo "INFO: static-checks-build do nothing.." +@@ -27,7 +27,7 @@ vendor: + test: + + install: +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo install --locked --target $(TRIPLE) --path . + + check: standard_rust_check + +diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile +index fe56fa098..fdedf2027 100644 +--- a/src/tools/genpolicy/Makefile ++++ b/src/tools/genpolicy/Makefile +@@ -13,7 +13,7 @@ ifeq ($(ARCH), ppc64le) + default: build + + build: +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) + + static-checks-build: + @echo "INFO: static-checks-build do nothing.." +@@ -27,7 +27,7 @@ vendor: + test: + + install: +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo install --locked --target $(TRIPLE) --path . + + check: standard_rust_check + +diff --git a/src/tools/kata-ctl/Makefile b/src/tools/kata-ctl/Makefile +index 7595c0c23..0fb312c63 100644 +--- a/src/tools/kata-ctl/Makefile ++++ b/src/tools/kata-ctl/Makefile +@@ -43,7 +43,7 @@ default: $(TARGET) build + $(TARGET): $(GENERATED_CODE) + + build: +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + + static-checks-build: $(GENERATED_CODE) + +@@ -59,10 +59,10 @@ vendor: + cargo vendor + + test: $(GENERATED_CODE) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo test --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -- --nocapture ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo test --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -- --nocapture + + install: +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . --root $(INSTALL_PATH) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo install --locked --target $(TRIPLE) --path . --root $(INSTALL_PATH) + + check: $(GENERATED_CODE) standard_rust_check + +diff --git a/src/tools/runk/Makefile b/src/tools/runk/Makefile +index 186955679..633e0416a 100644 +--- a/src/tools/runk/Makefile ++++ b/src/tools/runk/Makefile +@@ -36,7 +36,7 @@ endif + default: build + + build: +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) + + static-checks-build: + @echo "INFO: static-checks-build do nothing.." +diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Makefile +index 5d9f71856..249520a1f 100644 +--- a/src/tools/trace-forwarder/Makefile ++++ b/src/tools/trace-forwarder/Makefile +@@ -13,7 +13,7 @@ endif + default: build + + build: +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) + + static-checks-build: + @echo "INFO: static-checks-build do nothing.." +diff --git a/utils.mk b/utils.mk +index 1a153e26c..14c575f8d 100644 +--- a/utils.mk ++++ b/utils.mk +@@ -176,7 +176,6 @@ standard_rust_check: + cargo fmt -- --check + cargo clippy --all-targets --all-features --release \ + -- \ +- -D warnings + + # Install a file (full version). + # +-- +2.43.5 diff --git a/1001-agent-Remove-openssl-vendored-feature.patch b/1001-agent-Remove-openssl-vendored-feature.patch deleted file mode 100644 index 88addb1..0000000 --- a/1001-agent-Remove-openssl-vendored-feature.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 204495765c149c68f9afb4bcfeb296f564834cd0 Mon Sep 17 00:00:00 2001 -From: Emanuel Lima -Date: Tue, 18 Jun 2024 16:41:03 -0300 -Subject: [PATCH] agent: Remove openssl vendored feature -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise openssl will try to depend on the openssl 1.1, instead of -linking against the 3.0 one. - -This is a rework of Fabiano Fidêncio's -patch from April that wasn't working anymore due to changes on the -Cargo.toml file. - -Signed-off-by: Emanuel Lima ---- - src/agent/Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml -index 27e7fd5..290f995 100644 ---- a/src/agent/Cargo.toml -+++ b/src/agent/Cargo.toml -@@ -82,7 +82,7 @@ strum_macros = "0.26.2" - - # Image pull/decrypt - image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "ca6b438", default-features = true, optional = true } --openssl = { version = "0.10.54", features = ["vendored"], optional = true } -+openssl = { version = "0.10.54", optional = true } - - # Agent Policy - regorus = { version = "0.1.4", default-features = false, features = ["arc", "regex"], optional = true } --- -2.43.0 - diff --git a/50-kata b/50-kata index d9223d2..ead8f1d 100644 --- a/50-kata +++ b/50-kata @@ -3,3 +3,6 @@ runtime_type = "vm" runtime_root = "/run/vc" privileged_without_host_devices = true + allowed_annotations = [ + "io.kubernetes.cri-o.Devices", + ] diff --git a/kata-containers.spec b/kata-containers.spec index b012989..9fe2389 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 3.6.0 +Version: 3.7.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 2%{?rcrel}%{?dist}.0 +Release: 1%{?rcrel}%{?dist}.0 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -67,8 +67,7 @@ Source5: 50-kata # Keep this patch downstream as it'd be hard to justify such change upstream Patch0999: 0999-osbuilder-Adjust-agent_version-for-our-builds.patch Patch1000: 1000-Remove-shebang-in-non-executable-completion-script.patch -Patch1001: 1001-agent-Remove-openssl-vendored-feature.patch - +Patch1001: 1001-Remove-warnings-as-compilation-errors.patch %if 0%{?have_go_rpm_macros} BuildRequires: go-rpm-macros @@ -138,7 +137,7 @@ BuildRequires: crate(ttrpc/default) >= 0.0.0 Requires: busybox Requires: dracut Requires: kernel -Requires: qemu-kvm-core >= 4.2.0-4 +Requires: qemu-kvm-core >= 8.2.0-1 # For /usr/libexec/virtiofsd Requires: (virtiofsd or qemu-virtiofsd) Suggests: virtiofsd @@ -228,6 +227,8 @@ tar -xf %{SOURCE1} # Not using gobuild here in order to stick to how upstream builds # (This builds multiple binaries) %build +%set_build_flags + export PATH=$PATH:"$(pwd)/go/bin" export GOPATH="$(pwd)/go" @@ -386,6 +387,13 @@ fi %changelog +* Thu Jul 25 2024 Emanuel Lima - 3.7.0-1 +- kata-containers 3.7.0 + Add "io.kubernetes.cri-o.Devices" to cri-o config + Remove the openssl feature patch + Bump QEMU to 8.2 + Add Remove-warnings-as-compilation-errors patch + * Tue Jun 18 2024 Emanuel Lima - 3.6.0-2 - Add openssl-devel as a dependency - Build kata-ctl instead of log-parser diff --git a/sources b/sources index 14a95c6..e52fe18 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.6.0-vendor.tar.gz) = 0bac0febd71e016382ca16c1756a33546381f6021783c0bdbb19589646f657270bcb63c48d9ff964415286efbbcbf2c3627ea487be94d37a78898ed792041067 -SHA512 (kata-containers-3.6.0.tar.gz) = 952d299d08ea3f77c4b8b24fcde3df65723d959412c473c97ca9e391a5829960e38baa98950e2c06275573094ad6c893174c61163496d22aea0ecfe4e1b75b39 +SHA512 (kata-containers-3.7.0-vendor.tar.gz) = 7f3e6de72b65647757207d06e93e3e4f66e7eb8780be464db1df707a991202428bc0dbbf56f0f131e7eff6602be4ccfda615e562bc12d02bae226e700e632b6d +SHA512 (kata-containers-3.7.0.tar.gz) = ae084f8765a82d725167078ba0494d0eeb11d1d7af95a010e943ac262fd7f0556a06903337a2a52820a35c7b12da5493a28fb66f48afaa9a4b680a587e6d4db0 From e1b309eaa9725f6a2db65350d28eec24f5e553b9 Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Mon, 16 Sep 2024 12:33:44 -0300 Subject: [PATCH 38/65] Release Kata Containers v3.8.0 Signed-off-by: Emanuel Lima --- .gitignore | 2 + ...emove-warnings-as-compilation-errors.patch | 22 ------ 1002-Fix-invalid-target_arch.patch | 77 +++++++++++++++++++ 1003-Remove-genpolicy-warning-errors.patch | 39 ++++++++++ kata-containers.spec | 9 ++- sources | 4 +- 6 files changed, 128 insertions(+), 25 deletions(-) create mode 100644 1002-Fix-invalid-target_arch.patch create mode 100644 1003-Remove-genpolicy-warning-errors.patch diff --git a/.gitignore b/.gitignore index b34d877..e494557 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ /kata-containers-3.6.0.tar.gz /kata-containers-3.7.0-vendor.tar.gz /kata-containers-3.7.0.tar.gz +/kata-containers-3.8.0-vendor.tar.gz +/kata-containers-3.8.0.tar.gz diff --git a/1001-Remove-warnings-as-compilation-errors.patch b/1001-Remove-warnings-as-compilation-errors.patch index a4450fa..9560202 100644 --- a/1001-Remove-warnings-as-compilation-errors.patch +++ b/1001-Remove-warnings-as-compilation-errors.patch @@ -108,28 +108,6 @@ index a49f88e6b..3a7354b70 100644 check: standard_rust_check -diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile -index fe56fa098..fdedf2027 100644 ---- a/src/tools/genpolicy/Makefile -+++ b/src/tools/genpolicy/Makefile -@@ -13,7 +13,7 @@ ifeq ($(ARCH), ppc64le) - default: build - - build: -- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) - - static-checks-build: - @echo "INFO: static-checks-build do nothing.." -@@ -27,7 +27,7 @@ vendor: - test: - - install: -- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo install --locked --target $(TRIPLE) --path . - - check: standard_rust_check - diff --git a/src/tools/kata-ctl/Makefile b/src/tools/kata-ctl/Makefile index 7595c0c23..0fb312c63 100644 --- a/src/tools/kata-ctl/Makefile diff --git a/1002-Fix-invalid-target_arch.patch b/1002-Fix-invalid-target_arch.patch new file mode 100644 index 0000000..63e1ca9 --- /dev/null +++ b/1002-Fix-invalid-target_arch.patch @@ -0,0 +1,77 @@ +From 9dcd503753ef484610278dee111f224b96e647d9 Mon Sep 17 00:00:00 2001 +From: Emanuel Lima +Date: Mon, 26 Aug 2024 11:50:10 -0300 +Subject: [PATCH] Fix invalid target_arch + +Based on https://github.com/kata-containers/kata-containers/pull/10079 + +Signed-off-by: Emanuel Lima +--- + src/libs/kata-sys-util/src/protection.rs | 4 ++-- + src/tools/kata-ctl/src/arch/mod.rs | 6 +++--- + src/tools/kata-ctl/src/arch/powerpc64le/mod.rs | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/libs/kata-sys-util/src/protection.rs b/src/libs/kata-sys-util/src/protection.rs +index 74ccd5006..ac9a21c15 100644 +--- a/src/libs/kata-sys-util/src/protection.rs ++++ b/src/libs/kata-sys-util/src/protection.rs +@@ -14,7 +14,7 @@ use std::path::Path; + use std::path::PathBuf; + use thiserror::Error; + +-#[cfg(any(target_arch = "s390x", target_arch = "powerpc64le"))] ++#[cfg(any(target_arch = "s390x", target_arch = "powerpc64"))] + use nix::unistd::Uid; + + #[cfg(target_arch = "x86_64")] +@@ -234,7 +234,7 @@ pub fn available_guest_protection() -> Result + Ok(GuestProtection::Se) + } + +-#[cfg(target_arch = "powerpc64le")] ++#[cfg(all(target_arch = "powerpc64", target_endian = "little"))] + pub fn available_guest_protection() -> Result { + if !Uid::effective().is_root() { + return Err(check::ProtectionError::NoPerms); +diff --git a/src/tools/kata-ctl/src/arch/mod.rs b/src/tools/kata-ctl/src/arch/mod.rs +index b0010955d..949e1aad5 100644 +--- a/src/tools/kata-ctl/src/arch/mod.rs ++++ b/src/tools/kata-ctl/src/arch/mod.rs +@@ -8,9 +8,9 @@ pub mod aarch64; + #[cfg(target_arch = "aarch64")] + pub use aarch64 as arch_specific; + +-#[cfg(target_arch = "powerpc64le")] ++#[cfg(all(target_arch = "powerpc64", target_endian = "little"))] + pub mod powerpc64le; +-#[cfg(target_arch = "powerpc64le")] ++#[cfg(all(target_arch = "powerpc64", target_endian = "little"))] + pub use powerpc64le as arch_specific; + + #[cfg(target_arch = "s390x")] +@@ -25,7 +25,7 @@ pub use x86_64 as arch_specific; + + #[cfg(not(any( + target_arch = "aarch64", +- target_arch = "powerpc64le", ++ target_arch = "powerpc64", + target_arch = "s390x", + target_arch = "x86_64" + )))] +diff --git a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs b/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs +index bf5822c04..b59d1539c 100644 +--- a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs ++++ b/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs +@@ -4,7 +4,7 @@ + // + + use crate::types::*; +-#[cfg(target_arch = "powerpc64le")] ++#[cfg(all(target_arch = "powerpc64", target_endian = "little"))] + pub use arch_specific::*; + + mod arch_specific { +-- +2.43.5 + diff --git a/1003-Remove-genpolicy-warning-errors.patch b/1003-Remove-genpolicy-warning-errors.patch new file mode 100644 index 0000000..1cf365a --- /dev/null +++ b/1003-Remove-genpolicy-warning-errors.patch @@ -0,0 +1,39 @@ +From bee6ba24e144d7d919799885d2023f8d8dc78005 Mon Sep 17 00:00:00 2001 +From: Emanuel Lima +Date: Mon, 26 Aug 2024 12:25:22 -0300 +Subject: [PATCH] Remove genpolicy warning errors + +Signed-off-by: Emanuel Lima +--- + src/tools/genpolicy/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile +index 7410e20ed..567431257 100644 +--- a/src/tools/genpolicy/Makefile ++++ b/src/tools/genpolicy/Makefile +@@ -28,7 +28,7 @@ $(GENERATED_FILES): %: %.in + default: build + + build: $(GENERATED_FILES) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) + + static-checks-build: + @echo "INFO: static-checks-build do nothing.." +@@ -41,10 +41,10 @@ vendor: + cargo vendor + + test: $(GENERATED_FILES) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo test --all-targets --all-features --target $(TRIPLE) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo test --all-targets --all-features --target $(TRIPLE) + + install: $(GENERATED_FILES) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo install --locked --target $(TRIPLE) --path . + + check: $(GENERATED_CODE) standard_rust_check + +-- +2.43.5 + diff --git a/kata-containers.spec b/kata-containers.spec index 1ee2de9..e535610 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 3.7.0 +Version: 3.8.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -68,6 +68,8 @@ Source5: 50-kata Patch0999: 0999-osbuilder-Adjust-agent_version-for-our-builds.patch Patch1000: 1000-Remove-shebang-in-non-executable-completion-script.patch Patch1001: 1001-Remove-warnings-as-compilation-errors.patch +Patch1002: 1002-Fix-invalid-target_arch.patch +Patch1003: 1003-Remove-genpolicy-warning-errors.patch %if 0%{?have_go_rpm_macros} BuildRequires: go-rpm-macros @@ -387,6 +389,11 @@ fi %changelog +* Mon Aug 26 2024 Emanuel Lima - 3.8.0-1 +- kata-containers 3.8.0 + Add fix invalid target arch patch + Fix warning errors patch + * Thu Jul 25 2024 Emanuel Lima - 3.7.0-1 - kata-containers 3.7.0 Add "io.kubernetes.cri-o.Devices" to cri-o config diff --git a/sources b/sources index e52fe18..63e01cd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.7.0-vendor.tar.gz) = 7f3e6de72b65647757207d06e93e3e4f66e7eb8780be464db1df707a991202428bc0dbbf56f0f131e7eff6602be4ccfda615e562bc12d02bae226e700e632b6d -SHA512 (kata-containers-3.7.0.tar.gz) = ae084f8765a82d725167078ba0494d0eeb11d1d7af95a010e943ac262fd7f0556a06903337a2a52820a35c7b12da5493a28fb66f48afaa9a4b680a587e6d4db0 +SHA512 (kata-containers-3.8.0-vendor.tar.gz) = d44b3d6e8f2136e9858eb2c3668b2a433c44e8814dbe05c66aeaa65dea9713324e54d1acc81b9ecd1ce949126ed351263ba0701f4352308c7150a00769b1861e +SHA512 (kata-containers-3.8.0.tar.gz) = c02ca22d53611c873958f9953e4cec159533cd25b81212955e4cdef460291287715a4d3ee022f83b71a183d7ec5a254d15c893c30fad36c335dcafe6a657f9b3 From 916d13184eb789c9cf596906a1aed169b128d268 Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Mon, 23 Sep 2024 13:45:01 -0300 Subject: [PATCH 39/65] Bump to kata-containers v3.9.0 Also: Fix warnings as compilation errors patch Add time dependency compilation error patch Add arch name compilation failure patch Add binutils and rsyslog as dependencies Signed-off-by: Emanuel Lima (cherry picked from commit 98e43266367328c1bb8142beb3955985dee2b0c8) Signed-off-by: Emanuel Lima --- .gitignore | 4 +- ...emove-warnings-as-compilation-errors.patch | 3 +- ...ve-warnings-as-errors-from-genpolicy.patch | 39 + ...ix-time-dependency-compilation-error.patch | 5519 +++++++++++++++++ 1004-Fix-arch-name-compilation-failure.patch | 533 ++ kata-containers.spec | 21 +- sources | 4 +- 7 files changed, 6109 insertions(+), 14 deletions(-) create mode 100644 1002-Remove-warnings-as-errors-from-genpolicy.patch create mode 100644 1003-Fix-time-dependency-compilation-error.patch create mode 100644 1004-Fix-arch-name-compilation-failure.patch diff --git a/.gitignore b/.gitignore index e494557..74e9804 100644 --- a/.gitignore +++ b/.gitignore @@ -46,5 +46,5 @@ /kata-containers-3.6.0.tar.gz /kata-containers-3.7.0-vendor.tar.gz /kata-containers-3.7.0.tar.gz -/kata-containers-3.8.0-vendor.tar.gz -/kata-containers-3.8.0.tar.gz +/kata-containers-3.9.0-vendor.tar.gz +/kata-containers-3.9.0.tar.gz diff --git a/1001-Remove-warnings-as-compilation-errors.patch b/1001-Remove-warnings-as-compilation-errors.patch index 9560202..c2110a8 100644 --- a/1001-Remove-warnings-as-compilation-errors.patch +++ b/1001-Remove-warnings-as-compilation-errors.patch @@ -12,12 +12,11 @@ Signed-off-by: Emanuel Lima src/libs/Makefile | 1 - src/runtime-rs/Makefile | 4 +- src/tools/agent-ctl/Makefile | 4 +- - src/tools/genpolicy/Makefile | 4 +- src/tools/kata-ctl/Makefile | 6 +- src/tools/runk/Makefile | 2 +- src/tools/trace-forwarder/Makefile | 2 +- utils.mk | 1 - - 10 files changed + 9 files changed diff --git a/src/agent/Makefile b/src/agent/Makefile index e0e76a9cd..5b8b3b0d5 100644 diff --git a/1002-Remove-warnings-as-errors-from-genpolicy.patch b/1002-Remove-warnings-as-errors-from-genpolicy.patch new file mode 100644 index 0000000..cdf9977 --- /dev/null +++ b/1002-Remove-warnings-as-errors-from-genpolicy.patch @@ -0,0 +1,39 @@ +From d370d9900c13a7fc2023ddf5af794f45b97b9d0f Mon Sep 17 00:00:00 2001 +From: Emanuel Lima +Date: Mon, 23 Sep 2024 10:48:55 -0300 +Subject: [PATCH] Remove warnings as errors from genpolicy + +Signed-off-by: Emanuel Lima +--- + src/tools/genpolicy/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile +index 7410e20ed..567431257 100644 +--- a/src/tools/genpolicy/Makefile ++++ b/src/tools/genpolicy/Makefile +@@ -28,7 +28,7 @@ $(GENERATED_FILES): %: %.in + default: build + + build: $(GENERATED_FILES) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) + + static-checks-build: + @echo "INFO: static-checks-build do nothing.." +@@ -41,10 +41,10 @@ vendor: + cargo vendor + + test: $(GENERATED_FILES) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo test --all-targets --all-features --target $(TRIPLE) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo test --all-targets --all-features --target $(TRIPLE) + + install: $(GENERATED_FILES) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo install --locked --target $(TRIPLE) --path . + + check: $(GENERATED_CODE) standard_rust_check + +-- +2.43.5 + diff --git a/1003-Fix-time-dependency-compilation-error.patch b/1003-Fix-time-dependency-compilation-error.patch new file mode 100644 index 0000000..aec98f4 --- /dev/null +++ b/1003-Fix-time-dependency-compilation-error.patch @@ -0,0 +1,5519 @@ +From c00c679a2076e27805cfc3d3275bc8abdd69d674 Mon Sep 17 00:00:00 2001 +From: Emanuel Lima +Date: Wed, 18 Sep 2024 10:18:01 -0300 +Subject: [PATCH] build: Fix time dependency compilation error + +This is one of the 3 PRs that enable kata-containers to be compiled by +the latest stable Rust (v1.80.1) + +Kata is unable to be built with Rust v1.80.1 due, among other things, +to a compilation error with an indirect dependency. +This patch bumps it, that's why it's only changes on Cargo.locks. +Time is not a direct dependency, so no changes to Cargo.tomls. + +The patch was achieved through cargo update -p time for all time >= 0.3.0 for all crates under Kata. + +Fixes https://github.com/kata-containers/kata-containers/issues/10215 + +Signed-off-by: Emanuel Lima +--- + src/agent/Cargo.lock | 84 +- + src/dragonball/Cargo.lock | 84 +- + src/dragonball/src/dbs_acpi/Cargo.lock | 48 + + .../src/dbs_address_space/Cargo.lock | 187 +++ + src/dragonball/src/dbs_allocator/Cargo.lock | 65 + + src/dragonball/src/dbs_arch/Cargo.lock | 160 +++ + src/dragonball/src/dbs_boot/Cargo.lock | 201 +++ + src/dragonball/src/dbs_device/Cargo.lock | 65 + + src/dragonball/src/dbs_interrupt/Cargo.lock | 179 +++ + .../src/dbs_legacy_devices/Cargo.lock | 289 ++++ + src/dragonball/src/dbs_tdx/Cargo.lock | 149 ++ + src/dragonball/src/dbs_upcall/Cargo.lock | 1275 +++++++++++++++++ + src/libs/Cargo.lock | 129 +- + src/runtime-rs/Cargo.lock | 94 +- + src/tools/agent-ctl/Cargo.lock | 113 +- + src/tools/kata-ctl/Cargo.lock | 261 +++- + src/tools/runk/Cargo.lock | 58 +- + src/tools/trace-forwarder/Cargo.lock | 74 +- + 18 files changed, 3172 insertions(+), 343 deletions(-) + create mode 100644 src/dragonball/src/dbs_acpi/Cargo.lock + create mode 100644 src/dragonball/src/dbs_address_space/Cargo.lock + create mode 100644 src/dragonball/src/dbs_allocator/Cargo.lock + create mode 100644 src/dragonball/src/dbs_arch/Cargo.lock + create mode 100644 src/dragonball/src/dbs_boot/Cargo.lock + create mode 100644 src/dragonball/src/dbs_device/Cargo.lock + create mode 100644 src/dragonball/src/dbs_interrupt/Cargo.lock + create mode 100644 src/dragonball/src/dbs_legacy_devices/Cargo.lock + create mode 100644 src/dragonball/src/dbs_tdx/Cargo.lock + create mode 100644 src/dragonball/src/dbs_upcall/Cargo.lock + +diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock +index f55144570..c6602ca1f 100644 +--- a/src/agent/Cargo.lock ++++ b/src/agent/Cargo.lock +@@ -324,7 +324,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -386,7 +386,7 @@ checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -561,7 +561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" + dependencies = [ + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -657,7 +657,7 @@ dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + "syn_derive", + ] + +@@ -1244,7 +1244,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1315,7 +1315,7 @@ dependencies = [ + "proc-macro2", + "quote", + "strsim 0.11.1", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1348,7 +1348,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" + dependencies = [ + "darling_core 0.20.10", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1387,7 +1387,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1439,7 +1439,7 @@ dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1449,7 +1449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" + dependencies = [ + "derive_builder_core", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1502,7 +1502,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1652,7 +1652,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1917,7 +1917,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2404,7 +2404,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3990,7 +3990,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -4470,9 +4470,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.36" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -4831,7 +4831,7 @@ dependencies = [ + "regex", + "relative-path", + "rustc_version", +- "syn 2.0.71", ++ "syn 2.0.77", + "unicode-ident", + ] + +@@ -5076,7 +5076,7 @@ checksum = "d2ee4885492bb655bfa05d039cd9163eb8fe9f79ddebf00ca23a1637510c2fd2" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -5183,9 +5183,9 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.204" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] +@@ -5222,13 +5222,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" + + [[package]] + name = "serde_derive" +-version = "1.0.204" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -5250,7 +5250,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -5639,7 +5639,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rustversion", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -5684,9 +5684,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.71" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -5702,7 +5702,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -5719,7 +5719,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -5811,7 +5811,7 @@ checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -5907,7 +5907,7 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -5936,7 +5936,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -6098,7 +6098,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -6264,9 +6264,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + + [[package]] + name = "unicode-ident" +-version = "1.0.12" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] + name = "unicode-normalization" +@@ -6468,7 +6468,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + "wasm-bindgen-shared", + ] + +@@ -6502,7 +6502,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +@@ -6951,7 +6951,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + "synstructure", + ] + +@@ -7038,7 +7038,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + "synstructure", + ] + +@@ -7059,7 +7059,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +@@ -7081,7 +7081,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.77", + ] + + [[package]] +diff --git a/src/dragonball/Cargo.lock b/src/dragonball/Cargo.lock +index bb758d1f8..c9646ec67 100644 +--- a/src/dragonball/Cargo.lock ++++ b/src/dragonball/Cargo.lock +@@ -428,9 +428,12 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.8" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] + + [[package]] + name = "derivative" +@@ -931,9 +934,9 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + + [[package]] + name = "itoa" +-version = "1.0.9" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "jobserver" +@@ -981,9 +984,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.147" ++version = "0.2.158" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + + [[package]] + name = "libz-sys" +@@ -1146,6 +1149,12 @@ dependencies = [ + "memoffset", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" + version = "0.2.16" +@@ -1167,9 +1176,9 @@ dependencies = [ + + [[package]] + name = "num_threads" +-version = "0.1.6" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" + dependencies = [ + "libc", + ] +@@ -1301,7 +1310,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.32", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1379,11 +1388,17 @@ version = "0.3.27" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "proc-macro2" +-version = "1.0.66" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -1441,9 +1456,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" + + [[package]] + name = "quote" +-version = "1.0.33" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -1640,22 +1655,22 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.188" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.188" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.32", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1799,9 +1814,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.32" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -1873,7 +1888,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.32", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1897,14 +1912,16 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.28" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -1912,16 +1929,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.14" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -1974,7 +1992,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.32", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2036,7 +2054,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.32", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2068,9 +2086,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + + [[package]] + name = "unicode-ident" +-version = "1.0.11" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] + name = "unicode-normalization" +@@ -2226,7 +2244,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.32", ++ "syn 2.0.77", + "wasm-bindgen-shared", + ] + +@@ -2260,7 +2278,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.32", ++ "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +diff --git a/src/dragonball/src/dbs_acpi/Cargo.lock b/src/dragonball/src/dbs_acpi/Cargo.lock +new file mode 100644 +index 000000000..33ea45237 +--- /dev/null ++++ b/src/dragonball/src/dbs_acpi/Cargo.lock +@@ -0,0 +1,48 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "dbs-acpi" ++version = "0.1.0" ++dependencies = [ ++ "vm-memory", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.158" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++ ++[[package]] ++name = "vm-memory" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "583f213899e8a5eea23d9c507252d4bed5bc88f0ecbe0783262f80034630744b" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +diff --git a/src/dragonball/src/dbs_address_space/Cargo.lock b/src/dragonball/src/dbs_address_space/Cargo.lock +new file mode 100644 +index 000000000..73bd11dda +--- /dev/null ++++ b/src/dragonball/src/dbs_address_space/Cargo.lock +@@ -0,0 +1,187 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "arc-swap" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" ++ ++[[package]] ++name = "autocfg" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "cc" ++version = "1.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" ++dependencies = [ ++ "shlex", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "dbs-address-space" ++version = "0.3.0" ++dependencies = [ ++ "arc-swap", ++ "lazy_static", ++ "libc", ++ "nix", ++ "thiserror", ++ "vm-memory", ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" ++ ++[[package]] ++name = "libc" ++version = "0.2.158" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "nix" ++version = "0.23.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" ++dependencies = [ ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "memoffset", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++ ++[[package]] ++name = "vm-memory" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" ++dependencies = [ ++ "arc-swap", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "vmm-sys-util" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" ++dependencies = [ ++ "bitflags", ++ "libc", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +diff --git a/src/dragonball/src/dbs_allocator/Cargo.lock b/src/dragonball/src/dbs_allocator/Cargo.lock +new file mode 100644 +index 000000000..9e86c5d15 +--- /dev/null ++++ b/src/dragonball/src/dbs_allocator/Cargo.lock +@@ -0,0 +1,65 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "dbs-allocator" ++version = "0.1.1" ++dependencies = [ ++ "thiserror", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +diff --git a/src/dragonball/src/dbs_arch/Cargo.lock b/src/dragonball/src/dbs_arch/Cargo.lock +new file mode 100644 +index 000000000..7ec835786 +--- /dev/null ++++ b/src/dragonball/src/dbs_arch/Cargo.lock +@@ -0,0 +1,160 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "autocfg" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "dbs-arch" ++version = "0.2.3" ++dependencies = [ ++ "kvm-bindings", ++ "kvm-ioctls", ++ "libc", ++ "memoffset", ++ "thiserror", ++ "vm-memory", ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "kvm-bindings" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "efe70e65a5b092161d17f5005b66e5eefe7a94a70c332e755036fc4af78c4e79" ++dependencies = [ ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "kvm-ioctls" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4" ++dependencies = [ ++ "kvm-bindings", ++ "libc", ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.158" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++ ++[[package]] ++name = "vm-memory" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "vmm-sys-util" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" ++dependencies = [ ++ "bitflags", ++ "libc", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +diff --git a/src/dragonball/src/dbs_boot/Cargo.lock b/src/dragonball/src/dbs_boot/Cargo.lock +new file mode 100644 +index 000000000..93da8eef1 +--- /dev/null ++++ b/src/dragonball/src/dbs_boot/Cargo.lock +@@ -0,0 +1,201 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "autocfg" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "dbs-arch" ++version = "0.2.3" ++dependencies = [ ++ "kvm-bindings", ++ "kvm-ioctls", ++ "libc", ++ "memoffset", ++ "thiserror", ++ "vm-memory", ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "dbs-boot" ++version = "0.4.0" ++dependencies = [ ++ "dbs-arch", ++ "dbs-device", ++ "device_tree", ++ "kvm-bindings", ++ "kvm-ioctls", ++ "lazy_static", ++ "libc", ++ "thiserror", ++ "vm-fdt", ++ "vm-memory", ++] ++ ++[[package]] ++name = "dbs-device" ++version = "0.2.0" ++dependencies = [ ++ "thiserror", ++] ++ ++[[package]] ++name = "device_tree" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f18f717c5c7c2e3483feb64cccebd077245ad6d19007c2db0fd341d38595353c" ++ ++[[package]] ++name = "kvm-bindings" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "efe70e65a5b092161d17f5005b66e5eefe7a94a70c332e755036fc4af78c4e79" ++dependencies = [ ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "kvm-ioctls" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4" ++dependencies = [ ++ "kvm-bindings", ++ "libc", ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" ++ ++[[package]] ++name = "libc" ++version = "0.2.158" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++ ++[[package]] ++name = "vm-fdt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f43fb5a6bd1a7d423ad72802801036719b7546cf847a103f8fe4575f5b0d45a6" ++ ++[[package]] ++name = "vm-memory" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "vmm-sys-util" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" ++dependencies = [ ++ "bitflags", ++ "libc", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +diff --git a/src/dragonball/src/dbs_device/Cargo.lock b/src/dragonball/src/dbs_device/Cargo.lock +new file mode 100644 +index 000000000..fa768eabb +--- /dev/null ++++ b/src/dragonball/src/dbs_device/Cargo.lock +@@ -0,0 +1,65 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "dbs-device" ++version = "0.2.0" ++dependencies = [ ++ "thiserror", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +diff --git a/src/dragonball/src/dbs_interrupt/Cargo.lock b/src/dragonball/src/dbs_interrupt/Cargo.lock +new file mode 100644 +index 000000000..337b67053 +--- /dev/null ++++ b/src/dragonball/src/dbs_interrupt/Cargo.lock +@@ -0,0 +1,179 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "autocfg" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "dbs-arch" ++version = "0.2.3" ++dependencies = [ ++ "kvm-bindings", ++ "kvm-ioctls", ++ "libc", ++ "memoffset", ++ "thiserror", ++ "vm-memory", ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "dbs-device" ++version = "0.2.0" ++dependencies = [ ++ "thiserror", ++] ++ ++[[package]] ++name = "dbs-interrupt" ++version = "0.2.2" ++dependencies = [ ++ "dbs-arch", ++ "dbs-device", ++ "kvm-bindings", ++ "kvm-ioctls", ++ "libc", ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "kvm-bindings" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "efe70e65a5b092161d17f5005b66e5eefe7a94a70c332e755036fc4af78c4e79" ++dependencies = [ ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "kvm-ioctls" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4" ++dependencies = [ ++ "kvm-bindings", ++ "libc", ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.158" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++ ++[[package]] ++name = "vm-memory" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "vmm-sys-util" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" ++dependencies = [ ++ "bitflags", ++ "libc", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +diff --git a/src/dragonball/src/dbs_legacy_devices/Cargo.lock b/src/dragonball/src/dbs_legacy_devices/Cargo.lock +new file mode 100644 +index 000000000..937a762ce +--- /dev/null ++++ b/src/dragonball/src/dbs_legacy_devices/Cargo.lock +@@ -0,0 +1,289 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "anyhow" ++version = "1.0.89" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "bitflags" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" ++ ++[[package]] ++name = "dbs-device" ++version = "0.2.0" ++dependencies = [ ++ "thiserror", ++] ++ ++[[package]] ++name = "dbs-legacy-devices" ++version = "0.1.1" ++dependencies = [ ++ "dbs-device", ++ "dbs-utils", ++ "libc", ++ "log", ++ "serde", ++ "vm-superio", ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "dbs-utils" ++version = "0.2.1" ++dependencies = [ ++ "anyhow", ++ "event-manager", ++ "libc", ++ "log", ++ "serde", ++ "thiserror", ++ "timerfd", ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "errno" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" ++dependencies = [ ++ "libc", ++ "windows-sys", ++] ++ ++[[package]] ++name = "event-manager" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "377fa591135fbe23396a18e2655a6d5481bf7c5823cdfa3cc81b01a229cbe640" ++dependencies = [ ++ "libc", ++ "vmm-sys-util 0.12.1", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.158" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++ ++[[package]] ++name = "linux-raw-sys" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" ++ ++[[package]] ++name = "log" ++version = "0.4.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rustix" ++version = "0.38.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" ++dependencies = [ ++ "bitflags 2.6.0", ++ "errno", ++ "libc", ++ "linux-raw-sys", ++ "windows-sys", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.210" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.210" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "timerfd" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "84e482e368cf7efa2c8b570f476e5b9fd9fd5e9b9219fc567832b05f13511091" ++dependencies = [ ++ "rustix", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++ ++[[package]] ++name = "vm-superio" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4b5231d334edbc03b22704caa1a022e4c07491d6df736593f26094df8b04a51" ++ ++[[package]] ++name = "vmm-sys-util" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" ++dependencies = [ ++ "bitflags 1.3.2", ++ "libc", ++] ++ ++[[package]] ++name = "vmm-sys-util" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede" ++dependencies = [ ++ "bitflags 1.3.2", ++ "libc", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++dependencies = [ ++ "windows-targets", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" ++dependencies = [ ++ "windows_aarch64_gnullvm", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_gnullvm", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +diff --git a/src/dragonball/src/dbs_tdx/Cargo.lock b/src/dragonball/src/dbs_tdx/Cargo.lock +new file mode 100644 +index 000000000..8cc2e7d6d +--- /dev/null ++++ b/src/dragonball/src/dbs_tdx/Cargo.lock +@@ -0,0 +1,149 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "dbs-tdx" ++version = "0.1.0" ++dependencies = [ ++ "kvm-bindings", ++ "serde_json", ++ "thiserror", ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "itoa" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" ++ ++[[package]] ++name = "kvm-bindings" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "efe70e65a5b092161d17f5005b66e5eefe7a94a70c332e755036fc4af78c4e79" ++dependencies = [ ++ "vmm-sys-util", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.158" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++ ++[[package]] ++name = "memchr" ++version = "2.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" ++ ++[[package]] ++name = "serde" ++version = "1.0.210" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.210" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.128" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" ++dependencies = [ ++ "itoa", ++ "memchr", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++ ++[[package]] ++name = "vmm-sys-util" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" ++dependencies = [ ++ "bitflags", ++ "libc", ++] +diff --git a/src/dragonball/src/dbs_upcall/Cargo.lock b/src/dragonball/src/dbs_upcall/Cargo.lock +new file mode 100644 +index 000000000..13349e9c6 +--- /dev/null ++++ b/src/dragonball/src/dbs_upcall/Cargo.lock +@@ -0,0 +1,1275 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "addr2line" ++version = "0.24.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler2" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" ++ ++[[package]] ++name = "anyhow" ++version = "1.0.89" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" ++ ++[[package]] ++name = "arc-swap" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" ++ ++[[package]] ++name = "arrayref" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" ++ ++[[package]] ++name = "arrayvec" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" ++ ++[[package]] ++name = "autocfg" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.74" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" ++dependencies = [ ++ "addr2line", ++ "cfg-if", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++ "windows-targets 0.52.6", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "bitflags" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" ++ ++[[package]] ++name = "blake3" ++version = "1.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" ++dependencies = [ ++ "arrayref", ++ "arrayvec", ++ "cc", ++ "cfg-if", ++ "constant_time_eq", ++] ++ ++[[package]] ++name = "block-buffer" ++version = "0.10.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" ++ ++[[package]] ++name = "caps" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" ++dependencies = [ ++ "libc", ++ "thiserror", ++] ++ ++[[package]] ++name = "cc" ++version = "1.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" ++dependencies = [ ++ "jobserver", ++ "libc", ++ "shlex", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "cmake" ++version = "0.1.51" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" ++ ++[[package]] ++name = "cpufeatures" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "crc32fast" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "crypto-common" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" ++dependencies = [ ++ "generic-array", ++ "typenum", ++] ++ ++[[package]] ++name = "dbs-address-space" ++version = "0.3.0" ++dependencies = [ ++ "arc-swap", ++ "lazy_static", ++ "libc", ++ "nix 0.23.2", ++ "thiserror", ++ "vm-memory", ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "dbs-arch" ++version = "0.2.3" ++dependencies = [ ++ "kvm-bindings", ++ "kvm-ioctls", ++ "libc", ++ "memoffset", ++ "thiserror", ++ "vm-memory", ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "dbs-boot" ++version = "0.4.0" ++dependencies = [ ++ "dbs-arch", ++ "kvm-bindings", ++ "kvm-ioctls", ++ "lazy_static", ++ "libc", ++ "thiserror", ++ "vm-fdt", ++ "vm-memory", ++] ++ ++[[package]] ++name = "dbs-device" ++version = "0.2.0" ++dependencies = [ ++ "thiserror", ++] ++ ++[[package]] ++name = "dbs-interrupt" ++version = "0.2.2" ++dependencies = [ ++ "dbs-arch", ++ "dbs-device", ++ "kvm-bindings", ++ "kvm-ioctls", ++ "libc", ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "dbs-upcall" ++version = "0.3.0" ++dependencies = [ ++ "anyhow", ++ "dbs-utils", ++ "dbs-virtio-devices", ++ "log", ++ "thiserror", ++ "timerfd", ++] ++ ++[[package]] ++name = "dbs-utils" ++version = "0.2.1" ++dependencies = [ ++ "anyhow", ++ "event-manager", ++ "libc", ++ "log", ++ "serde", ++ "thiserror", ++ "timerfd", ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "dbs-virtio-devices" ++version = "0.3.1" ++dependencies = [ ++ "byteorder", ++ "caps", ++ "dbs-address-space", ++ "dbs-boot", ++ "dbs-device", ++ "dbs-interrupt", ++ "dbs-utils", ++ "epoll", ++ "io-uring", ++ "kvm-bindings", ++ "kvm-ioctls", ++ "libc", ++ "log", ++ "nix 0.24.3", ++ "nydus-api", ++ "nydus-rafs", ++ "nydus-storage", ++ "rlimit", ++ "sendfd", ++ "serde", ++ "serde_json", ++ "thiserror", ++ "threadpool", ++ "timerfd", ++ "virtio-bindings", ++ "virtio-queue", ++ "vm-memory", ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "digest" ++version = "0.10.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" ++dependencies = [ ++ "block-buffer", ++ "crypto-common", ++] ++ ++[[package]] ++name = "epoll" ++version = "4.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20df693c700404f7e19d4d6fae6b15215d2913c27955d2b9d6f2c0f537511cd0" ++dependencies = [ ++ "bitflags 1.3.2", ++ "libc", ++] ++ ++[[package]] ++name = "errno" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" ++dependencies = [ ++ "libc", ++ "windows-sys 0.52.0", ++] ++ ++[[package]] ++name = "event-manager" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "377fa591135fbe23396a18e2655a6d5481bf7c5823cdfa3cc81b01a229cbe640" ++dependencies = [ ++ "libc", ++ "vmm-sys-util 0.12.1", ++] ++ ++[[package]] ++name = "filetime" ++version = "0.2.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "libredox", ++ "windows-sys 0.59.0", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" ++dependencies = [ ++ "crc32fast", ++ "libz-sys", ++ "miniz_oxide", ++] ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "fuse-backend-rs" ++version = "0.10.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f85357722be4bf3d0b7548bedf7499686c77628c2c61cb99c6519463f7a9e5f0" ++dependencies = [ ++ "arc-swap", ++ "bitflags 1.3.2", ++ "caps", ++ "core-foundation-sys", ++ "lazy_static", ++ "libc", ++ "log", ++ "mio", ++ "nix 0.24.3", ++ "vm-memory", ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "generic-array" ++version = "0.14.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" ++dependencies = [ ++ "typenum", ++ "version_check", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.31.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" ++ ++[[package]] ++name = "hex" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++ ++[[package]] ++name = "httpdate" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" ++ ++[[package]] ++name = "io-uring" ++version = "0.5.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd1e1a01cfb924fd8c5c43b6827965db394f5a3a16c599ce03452266e1cf984c" ++dependencies = [ ++ "bitflags 1.3.2", ++ "libc", ++] ++ ++[[package]] ++name = "itoa" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" ++ ++[[package]] ++name = "jobserver" ++version = "0.1.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "kvm-bindings" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "efe70e65a5b092161d17f5005b66e5eefe7a94a70c332e755036fc4af78c4e79" ++dependencies = [ ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "kvm-ioctls" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4" ++dependencies = [ ++ "kvm-bindings", ++ "libc", ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" ++ ++[[package]] ++name = "libc" ++version = "0.2.158" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++ ++[[package]] ++name = "libredox" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" ++dependencies = [ ++ "bitflags 2.6.0", ++ "libc", ++ "redox_syscall", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.1.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" ++dependencies = [ ++ "cc", ++ "cmake", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "linux-raw-sys" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" ++ ++[[package]] ++name = "log" ++version = "0.4.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" ++ ++[[package]] ++name = "lz4" ++version = "1.27.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a231296ca742e418c43660cb68e082486ff2538e8db432bc818580f3965025ed" ++dependencies = [ ++ "lz4-sys", ++] ++ ++[[package]] ++name = "lz4-sys" ++version = "1.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d" ++dependencies = [ ++ "cc", ++ "libc", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" ++ ++[[package]] ++name = "memoffset" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" ++dependencies = [ ++ "adler2", ++] ++ ++[[package]] ++name = "mio" ++version = "0.8.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" ++dependencies = [ ++ "libc", ++ "log", ++ "wasi", ++ "windows-sys 0.48.0", ++] ++ ++[[package]] ++name = "nix" ++version = "0.23.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" ++dependencies = [ ++ "bitflags 1.3.2", ++ "cc", ++ "cfg-if", ++ "libc", ++ "memoffset", ++] ++ ++[[package]] ++name = "nix" ++version = "0.24.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" ++dependencies = [ ++ "bitflags 1.3.2", ++ "cfg-if", ++ "libc", ++ "memoffset", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "nydus-api" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c64c62d8a36c10b654b87246a39861b2c05f68e96ab3b2f002f5a54f406d5e0e" ++dependencies = [ ++ "libc", ++ "log", ++ "serde", ++ "serde_json", ++ "toml", ++] ++ ++[[package]] ++name = "nydus-rafs" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "adde865ef71c91c5f139c4c05ca5aedb6fbd53f530d646b13409ac5220b85467" ++dependencies = [ ++ "anyhow", ++ "arc-swap", ++ "bitflags 1.3.2", ++ "fuse-backend-rs", ++ "lazy_static", ++ "libc", ++ "log", ++ "nix 0.24.3", ++ "nydus-api", ++ "nydus-storage", ++ "nydus-utils", ++ "serde", ++ "serde_json", ++ "vm-memory", ++] ++ ++[[package]] ++name = "nydus-storage" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4023f15303dbbda47797d07e9acd2045862ce82c7e28cd66f70b09bda5584cbb" ++dependencies = [ ++ "arc-swap", ++ "bitflags 1.3.2", ++ "fuse-backend-rs", ++ "hex", ++ "lazy_static", ++ "libc", ++ "log", ++ "nix 0.24.3", ++ "nydus-api", ++ "nydus-utils", ++ "serde", ++ "serde_json", ++ "tar", ++ "tokio", ++ "vm-memory", ++] ++ ++[[package]] ++name = "nydus-utils" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1f7bcde0f3906cf49101f2d40e485b0155eee97e3358eefd4783448c4f69c96" ++dependencies = [ ++ "blake3", ++ "flate2", ++ "httpdate", ++ "lazy_static", ++ "libc", ++ "libz-sys", ++ "log", ++ "lz4", ++ "lz4-sys", ++ "nix 0.24.3", ++ "nydus-api", ++ "openssl", ++ "serde", ++ "serde_json", ++ "sha2", ++ "tokio", ++ "zstd", ++] ++ ++[[package]] ++name = "object" ++version = "0.36.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.19.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" ++ ++[[package]] ++name = "openssl" ++version = "0.10.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" ++dependencies = [ ++ "bitflags 2.6.0", ++ "cfg-if", ++ "foreign-types", ++ "libc", ++ "once_cell", ++ "openssl-macros", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-macros" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "openssl-src" ++version = "300.3.2+3.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.103" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" ++dependencies = [ ++ "cc", ++ "libc", ++ "openssl-src", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.86" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" ++dependencies = [ ++ "bitflags 2.6.0", ++] ++ ++[[package]] ++name = "rlimit" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "347703a5ae47adf1e693144157be231dde38c72bd485925cae7407ad3e52480b" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" ++ ++[[package]] ++name = "rustix" ++version = "0.38.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" ++dependencies = [ ++ "bitflags 2.6.0", ++ "errno", ++ "libc", ++ "linux-raw-sys", ++ "windows-sys 0.52.0", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" ++ ++[[package]] ++name = "sendfd" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.210" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.210" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.128" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" ++dependencies = [ ++ "itoa", ++ "memchr", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "sha2" ++version = "0.10.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" ++dependencies = [ ++ "cfg-if", ++ "cpufeatures", ++ "digest", ++] ++ ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "tar" ++version = "0.4.41" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" ++dependencies = [ ++ "filetime", ++ "libc", ++ "xattr", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.63" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "threadpool" ++version = "1.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" ++dependencies = [ ++ "num_cpus", ++] ++ ++[[package]] ++name = "timerfd" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "84e482e368cf7efa2c8b570f476e5b9fd9fd5e9b9219fc567832b05f13511091" ++dependencies = [ ++ "rustix", ++] ++ ++[[package]] ++name = "tokio" ++version = "1.40.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" ++dependencies = [ ++ "backtrace", ++ "pin-project-lite", ++ "tokio-macros", ++] ++ ++[[package]] ++name = "tokio-macros" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" ++ ++[[package]] ++name = "version_check" ++version = "0.9.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" ++ ++[[package]] ++name = "virtio-bindings" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b" ++ ++[[package]] ++name = "virtio-queue" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ba81e2bcc21c0d2fc5e6683e79367e26ad219197423a498df801d79d5ba77bd" ++dependencies = [ ++ "log", ++ "virtio-bindings", ++ "vm-memory", ++ "vmm-sys-util 0.11.2", ++] ++ ++[[package]] ++name = "vm-fdt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f43fb5a6bd1a7d423ad72802801036719b7546cf847a103f8fe4575f5b0d45a6" ++ ++[[package]] ++name = "vm-memory" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" ++dependencies = [ ++ "arc-swap", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "vmm-sys-util" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" ++dependencies = [ ++ "bitflags 1.3.2", ++ "libc", ++] ++ ++[[package]] ++name = "vmm-sys-util" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede" ++dependencies = [ ++ "bitflags 1.3.2", ++ "libc", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "windows-sys" ++version = "0.48.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" ++dependencies = [ ++ "windows-targets 0.48.5", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++dependencies = [ ++ "windows-targets 0.52.6", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.59.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" ++dependencies = [ ++ "windows-targets 0.52.6", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.48.5", ++ "windows_aarch64_msvc 0.48.5", ++ "windows_i686_gnu 0.48.5", ++ "windows_i686_msvc 0.48.5", ++ "windows_x86_64_gnu 0.48.5", ++ "windows_x86_64_gnullvm 0.48.5", ++ "windows_x86_64_msvc 0.48.5", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.6", ++ "windows_aarch64_msvc 0.52.6", ++ "windows_i686_gnu 0.52.6", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc 0.52.6", ++ "windows_x86_64_gnu 0.52.6", ++ "windows_x86_64_gnullvm 0.52.6", ++ "windows_x86_64_msvc 0.52.6", ++] ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.48.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" ++ ++[[package]] ++name = "xattr" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" ++dependencies = [ ++ "libc", ++ "linux-raw-sys", ++ "rustix", ++] ++ ++[[package]] ++name = "zstd" ++version = "0.11.2+zstd.1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" ++dependencies = [ ++ "zstd-safe", ++] ++ ++[[package]] ++name = "zstd-safe" ++version = "5.0.2+zstd.1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" ++dependencies = [ ++ "libc", ++ "zstd-sys", ++] ++ ++[[package]] ++name = "zstd-sys" ++version = "2.0.13+zstd.1.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" ++dependencies = [ ++ "cc", ++ "pkg-config", ++] +diff --git a/src/libs/Cargo.lock b/src/libs/Cargo.lock +index 8bf4e8e04..8a1803c06 100644 +--- a/src/libs/Cargo.lock ++++ b/src/libs/Cargo.lock +@@ -63,7 +63,7 @@ checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -117,7 +117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fd9e32d7420c85055e8107e5b2463c4eeefeaac18b52359fe9f9c08a18f342b2" + dependencies = [ + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -152,7 +152,7 @@ dependencies = [ + "borsh-schema-derive-internal", + "proc-macro-crate", + "proc-macro2", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -163,7 +163,7 @@ checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -174,7 +174,7 @@ checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -213,7 +213,7 @@ checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -374,7 +374,7 @@ dependencies = [ + "ident_case", + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -399,7 +399,7 @@ checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" + dependencies = [ + "darling_core 0.14.4", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -413,6 +413,15 @@ dependencies = [ + "syn 2.0.66", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "derive-new" + version = "0.5.9" +@@ -421,7 +430,7 @@ checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -576,7 +585,7 @@ checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -629,7 +638,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -795,9 +804,9 @@ dependencies = [ + + [[package]] + name = "itoa" +-version = "1.0.1" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "js-sys" +@@ -875,9 +884,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.155" ++version = "0.2.158" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + + [[package]] + name = "lock_api" +@@ -1009,6 +1018,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.44" +@@ -1040,9 +1055,9 @@ dependencies = [ + + [[package]] + name = "num_threads" +-version = "0.1.6" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" + dependencies = [ + "libc", + ] +@@ -1131,7 +1146,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1146,6 +1161,12 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.16" +@@ -1170,7 +1191,7 @@ dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + "version_check", + ] + +@@ -1187,9 +1208,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.85" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -1232,7 +1253,7 @@ dependencies = [ + "itertools", + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1342,14 +1363,14 @@ checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] + name = "quote" +-version = "1.0.36" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -1502,7 +1523,7 @@ checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1571,9 +1592,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + + [[package]] + name = "serde" +-version = "1.0.147" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] +@@ -1586,7 +1607,7 @@ checksum = "6eb8ec7724e4e524b2492b510e66957fe1a2c76c26a6975ec80823f2439da685" + dependencies = [ + "darling_core 0.14.4", + "serde-rename-rule", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1599,7 +1620,7 @@ dependencies = [ + "proc-macro2", + "quote", + "serde-attributes", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1610,13 +1631,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" + + [[package]] + name = "serde_derive" +-version = "1.0.147" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 2.0.66", + ] + + [[package]] +@@ -1649,7 +1670,7 @@ checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1730,7 +1751,7 @@ dependencies = [ + "slog", + "term", + "thread_local", +- "time 0.3.22", ++ "time 0.3.36", + ] + + [[package]] +@@ -1796,13 +1817,13 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "1.0.91" ++version = "1.0.109" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" ++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" + dependencies = [ + "proc-macro2", + "quote", +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] +@@ -1892,7 +1913,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1916,13 +1937,16 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.22" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -1930,16 +1954,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.9" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -2090,9 +2115,9 @@ dependencies = [ + + [[package]] + name = "unicode-ident" +-version = "1.0.12" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] + name = "unicode-segmentation" +@@ -2100,12 +2125,6 @@ version = "1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +-[[package]] +-name = "unicode-xid" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +- + [[package]] + name = "utf8-width" + version = "0.1.7" +@@ -2177,7 +2196,7 @@ dependencies = [ + "log", + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + "wasm-bindgen-shared", + ] + +@@ -2199,7 +2218,7 @@ checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.91", ++ "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +diff --git a/src/runtime-rs/Cargo.lock b/src/runtime-rs/Cargo.lock +index 45e80c388..2a3408e93 100644 +--- a/src/runtime-rs/Cargo.lock ++++ b/src/runtime-rs/Cargo.lock +@@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" + dependencies = [ + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -238,7 +238,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -316,7 +316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "78d456f91b4c1fdebf2698214e599fec3d7f8b46e3140fb254a9ea88c970ab0a" + dependencies = [ + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -571,7 +571,7 @@ dependencies = [ + "signal-hook", + "signal-hook-tokio", + "thiserror", +- "time 0.3.31", ++ "time 0.3.36", + "tokio", + "windows-sys 0.48.0", + ] +@@ -749,7 +749,7 @@ dependencies = [ + "proc-macro2", + "quote", + "strsim", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -771,7 +771,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" + dependencies = [ + "darling_core 0.20.10", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -998,7 +998,7 @@ dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1008,7 +1008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" + dependencies = [ + "derive_builder_core", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1359,7 +1359,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1811,9 +1811,9 @@ dependencies = [ + + [[package]] + name = "itoa" +-version = "1.0.9" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "jobserver" +@@ -1922,9 +1922,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.158" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + + [[package]] + name = "libz-sys" +@@ -2275,6 +2275,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" + version = "0.2.16" +@@ -2296,9 +2302,9 @@ dependencies = [ + + [[package]] + name = "num_threads" +-version = "0.1.6" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" + dependencies = [ + "libc", + ] +@@ -2453,7 +2459,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2735,7 +2741,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2820,9 +2826,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.75" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -3062,9 +3068,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.35" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -3576,9 +3582,9 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.194" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] +@@ -3615,13 +3621,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" + + [[package]] + name = "serde_derive" +-version = "1.0.194" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3691,7 +3697,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3884,7 +3890,7 @@ dependencies = [ + "serde", + "serde_json", + "slog", +- "time 0.3.31", ++ "time 0.3.36", + ] + + [[package]] +@@ -3919,7 +3925,7 @@ dependencies = [ + "slog", + "term", + "thread_local", +- "time 0.3.31", ++ "time 0.3.36", + ] + + [[package]] +@@ -3998,7 +4004,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rustversion", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -4030,9 +4036,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.48" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -4138,7 +4144,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -4186,13 +4192,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.31" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", + "powerfmt", + "serde", +@@ -4208,10 +4215,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.16" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -4266,7 +4274,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -4361,7 +4369,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + ] + + [[package]] +@@ -4481,9 +4489,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + + [[package]] + name = "unicode-ident" +-version = "1.0.11" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] + name = "unicode-normalization" +@@ -4755,7 +4763,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + "wasm-bindgen-shared", + ] + +@@ -4789,7 +4797,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +diff --git a/src/tools/agent-ctl/Cargo.lock b/src/tools/agent-ctl/Cargo.lock +index 7ecbd1ac0..8de5438fb 100644 +--- a/src/tools/agent-ctl/Cargo.lock ++++ b/src/tools/agent-ctl/Cargo.lock +@@ -181,7 +181,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -198,7 +198,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -329,7 +329,7 @@ dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + "syn_derive", + ] + +@@ -631,7 +631,7 @@ dependencies = [ + "proc-macro2", + "quote", + "strsim 0.11.1", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -653,7 +653,16 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" + dependencies = [ + "darling_core 0.20.9", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", ++] ++ ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", + ] + + [[package]] +@@ -696,7 +705,7 @@ dependencies = [ + "darling 0.20.9", + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -706,7 +715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" + dependencies = [ + "derive_builder_core", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -764,7 +773,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -903,7 +912,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1142,9 +1151,9 @@ dependencies = [ + + [[package]] + name = "itoa" +-version = "1.0.6" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "js-sys" +@@ -1240,9 +1249,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.155" ++version = "0.2.158" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + + [[package]] + name = "linux-raw-sys" +@@ -1379,6 +1388,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" + version = "0.2.15" +@@ -1400,9 +1415,9 @@ dependencies = [ + + [[package]] + name = "num_threads" +-version = "0.1.6" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" + dependencies = [ + "libc", + ] +@@ -1512,6 +1527,12 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -1554,9 +1575,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.85" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -1713,9 +1734,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.36" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -2007,9 +2028,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + + [[package]] + name = "serde" +-version = "1.0.163" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] +@@ -2046,13 +2067,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" + + [[package]] + name = "serde_derive" +-version = "1.0.163" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2074,7 +2095,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2155,7 +2176,7 @@ dependencies = [ + "serde", + "serde_json", + "slog", +- "time 0.3.21", ++ "time 0.3.36", + ] + + [[package]] +@@ -2179,7 +2200,7 @@ dependencies = [ + "slog", + "term", + "thread_local", +- "time 0.3.21", ++ "time 0.3.36", + ] + + [[package]] +@@ -2236,7 +2257,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rustversion", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2262,9 +2283,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.18" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -2280,7 +2301,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2360,7 +2381,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2386,13 +2407,16 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.21" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -2400,16 +2424,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.9" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -2453,7 +2478,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2515,7 +2540,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2589,9 +2614,9 @@ dependencies = [ + + [[package]] + name = "unicode-ident" +-version = "1.0.9" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] + name = "unicode-segmentation" +@@ -2678,7 +2703,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + "wasm-bindgen-shared", + ] + +@@ -2700,7 +2725,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.18", ++ "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +diff --git a/src/tools/kata-ctl/Cargo.lock b/src/tools/kata-ctl/Cargo.lock +index 2746bf64e..2b767bb25 100644 +--- a/src/tools/kata-ctl/Cargo.lock ++++ b/src/tools/kata-ctl/Cargo.lock +@@ -27,7 +27,7 @@ dependencies = [ + "log", + "logging", + "nix 0.24.3", +- "oci", ++ "oci-spec", + "protobuf 3.3.0", + "protocols", + "serde", +@@ -149,7 +149,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -218,7 +218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" + dependencies = [ + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -253,7 +253,7 @@ dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + "syn_derive", + ] + +@@ -376,7 +376,7 @@ dependencies = [ + "anstream", + "anstyle", + "clap_lex", +- "strsim", ++ "strsim 0.10.0", + ] + + [[package]] +@@ -388,7 +388,7 @@ dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -523,12 +523,12 @@ dependencies = [ + + [[package]] + name = "darling" +-version = "0.20.3" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" ++checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" + dependencies = [ +- "darling_core 0.20.3", +- "darling_macro 0.20.3", ++ "darling_core 0.20.10", ++ "darling_macro 0.20.10", + ] + + [[package]] +@@ -546,16 +546,16 @@ dependencies = [ + + [[package]] + name = "darling_core" +-version = "0.20.3" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" ++checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" + dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", +- "strsim", +- "syn 2.0.39", ++ "strsim 0.11.1", ++ "syn 2.0.77", + ] + + [[package]] +@@ -571,20 +571,20 @@ dependencies = [ + + [[package]] + name = "darling_macro" +-version = "0.20.3" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" ++checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" + dependencies = [ +- "darling_core 0.20.3", ++ "darling_core 0.20.10", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] + name = "deranged" +-version = "0.3.9" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" + dependencies = [ + "powerfmt", + "serde", +@@ -601,6 +601,37 @@ dependencies = [ + "syn 1.0.109", + ] + ++[[package]] ++name = "derive_builder" ++version = "0.20.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" ++dependencies = [ ++ "derive_builder_macro", ++] ++ ++[[package]] ++name = "derive_builder_core" ++version = "0.20.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" ++dependencies = [ ++ "darling 0.20.10", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.77", ++] ++ ++[[package]] ++name = "derive_builder_macro" ++version = "0.20.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" ++dependencies = [ ++ "derive_builder_core", ++ "syn 2.0.77", ++] ++ + [[package]] + name = "dirs-next" + version = "2.0.0" +@@ -788,7 +819,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -832,6 +863,18 @@ dependencies = [ + "wasi", + ] + ++[[package]] ++name = "getset" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c" ++dependencies = [ ++ "proc-macro-error2", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.77", ++] ++ + [[package]] + name = "gimli" + version = "0.28.1" +@@ -893,6 +936,12 @@ version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + ++[[package]] ++name = "heck" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" ++ + [[package]] + name = "hermit-abi" + version = "0.1.19" +@@ -1118,9 +1167,9 @@ dependencies = [ + + [[package]] + name = "itoa" +-version = "1.0.9" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "js-sys" +@@ -1167,8 +1216,8 @@ dependencies = [ + "shim-interface", + "slog", + "slog-scope", +- "strum", +- "strum_macros", ++ "strum 0.24.1", ++ "strum_macros 0.24.3", + "sys-info", + "tempfile", + "test-utils", +@@ -1195,9 +1244,10 @@ dependencies = [ + "lazy_static", + "libc", + "nix 0.24.3", +- "oci", ++ "oci-spec", + "once_cell", + "rand", ++ "runtime-spec", + "safe-path", + "serde", + "serde_json", +@@ -1218,7 +1268,7 @@ dependencies = [ + "glob", + "lazy_static", + "num_cpus", +- "oci", ++ "oci-spec", + "regex", + "safe-path", + "serde", +@@ -1239,9 +1289,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.155" ++version = "0.2.158" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + + [[package]] + name = "libredox" +@@ -1440,6 +1490,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" + version = "0.2.17" +@@ -1461,9 +1517,9 @@ dependencies = [ + + [[package]] + name = "num_threads" +-version = "0.1.6" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" + dependencies = [ + "libc", + ] +@@ -1478,20 +1534,27 @@ dependencies = [ + ] + + [[package]] +-name = "oci" +-version = "0.1.0" ++name = "oci-spec" ++version = "0.6.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f5a3fe998d50101ae009351fec56d88a69f4ed182e11000e711068c2f5abf72" + dependencies = [ +- "libc", ++ "derive_builder", ++ "getset", ++ "once_cell", ++ "regex", + "serde", +- "serde_derive", + "serde_json", ++ "strum 0.26.3", ++ "strum_macros 0.26.4", ++ "thiserror", + ] + + [[package]] + name = "once_cell" +-version = "1.18.0" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "openssl" +@@ -1516,7 +1579,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1618,7 +1681,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1693,11 +1756,33 @@ dependencies = [ + "version_check", + ] + ++[[package]] ++name = "proc-macro-error-attr2" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++] ++ ++[[package]] ++name = "proc-macro-error2" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" ++dependencies = [ ++ "proc-macro-error-attr2", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.77", ++] ++ + [[package]] + name = "proc-macro2" +-version = "1.0.70" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -1879,7 +1964,8 @@ name = "protocols" + version = "0.1.0" + dependencies = [ + "async-trait", +- "oci", ++ "kata-sys-util", ++ "oci-spec", + "protobuf 3.3.0", + "ttrpc 0.8.1", + "ttrpc-codegen", +@@ -1917,9 +2003,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.33" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -2011,9 +2097,9 @@ dependencies = [ + + [[package]] + name = "regex" +-version = "1.10.2" ++version = "1.10.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" ++checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" + dependencies = [ + "aho-corasick", + "memchr", +@@ -2023,9 +2109,9 @@ dependencies = [ + + [[package]] + name = "regex-automata" +-version = "0.4.3" ++version = "0.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" ++checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" + dependencies = [ + "aho-corasick", + "memchr", +@@ -2145,6 +2231,16 @@ dependencies = [ + "serde_derive", + ] + ++[[package]] ++name = "runtime-spec" ++version = "0.1.0" ++dependencies = [ ++ "libc", ++ "serde", ++ "serde_derive", ++ "serde_json", ++] ++ + [[package]] + name = "rust_decimal" + version = "1.35.0" +@@ -2306,9 +2402,9 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + + [[package]] + name = "serde" +-version = "1.0.193" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] +@@ -2345,13 +2441,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" + + [[package]] + name = "serde_derive" +-version = "1.0.193" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2399,10 +2495,10 @@ version = "2.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" + dependencies = [ +- "darling 0.20.3", ++ "darling 0.20.10", + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2569,12 +2665,24 @@ version = "0.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + ++[[package]] ++name = "strsim" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" ++ + [[package]] + name = "strum" + version = "0.24.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" + ++[[package]] ++name = "strum" ++version = "0.26.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" ++ + [[package]] + name = "strum_macros" + version = "0.24.3" +@@ -2588,6 +2696,19 @@ dependencies = [ + "syn 1.0.109", + ] + ++[[package]] ++name = "strum_macros" ++version = "0.26.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" ++dependencies = [ ++ "heck 0.5.0", ++ "proc-macro2", ++ "quote", ++ "rustversion", ++ "syn 2.0.77", ++] ++ + [[package]] + name = "subprocess" + version = "0.2.9" +@@ -2611,9 +2732,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.39" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -2629,7 +2750,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2738,7 +2859,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2753,13 +2874,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.30" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", + "powerfmt", + "serde", +@@ -2775,10 +2897,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.15" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -2823,7 +2946,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2924,7 +3047,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3013,9 +3136,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + + [[package]] + name = "unicode-ident" +-version = "1.0.12" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] + name = "unicode-normalization" +@@ -3141,7 +3264,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + "wasm-bindgen-shared", + ] + +@@ -3175,7 +3298,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.39", ++ "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +diff --git a/src/tools/runk/Cargo.lock b/src/tools/runk/Cargo.lock +index e1afc6f91..94492e0be 100644 +--- a/src/tools/runk/Cargo.lock ++++ b/src/tools/runk/Cargo.lock +@@ -201,7 +201,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -236,7 +236,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -314,7 +314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" + dependencies = [ + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -371,7 +371,7 @@ dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + "syn_derive", + ] + +@@ -721,7 +721,7 @@ dependencies = [ + "proc-macro2", + "quote", + "strsim 0.11.1", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -754,7 +754,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" + dependencies = [ + "darling_core 0.20.9", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -827,7 +827,7 @@ dependencies = [ + "darling 0.20.9", + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -847,7 +847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" + dependencies = [ + "derive_builder_core 0.20.0", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -905,7 +905,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1100,7 +1100,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2097,9 +2097,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.36" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -2435,9 +2435,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + + [[package]] + name = "serde" +-version = "1.0.203" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] +@@ -2474,13 +2474,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" + + [[package]] + name = "serde_derive" +-version = "1.0.203" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2502,7 +2502,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2660,7 +2660,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rustversion", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2686,9 +2686,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.68" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -2704,7 +2704,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2805,7 +2805,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2891,7 +2891,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2963,7 +2963,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3038,9 +3038,9 @@ dependencies = [ + + [[package]] + name = "unicode-ident" +-version = "1.0.12" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] + name = "unicode-segmentation" +@@ -3125,7 +3125,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + "wasm-bindgen-shared", + ] + +@@ -3147,7 +3147,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.68", ++ "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +diff --git a/src/tools/trace-forwarder/Cargo.lock b/src/tools/trace-forwarder/Cargo.lock +index 6e2791328..6aa19b3f6 100644 +--- a/src/tools/trace-forwarder/Cargo.lock ++++ b/src/tools/trace-forwarder/Cargo.lock +@@ -141,9 +141,12 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.8" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] + + [[package]] + name = "dirs-next" +@@ -288,9 +291,9 @@ checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" + + [[package]] + name = "itoa" +-version = "1.0.1" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "js-sys" +@@ -334,9 +337,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.112" ++version = "0.2.158" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" ++checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + + [[package]] + name = "log" +@@ -389,6 +392,12 @@ dependencies = [ + "memoffset", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.44" +@@ -420,9 +429,9 @@ dependencies = [ + + [[package]] + name = "num_threads" +-version = "0.1.6" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" + dependencies = [ + "libc", + ] +@@ -528,6 +537,12 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.15" +@@ -558,18 +573,18 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" + + [[package]] + name = "proc-macro2" +-version = "1.0.67" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] + + [[package]] + name = "quote" +-version = "1.0.33" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -657,22 +672,22 @@ checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + + [[package]] + name = "serde" +-version = "1.0.188" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.188" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.33", ++ "syn 2.0.77", + ] + + [[package]] +@@ -752,7 +767,7 @@ dependencies = [ + "slog", + "term", + "thread_local", +- "time 0.3.28", ++ "time 0.3.36", + ] + + [[package]] +@@ -780,9 +795,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.33" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -892,14 +907,16 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.28" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -907,16 +924,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.14" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -992,9 +1010,9 @@ dependencies = [ + + [[package]] + name = "unicode-ident" +-version = "1.0.12" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] + name = "unicode-width" +-- +2.43.5 + diff --git a/1004-Fix-arch-name-compilation-failure.patch b/1004-Fix-arch-name-compilation-failure.patch new file mode 100644 index 0000000..b59da11 --- /dev/null +++ b/1004-Fix-arch-name-compilation-failure.patch @@ -0,0 +1,533 @@ +From 0f83ea2f61e31a4e181f5d6141ef9a8594a03df5 Mon Sep 17 00:00:00 2001 +From: Emanuel Lima +Date: Mon, 16 Sep 2024 10:40:00 -0300 +Subject: [PATCH] build: Fix compilation failure with Rust v1.80 + +Starting with version 1.80, the Rust linter does not accept an invalid +value for `target_arch` in configuration checks: + +``` + Compiling kata-sys-util v0.1.0 (/home/ddd/Work/kata/kata-containers/src/libs/kata-sys-util) +error: unexpected `cfg` condition value: `powerpc64le` + + --> /home/ddd/Work/kata/kata-containers/src/libs/kata-sys-util/src/protection.rs:17:34 + | +17 | #[cfg(any(target_arch = "s390x", target_arch = "powerpc64le"))] + | ^^^^^^^^^^^^^^------------- + | | + | help: there is a expected value with a similar name: `"powerpc64"` + | + = note: expected values for `target_arch` are: `aarch64`, `arm`, `arm64ec`, `avr`, `bpf`, `csky`, `hexagon`, `loongarch64`, `m68k`, `mips`, `mips32r6`, `mips64`, `mips64r6`, `msp430`, `nvptx64`, `powerpc`, `powerpc64`, `riscv32`, `riscv64`, `s390x`, `sparc`, `sparc64`, `wasm32`, `wasm64`, `x86`, and `x86_64` + = note: see for more information about checking conditional configuration + = note: `-D unexpected-cfgs` implied by `-D warnings` + = help: to override `-D warnings` add `#[allow(unexpected_cfgs)]` +``` + +According [to GitHub user @Urgau][explain], this is a new warning +introduced in Rust 1.80, but the problem exists before. The correct +architecture name should be `powerpc64`, and the differentiation +between `powerpc64le` and `powerpc64` should use the `target_endian = +"little"` check. + +[explain]: #10072 (comment) + +Fixes: #10067 + +Signed-off-by: Christophe de Dinechin +[emlima: fix some more occurences and typos] +Signed-off-by: Emanuel Lima +--- + docs/Developer-Guide.md | 8 ++++---- + src/agent/Makefile | 2 +- + src/libs/kata-sys-util/src/protection.rs | 4 ++-- + src/runtime-rs/Makefile | 4 ++-- + src/tools/agent-ctl/Makefile | 2 +- + src/tools/genpolicy/Makefile | 2 +- + src/tools/kata-ctl/Cross.toml | 2 +- + src/tools/kata-ctl/src/arch/mod.rs | 10 +++++----- + .../src/arch/{powerpc64le => powerpc64}/mod.rs | 4 ++-- + src/tools/runk/Makefile | 2 +- + src/tools/trace-forwarder/Makefile | 2 +- + tests/common.bash | 4 ++-- + tests/install_rust.sh | 2 +- + tests/kata-arch.sh | 2 +- + tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in | 4 ++-- + tools/osbuilder/rootfs-builder/ubuntu/config.sh | 2 +- + tools/osbuilder/scripts/lib.sh | 2 +- + tools/packaging/scripts/configure-hypervisor.sh | 2 +- + tools/packaging/static-build/agent/Dockerfile | 2 +- + .../static-build/coco-guest-components/Dockerfile | 2 +- + tools/packaging/static-build/qemu/Dockerfile | 4 ++-- + tools/packaging/static-build/shim-v2/Dockerfile | 12 ++++++------ + tools/packaging/static-build/shim-v2/build.sh | 2 +- + .../packaging/static-build/virtiofsd/gnu/Dockerfile | 2 +- + .../packaging/static-build/virtiofsd/musl/Dockerfile | 2 +- + utils.mk | 2 +- + 26 files changed, 44 insertions(+), 44 deletions(-) + rename src/tools/kata-ctl/src/arch/{powerpc64le => powerpc64}/mod.rs (89%) + +diff --git a/docs/Developer-Guide.md b/docs/Developer-Guide.md +index 4b2260571..fa13eaac8 100644 +--- a/docs/Developer-Guide.md ++++ b/docs/Developer-Guide.md +@@ -239,7 +239,7 @@ The agent is built with a statically linked `musl.` The default `libc` used is ` + ```bash + $ export ARCH="$(uname -m)" + $ if [ "$ARCH" = "ppc64le" -o "$ARCH" = "s390x" ]; then export LIBC=gnu; else export LIBC=musl; fi +-$ [ "${ARCH}" == "ppc64le" ] && export ARCH=powerpc64le ++$ [ "${ARCH}" == "ppc64le" ] && export ARCH=powerpc64 + $ rustup target add "${ARCH}-unknown-linux-${LIBC}" + ``` + +@@ -268,7 +268,7 @@ to install `libseccomp` for the agent. + + ```bash + $ mkdir -p ${seccomp_install_path} ${gperf_install_path} +-$ pushd kata-containers/ci ++$ pushd kata-containers/ci + $ script -fec 'sudo -E ./install_libseccomp.sh ${seccomp_install_path} ${gperf_install_path}"' + $ export LIBSECCOMP_LIB_PATH="${seccomp_install_path}/lib" + $ popd +@@ -415,11 +415,11 @@ $ script -fec 'sudo -E AGENT_INIT=yes USE_DOCKER=true SECCOMP=no ./rootfs.sh "${ + > - Check the [compatibility matrix](../tools/osbuilder/README.md#platform-distro-compatibility-matrix) before creating rootfs. + + Optionally, add your custom agent binary to the rootfs with the following commands. The default `$LIBC` used +-is `musl`, but on ppc64le and s390x, `gnu` should be used. Also, Rust refers to ppc64le as `powerpc64le`: ++is `musl`, but on ppc64le and s390x, `gnu` should be used. Also, Rust refers to ppc64le as `powerpc64`: + ```bash + $ export ARCH="$(uname -m)" + $ [ "${ARCH}" == "ppc64le" ] || [ "${ARCH}" == "s390x" ] && export LIBC=gnu || export LIBC=musl +-$ [ "${ARCH}" == "ppc64le" ] && export ARCH=powerpc64le ++$ [ "${ARCH}" == "ppc64le" ] && export ARCH=powerpc64 + $ sudo install -o root -g root -m 0550 -T "${ROOTFS_DIR}/../../../../src/agent/target/${ARCH}-unknown-linux-${LIBC}/release/kata-agent" "${ROOTFS_DIR}/sbin/init" + ``` + +diff --git a/src/agent/Makefile b/src/agent/Makefile +index e62a894aa..893f40d4a 100644 +--- a/src/agent/Makefile ++++ b/src/agent/Makefile +@@ -54,7 +54,7 @@ endif + include ../../utils.mk + + ifeq ($(ARCH), ppc64le) +- override ARCH = powerpc64le ++ override ARCH = powerpc64 + endif + + ##VAR STANDARD_OCI_RUNTIME=yes|no define if agent enables standard oci runtime feature +diff --git a/src/libs/kata-sys-util/src/protection.rs b/src/libs/kata-sys-util/src/protection.rs +index 74ccd5006..623170d75 100644 +--- a/src/libs/kata-sys-util/src/protection.rs ++++ b/src/libs/kata-sys-util/src/protection.rs +@@ -14,7 +14,7 @@ use std::path::Path; + use std::path::PathBuf; + use thiserror::Error; + +-#[cfg(any(target_arch = "s390x", target_arch = "powerpc64le"))] ++#[cfg(any(target_arch = "s390x", target_arch = "powerpc64"))] + use nix::unistd::Uid; + + #[cfg(target_arch = "x86_64")] +@@ -234,7 +234,7 @@ pub fn available_guest_protection() -> Result + Ok(GuestProtection::Se) + } + +-#[cfg(target_arch = "powerpc64le")] ++#[cfg(all(target_arch = "powerpc64"))] + pub fn available_guest_protection() -> Result { + if !Uid::effective().is_root() { + return Err(check::ProtectionError::NoPerms); +diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile +index 707e3ab5f..e3631f3e6 100644 +--- a/src/runtime-rs/Makefile ++++ b/src/runtime-rs/Makefile +@@ -18,7 +18,7 @@ CONTAINERD_RUNTIME_NAME = io.containerd.kata.v2 + include ../../utils.mk + + ifeq ($(ARCH), ppc64le) +- override ARCH = powerpc64le ++ override ARCH = powerpc64 + endif + + ARCH_DIR = arch +@@ -31,7 +31,7 @@ test: + @echo "s390x is not currently supported" + exit 0 + install: install-runtime install-configs +-else ifeq ($(ARCH), powerpc64le) ++else ifeq ($(ARCH), powerpc64) + default: + @echo "PowerPC 64 LE is not currently supported" + exit 0 +diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile +index a49f88e6b..da2b545e0 100644 +--- a/src/tools/agent-ctl/Makefile ++++ b/src/tools/agent-ctl/Makefile +@@ -6,7 +6,7 @@ + include ../../../utils.mk + + ifeq ($(ARCH), ppc64le) +- override ARCH = powerpc64le ++ override ARCH = powerpc64 + endif + + .DEFAULT_GOAL := default +diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile +index 7410e20ed..a4351a89f 100644 +--- a/src/tools/genpolicy/Makefile ++++ b/src/tools/genpolicy/Makefile +@@ -7,7 +7,7 @@ + include ../../../utils.mk + + ifeq ($(ARCH), ppc64le) +- override ARCH = powerpc64le ++ override ARCH = powerpc64 + endif + + COMMIT_HASH := $(shell git rev-parse HEAD 2>/dev/null || true) +diff --git a/src/tools/kata-ctl/Cross.toml b/src/tools/kata-ctl/Cross.toml +index 88f18e96e..e07b885a8 100644 +--- a/src/tools/kata-ctl/Cross.toml ++++ b/src/tools/kata-ctl/Cross.toml +@@ -8,5 +8,5 @@ pre-build = ["dpkg --add-architecture arm64 && apt-get update && apt-get install + pre-build = ["dpkg --add-architecture amd64 && apt-get update && apt-get install -y libssl-dev:amd64"] + + # Powerpc compile seems to be broken, due to `ring` crate not being supported on powerpc. +-[target.powerpc64le-unknown-linux-gnu] ++[target.powerpc64-unknown-linux-gnu] + pre-build = ["dpkg --add-architecture ppc64le && apt-get update && apt-get install -y libssl-dev:ppc64le"] +diff --git a/src/tools/kata-ctl/src/arch/mod.rs b/src/tools/kata-ctl/src/arch/mod.rs +index b0010955d..26543088a 100644 +--- a/src/tools/kata-ctl/src/arch/mod.rs ++++ b/src/tools/kata-ctl/src/arch/mod.rs +@@ -8,10 +8,10 @@ pub mod aarch64; + #[cfg(target_arch = "aarch64")] + pub use aarch64 as arch_specific; + +-#[cfg(target_arch = "powerpc64le")] +-pub mod powerpc64le; +-#[cfg(target_arch = "powerpc64le")] +-pub use powerpc64le as arch_specific; ++#[cfg(all(target_arch = "powerpc64"))] ++pub mod powerpc64; ++#[cfg(all(target_arch = "powerpc64"))] ++pub use powerpc64 as arch_specific; + + #[cfg(target_arch = "s390x")] + pub mod s390x; +@@ -25,7 +25,7 @@ pub use x86_64 as arch_specific; + + #[cfg(not(any( + target_arch = "aarch64", +- target_arch = "powerpc64le", ++ target_arch = "powerpc64", + target_arch = "s390x", + target_arch = "x86_64" + )))] +diff --git a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs b/src/tools/kata-ctl/src/arch/powerpc64/mod.rs +similarity index 89% +rename from src/tools/kata-ctl/src/arch/powerpc64le/mod.rs +rename to src/tools/kata-ctl/src/arch/powerpc64/mod.rs +index bf5822c04..4437cb895 100644 +--- a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs ++++ b/src/tools/kata-ctl/src/arch/powerpc64/mod.rs +@@ -4,7 +4,7 @@ + // + + use crate::types::*; +-#[cfg(target_arch = "powerpc64le")] ++#[cfg(all(target_arch = "powerpc64"))] + pub use arch_specific::*; + + mod arch_specific { +@@ -16,7 +16,7 @@ mod arch_specific { + pub const ARCH_CPU_MODEL_FIELD: &str = "model"; + + pub fn check() -> Result<()> { +- unimplemented!("Check not implemented in powerpc64le"); ++ unimplemented!("Check not implemented in powerpc64"); + } + + pub fn get_checks() -> Option<&'static [CheckItem<'static>]> { +diff --git a/src/tools/runk/Makefile b/src/tools/runk/Makefile +index 186955679..fbbfcc423 100644 +--- a/src/tools/runk/Makefile ++++ b/src/tools/runk/Makefile +@@ -9,7 +9,7 @@ LIBC ?= gnu + include ../../../utils.mk + + ifeq ($(ARCH), ppc64le) +- override ARCH = powerpc64le ++ override ARCH = powerpc64 + endif + + TARGET = runk +diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Makefile +index 5d9f71856..2ea1b2a7f 100644 +--- a/src/tools/trace-forwarder/Makefile ++++ b/src/tools/trace-forwarder/Makefile +@@ -6,7 +6,7 @@ + include ../../../utils.mk + + ifeq ($(ARCH), ppc64le) +- override ARCH = powerpc64le ++ override ARCH = powerpc64 + endif + + .DEFAULT_GOAL := default +diff --git a/tests/common.bash b/tests/common.bash +index 7374d0942..3317eff29 100644 +--- a/tests/common.bash ++++ b/tests/common.bash +@@ -595,7 +595,7 @@ function clone_cri_containerd() { + # version: the version of the tarball that will be downloaded + # tarball-name: the name of the tarball that will be downloaded + function download_github_project_tarball() { +- project="${1}" ++ project="${1}" + version="${2}" + tarball_name="${3}" + +@@ -746,7 +746,7 @@ function arch_to_rust() { + + case "${arch}" in + aarch64) echo "${arch}";; +- ppc64le) echo "powerpc64le";; ++ ppc64le) echo "powerpc64";; + x86_64) echo "${arch}";; + s390x) echo "${arch}";; + *) die "unsupported architecture: ${arch}";; +diff --git a/tests/install_rust.sh b/tests/install_rust.sh +index b44b94be7..08ae157e0 100755 +--- a/tests/install_rust.sh ++++ b/tests/install_rust.sh +@@ -35,7 +35,7 @@ export PATH="${PATH}:${HOME}/.cargo/bin" + ## this command will not take too long to run. + rustup toolchain install ${version} + rustup default ${version} +-if [ "${rustarch}" == "powerpc64le" ] || [ "${rustarch}" == "s390x" ] ; then ++if [ "${rustarch}" == "powerpc64" ] || [ "${rustarch}" == "s390x" ] ; then + rustup target add ${rustarch}-unknown-linux-gnu + else + rustup target add ${rustarch}-unknown-linux-musl +diff --git a/tests/kata-arch.sh b/tests/kata-arch.sh +index 38146ef72..1a6643fe0 100755 +--- a/tests/kata-arch.sh ++++ b/tests/kata-arch.sh +@@ -46,7 +46,7 @@ function arch_to_rust() { + local arch="$1" + + if [ "${arch}" == "ppc64le" ]; then +- arch="powerpc64le" ++ arch="powerpc64" + fi + + echo "${arch}" +diff --git a/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in b/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in +index 4360fa619..f1cc8ac96 100644 +--- a/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in ++++ b/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in +@@ -34,7 +34,7 @@ RUN apt-get update && \ + $(gcc_arch="@ARCH@" && [ "$(uname -m)" != "$gcc_arch" ] && ( \ + libc_arch="$gcc_arch" && \ + [ "$gcc_arch" = aarch64 ] && libc_arch=arm64; \ +- [ "$gcc_arch" = ppc64le ] && gcc_arch=powerpc64le && libc_arch=ppc64el; \ ++ [ "$gcc_arch" = ppc64le ] && gcc_arch=powerpc64 && libc_arch=ppc64el; \ + [ "$gcc_arch" = s390x ] && gcc_arch=s390x && libc_arch=s390x; \ + [ "$gcc_arch" = x86_64 ] && gcc_arch=x86-64 && libc_arch=amd64; \ + echo "gcc-$gcc_arch-linux-gnu libc6-dev-$libc_arch-cross")) \ +@@ -76,7 +76,7 @@ RUN ARCH=$(uname -m); \ + libc=""; \ + case "${ARCH}" in \ + "aarch64") rust_arch="${ARCH}"; libc="musl"; ;; \ +- "ppc64le") rust_arch="powerpc64le"; libc="gnu"; ;; \ ++ "ppc64le") rust_arch="powerpc64"; libc="gnu"; ;; \ + "x86_64") rust_arch="${ARCH}"; libc="musl"; ;; \ + "s390x") rust_arch="${ARCH}"; libc="gnu"; ;; \ + *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ +diff --git a/tools/osbuilder/rootfs-builder/ubuntu/config.sh b/tools/osbuilder/rootfs-builder/ubuntu/config.sh +index 356505527..e9ff5c105 100644 +--- a/tools/osbuilder/rootfs-builder/ubuntu/config.sh ++++ b/tools/osbuilder/rootfs-builder/ubuntu/config.sh +@@ -22,7 +22,7 @@ esac + + if [ "$(uname -m)" != "$ARCH" ]; then + case "$ARCH" in +- ppc64le) cc_arch=powerpc64le;; ++ ppc64le) cc_arch=powerpc64;; + x86_64) cc_arch=x86-64;; + *) cc_arch="$ARCH" + esac +diff --git a/tools/osbuilder/scripts/lib.sh b/tools/osbuilder/scripts/lib.sh +index 5e3687595..670e58c24 100644 +--- a/tools/osbuilder/scripts/lib.sh ++++ b/tools/osbuilder/scripts/lib.sh +@@ -221,7 +221,7 @@ generate_dockerfile() + [ -d "${dir}" ] || die "${dir}: not a directory" + + local rustarch="$ARCH" +- [ "$ARCH" = ppc64le ] && rustarch=powerpc64le ++ [ "$ARCH" = ppc64le ] && rustarch=powerpc64 + + [ -n "${http_proxy:-}" ] && readonly set_proxy="RUN sed -i '$ a proxy="${http_proxy:-}"' /etc/dnf/dnf.conf /etc/yum.conf; true" + +diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh +index f88536dec..612164176 100755 +--- a/tools/packaging/scripts/configure-hypervisor.sh ++++ b/tools/packaging/scripts/configure-hypervisor.sh +@@ -213,7 +213,7 @@ generate_qemu_options() { + if [ $arch != $host ];then + case $arch in + aarch64) qemu_options+=(size:--cross-prefix=aarch64-linux-gnu-);; +- ppc64le) qemu_options+=(size:--cross-prefix=powerpc64le-linux-gnu-);; ++ ppc64le) qemu_options+=(size:--cross-prefix=powerpc64-linux-gnu-);; + s390x) exit;; + x86_64);; + *) exit;; +diff --git a/tools/packaging/static-build/agent/Dockerfile b/tools/packaging/static-build/agent/Dockerfile +index fed801d94..5fc9f1201 100644 +--- a/tools/packaging/static-build/agent/Dockerfile ++++ b/tools/packaging/static-build/agent/Dockerfile +@@ -45,7 +45,7 @@ RUN ARCH=$(uname -m); \ + libc=""; \ + case "${ARCH}" in \ + "aarch64") rust_arch="${ARCH}"; libc="musl" ;; \ +- "ppc64le") rust_arch="powerpc64le"; libc="gnu" ;; \ ++ "ppc64le") rust_arch="powerpc64"; libc="gnu" ;; \ + "x86_64") rust_arch="${ARCH}"; libc="musl" ;; \ + "s390x") rust_arch="${ARCH}"; libc="gnu" ;; \ + *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ +diff --git a/tools/packaging/static-build/coco-guest-components/Dockerfile b/tools/packaging/static-build/coco-guest-components/Dockerfile +index d5fcedb05..1b7054f31 100644 +--- a/tools/packaging/static-build/coco-guest-components/Dockerfile ++++ b/tools/packaging/static-build/coco-guest-components/Dockerfile +@@ -48,7 +48,7 @@ RUN ARCH=$(uname -m); \ + rust_arch=""; \ + case "${ARCH}" in \ + "aarch64") rust_arch="${ARCH}" ;; \ +- "ppc64le") rust_arch="powerpc64le" ;; \ ++ "ppc64le") rust_arch="powerpc64" ;; \ + "x86_64") rust_arch="${ARCH}" ;; \ + "s390x") rust_arch="${ARCH}" ;; \ + *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ +diff --git a/tools/packaging/static-build/qemu/Dockerfile b/tools/packaging/static-build/qemu/Dockerfile +index f8e477f07..fecd03f04 100644 +--- a/tools/packaging/static-build/qemu/Dockerfile ++++ b/tools/packaging/static-build/qemu/Dockerfile +@@ -65,14 +65,14 @@ RUN apt-get update && apt-get upgrade -y && \ + rsync \ + zlib1g-dev${DPKG_ARCH} && \ + if [ "${ARCH}" != s390x ]; then apt-get install -y --no-install-recommends libpmem-dev${DPKG_ARCH}; fi && \ +- GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64le"; fi && \ ++ GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64"; fi && \ + if [ "${ARCH}" != "$(uname -m)" ]; then apt-get install --no-install-recommends -y gcc-"${GCC_ARCH}"-linux-gnu; fi && \ + apt-get clean && rm -rf /var/lib/apt/lists/ + + RUN git clone https://github.com/axboe/liburing/ ~/liburing && \ + cd ~/liburing && \ + git checkout tags/liburing-2.1 && \ +- GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64le"; fi && \ ++ GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64"; fi && \ + if [ "${ARCH}" != "$(uname -m)" ]; then PREFIX="${GCC_ARCH}-linux-gnu"; fi && \ + ./configure --cc=${GCC_ARCH}-linux-gnu-gcc --cxx=${GCC_ARCH}-linux-gnu-cpp --prefix=/usr/${PREFIX}/ && \ + make && make install && ldconfig +diff --git a/tools/packaging/static-build/shim-v2/Dockerfile b/tools/packaging/static-build/shim-v2/Dockerfile +index 808f24346..cc3930e1f 100644 +--- a/tools/packaging/static-build/shim-v2/Dockerfile ++++ b/tools/packaging/static-build/shim-v2/Dockerfile +@@ -6,7 +6,7 @@ FROM ubuntu:20.04 + ENV DEBIAN_FRONTEND=noninteractive + + ENV GO_HOME="/opt" +-ENV GOCACHE="${GO_HOME}/.cache" ++ENV GOCACHE="${GO_HOME}/.cache" + ENV RUSTUP_HOME="/opt/rustup" + ENV CARGO_HOME="/opt/cargo" + ENV PATH="/opt/cargo/bin/:/opt/go/bin:${PATH}" +@@ -32,19 +32,19 @@ RUN apt-get update && \ + sudo && \ + apt-get clean && rm -rf /var/lib/apt/lists/&& \ + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${RUST_VERSION} +- ++ + RUN ARCH=$(uname -m); \ + rust_arch=""; \ + libc=""; \ + case "${ARCH}" in \ + "aarch64") rust_arch="${ARCH}"; libc="musl"; ;; \ +- "ppc64le") rust_arch="powerpc64le"; libc="gnu"; ;; \ ++ "ppc64le") rust_arch="powerpc64"; libc="gnu"; ;; \ + "x86_64") rust_arch="${ARCH}"; libc="musl"; ;; \ + "s390x") rust_arch="${ARCH}"; libc="gnu"; ;; \ + *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ + esac; \ +- rustup target add "${rust_arch}-unknown-linux-${libc}" +- ++ rustup target add "${rust_arch}-unknown-linux-${libc}" ++ + RUN ARCH=$(uname -m); \ + goarch=""; \ + kernelname=$(uname -s | tr '[:upper:]' '[:lower:]'); \ +@@ -58,6 +58,6 @@ RUN ARCH=$(uname -m); \ + curl -OL "https://storage.googleapis.com/golang/go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" && \ + tar -C "${GO_HOME}" -xzf "go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" && \ + rm "go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" +- ++ + # aarch64 requires this name -- link for all + RUN ln -s /usr/bin/musl-gcc "/usr/bin/$(uname -m)-linux-musl-gcc" +diff --git a/tools/packaging/static-build/shim-v2/build.sh b/tools/packaging/static-build/shim-v2/build.sh +index 9a1160f7b..813808759 100755 +--- a/tools/packaging/static-build/shim-v2/build.sh ++++ b/tools/packaging/static-build/shim-v2/build.sh +@@ -48,7 +48,7 @@ docker pull ${container_image} || \ + arch=${ARCH:-$(uname -m)} + GCC_ARCH=${arch} + if [ ${arch} = "ppc64le" ]; then +- GCC_ARCH="powerpc64le" ++ GCC_ARCH="powerpc64" + arch="ppc64" + fi + +diff --git a/tools/packaging/static-build/virtiofsd/gnu/Dockerfile b/tools/packaging/static-build/virtiofsd/gnu/Dockerfile +index b0cd97584..9f155e8fc 100644 +--- a/tools/packaging/static-build/virtiofsd/gnu/Dockerfile ++++ b/tools/packaging/static-build/virtiofsd/gnu/Dockerfile +@@ -33,7 +33,7 @@ RUN ARCH=$(uname -m); \ + extra_rust_flags=" -C link-self-contained=yes"; \ + case "${ARCH}" in \ + "aarch64") rust_arch="${ARCH}"; libc="musl"; arch_libc="" ;; \ +- "ppc64le") rust_arch="powerpc64le"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ ++ "ppc64le") rust_arch="powerpc64"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ + "x86_64") rust_arch="${ARCH}"; libc="musl"; arch_libc="" ;; \ + "s390x") rust_arch="${ARCH}"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ + *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ +diff --git a/tools/packaging/static-build/virtiofsd/musl/Dockerfile b/tools/packaging/static-build/virtiofsd/musl/Dockerfile +index 270aadf52..85e3db10f 100644 +--- a/tools/packaging/static-build/virtiofsd/musl/Dockerfile ++++ b/tools/packaging/static-build/virtiofsd/musl/Dockerfile +@@ -30,7 +30,7 @@ RUN ARCH=$(uname -m); \ + extra_rust_flags=" -C link-self-contained=yes"; \ + case "${ARCH}" in \ + "aarch64") rust_arch="${ARCH}"; libc="musl"; arch_libc="" ;; \ +- "ppc64le") rust_arch="powerpc64le"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ ++ "ppc64le") rust_arch="powerpc64"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ + "x86_64") rust_arch="${ARCH}"; libc="musl"; arch_libc="" ;; \ + "s390x") rust_arch="${ARCH}"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ + *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ +diff --git a/utils.mk b/utils.mk +index 1a153e26c..df334ee12 100644 +--- a/utils.mk ++++ b/utils.mk +@@ -147,7 +147,7 @@ endif + + ifeq ($(ARCH), ppc64le) + override LIBC = gnu +- $(warning "WARNING: powerpc64le-unknown-linux-musl target is unavailable") ++ $(warning "WARNING: powerpc64-unknown-linux-musl target is unavailable") + endif + + ifeq ($(ARCH), s390x) +-- +2.43.5 + diff --git a/kata-containers.spec b/kata-containers.spec index e535610..9037987 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 3.8.0 +Version: 3.9.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -68,8 +68,9 @@ Source5: 50-kata Patch0999: 0999-osbuilder-Adjust-agent_version-for-our-builds.patch Patch1000: 1000-Remove-shebang-in-non-executable-completion-script.patch Patch1001: 1001-Remove-warnings-as-compilation-errors.patch -Patch1002: 1002-Fix-invalid-target_arch.patch -Patch1003: 1003-Remove-genpolicy-warning-errors.patch +Patch1002: 1002-Remove-warnings-as-errors-from-genpolicy.patch +Patch1003: 1003-Fix-time-dependency-compilation-error.patch +Patch1004: 1004-Fix-arch-name-compilation-failure.patch %if 0%{?have_go_rpm_macros} BuildRequires: go-rpm-macros @@ -95,6 +96,7 @@ BuildRequires: dbus-daemon BuildRequires: dracut BuildRequires: kernel BuildRequires: busybox +BuildRequires: rsyslog %if 0%{?bundled_rust_deps} BuildRequires: cargo @@ -137,6 +139,7 @@ BuildRequires: crate(ttrpc/default) >= 0.0.0 %endif Requires: busybox +Requires: binutils Requires: dracut Requires: kernel Requires: qemu-kvm-core >= 8.2.0-1 @@ -389,12 +392,14 @@ fi %changelog -* Mon Aug 26 2024 Emanuel Lima - 3.8.0-1 -- kata-containers 3.8.0 - Add fix invalid target arch patch - Fix warning errors patch +* Mon Sep 23 2024 Emanuel Lima - 3.9.0-1 +- kata-containers 3.9.0 + Fix warnings as compilation errors patch + Add time dependency compilation error patch + Add arch name compilation failure patch + Add binutils and rsyslog as dependencies -* Thu Jul 25 2024 Emanuel Lima - 3.7.0-1 +* Mon Sep 16 2024 Emanuel Lima - 3.7.0-1 - kata-containers 3.7.0 Add "io.kubernetes.cri-o.Devices" to cri-o config Remove the openssl feature patch diff --git a/sources b/sources index 63e01cd..e5dfd6d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.8.0-vendor.tar.gz) = d44b3d6e8f2136e9858eb2c3668b2a433c44e8814dbe05c66aeaa65dea9713324e54d1acc81b9ecd1ce949126ed351263ba0701f4352308c7150a00769b1861e -SHA512 (kata-containers-3.8.0.tar.gz) = c02ca22d53611c873958f9953e4cec159533cd25b81212955e4cdef460291287715a4d3ee022f83b71a183d7ec5a254d15c893c30fad36c335dcafe6a657f9b3 +SHA512 (kata-containers-3.9.0-vendor.tar.gz) = e4e4d9f8b6154d9e9a1e16fc889796871fd973413469d570c709232ef6e4e8b4cac07e0b1db2b12250ec0c2ad89f16b3a76c6aae9ed6c32a07ba2856b7e792fd +SHA512 (kata-containers-3.9.0.tar.gz) = e2bb0bf6c3ef4e5635c9a6be080168f3217d6597c63493aca99c820d9d02628534873bb49269d2b7b20fadbb8833b709dd830f2f935cabe389205022042000af From 4e7e82ae63155a5dfb7705ea85dfca6c8ef392b8 Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Mon, 7 Oct 2024 16:27:42 -0300 Subject: [PATCH 40/65] Fix v3.9.0 release Also, Add AGENT_POLICY patch Signed-off-by: Emanuel Lima --- ...x-RPM-build-fail-due-to-AGENT_POLICY.patch | 51 +++++++++++++++++++ kata-containers.spec | 4 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 1005-build-Fix-RPM-build-fail-due-to-AGENT_POLICY.patch diff --git a/1005-build-Fix-RPM-build-fail-due-to-AGENT_POLICY.patch b/1005-build-Fix-RPM-build-fail-due-to-AGENT_POLICY.patch new file mode 100644 index 0000000..e50e4fe --- /dev/null +++ b/1005-build-Fix-RPM-build-fail-due-to-AGENT_POLICY.patch @@ -0,0 +1,51 @@ +From e989e7ee4e0f7a4b838dc0ef80a5f1e237db2113 Mon Sep 17 00:00:00 2001 +From: Emanuel Lima +Date: Mon, 7 Oct 2024 15:23:02 -0300 +Subject: [PATCH] build: Fix RPM build fail due to AGENT_POLICY + +By checking for AGENT_POLICY we ensure we only try to read +allow-all.rego if AGENT_POLICY is set to "yes" + +Signed-off-by: Emanuel Lima +--- + tools/osbuilder/rootfs-builder/rootfs.sh | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh +index 21816a2cf..04a855a0c 100755 +--- a/tools/osbuilder/rootfs-builder/rootfs.sh ++++ b/tools/osbuilder/rootfs-builder/rootfs.sh +@@ -39,7 +39,9 @@ PAUSE_IMAGE_TARBALL=${PAUSE_IMAGE_TARBALL:-""} + lib_file="${script_dir}/../scripts/lib.sh" + source "$lib_file" + +-agent_policy_file="$(readlink -f -v "${AGENT_POLICY_FILE:-"${script_dir}/../../../src/kata-opa/allow-all.rego"}")" ++if [[ "${AGENT_POLICY}" == "yes" ]]; then ++ agent_policy_file="$(readlink -f -v "${AGENT_POLICY_FILE:-"${script_dir}/../../../src/kata-opa/allow-all.rego"}")" ++fi + + #For cross build + CROSS_BUILD=${CROSS_BUILD:-false} +@@ -361,7 +363,9 @@ check_env_variables() + + [ -n "${KERNEL_MODULES_DIR}" ] && [ ! -d "${KERNEL_MODULES_DIR}" ] && die "KERNEL_MODULES_DIR defined but is not an existing directory" + +- [ ! -f "${agent_policy_file}" ] && die "agent policy file not found in '${agent_policy_file}'" ++ if [[ "${AGENT_POLICY}" == "yes" ]]; then ++ [ ! -f "${agent_policy_file}" ] && die "agent policy file not found in '${agent_policy_file}'" ++ fi + + [ -n "${OSBUILDER_VERSION}" ] || die "need osbuilder version" + } +@@ -724,7 +728,7 @@ EOF + fi + fi + +- if [ "${AGENT_POLICY}" == "yes" ]; then ++ if [[ "${AGENT_POLICY}" == "yes" ]]; then + info "Install the default policy" + # Install default settings for the kata-opa service. + local opa_settings_dir="/etc/kata-opa" +-- +2.43.5 + diff --git a/kata-containers.spec b/kata-containers.spec index 9037987..6b5eace 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -71,6 +71,7 @@ Patch1001: 1001-Remove-warnings-as-compilation-errors.patch Patch1002: 1002-Remove-warnings-as-errors-from-genpolicy.patch Patch1003: 1003-Fix-time-dependency-compilation-error.patch Patch1004: 1004-Fix-arch-name-compilation-failure.patch +Patch1005: 1005-build-Fix-RPM-build-fail-due-to-AGENT_POLICY.patch %if 0%{?have_go_rpm_macros} BuildRequires: go-rpm-macros @@ -392,12 +393,13 @@ fi %changelog -* Mon Sep 23 2024 Emanuel Lima - 3.9.0-1 +* Mon Oct 07 2024 Emanuel Lima - 3.9.0-1 - kata-containers 3.9.0 Fix warnings as compilation errors patch Add time dependency compilation error patch Add arch name compilation failure patch Add binutils and rsyslog as dependencies + Add AGENT_POLICY patch * Mon Sep 16 2024 Emanuel Lima - 3.7.0-1 - kata-containers 3.7.0 From 1b18f065eb7797b01e3e8ae2233fc5a6932ac9af Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Tue, 26 Nov 2024 17:17:22 -0300 Subject: [PATCH 41/65] Bump to Kata v3.11.0 Signed-off-by: Emanuel Lima --- .gitignore | 2 + ...003-Bumping-time-dependency-for-Kata.patch | 2737 ++--------------- ...x-RPM-build-fail-due-to-AGENT_POLICY.patch | 51 - kata-containers.spec | 8 +- sources | 4 +- 5 files changed, 350 insertions(+), 2452 deletions(-) rename 1003-Fix-time-dependency-compilation-error.patch => 1003-Bumping-time-dependency-for-Kata.patch (54%) delete mode 100644 1005-build-Fix-RPM-build-fail-due-to-AGENT_POLICY.patch diff --git a/.gitignore b/.gitignore index 74e9804..ca2ace5 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ /kata-containers-3.7.0.tar.gz /kata-containers-3.9.0-vendor.tar.gz /kata-containers-3.9.0.tar.gz +/kata-containers-3.11.0-vendor.tar.gz +/kata-containers-3.11.0.tar.gz diff --git a/1003-Fix-time-dependency-compilation-error.patch b/1003-Bumping-time-dependency-for-Kata.patch similarity index 54% rename from 1003-Fix-time-dependency-compilation-error.patch rename to 1003-Bumping-time-dependency-for-Kata.patch index aec98f4..1edbef8 100644 --- a/1003-Fix-time-dependency-compilation-error.patch +++ b/1003-Bumping-time-dependency-for-Kata.patch @@ -1,24 +1,11 @@ -From c00c679a2076e27805cfc3d3275bc8abdd69d674 Mon Sep 17 00:00:00 2001 +From 1f6af40aea0bd48cbf8c441bf468ff202e11d586 Mon Sep 17 00:00:00 2001 From: Emanuel Lima -Date: Wed, 18 Sep 2024 10:18:01 -0300 -Subject: [PATCH] build: Fix time dependency compilation error - -This is one of the 3 PRs that enable kata-containers to be compiled by -the latest stable Rust (v1.80.1) - -Kata is unable to be built with Rust v1.80.1 due, among other things, -to a compilation error with an indirect dependency. -This patch bumps it, that's why it's only changes on Cargo.locks. -Time is not a direct dependency, so no changes to Cargo.tomls. - -The patch was achieved through cargo update -p time for all time >= 0.3.0 for all crates under Kata. - -Fixes https://github.com/kata-containers/kata-containers/issues/10215 +Date: Tue, 26 Nov 2024 16:15:14 -0300 +Subject: [PATCH] Bumping time dependency for Kata v3.11.0 Signed-off-by: Emanuel Lima --- - src/agent/Cargo.lock | 84 +- - src/dragonball/Cargo.lock | 84 +- + src/dragonball/Cargo.lock | 34 +- src/dragonball/src/dbs_acpi/Cargo.lock | 48 + .../src/dbs_address_space/Cargo.lock | 187 +++ src/dragonball/src/dbs_allocator/Cargo.lock | 65 + @@ -29,13 +16,12 @@ Signed-off-by: Emanuel Lima .../src/dbs_legacy_devices/Cargo.lock | 289 ++++ src/dragonball/src/dbs_tdx/Cargo.lock | 149 ++ src/dragonball/src/dbs_upcall/Cargo.lock | 1275 +++++++++++++++++ - src/libs/Cargo.lock | 129 +- - src/runtime-rs/Cargo.lock | 94 +- - src/tools/agent-ctl/Cargo.lock | 113 +- - src/tools/kata-ctl/Cargo.lock | 261 +++- - src/tools/runk/Cargo.lock | 58 +- - src/tools/trace-forwarder/Cargo.lock | 74 +- - 18 files changed, 3172 insertions(+), 343 deletions(-) + src/libs/Cargo.lock | 49 +- + src/runtime-rs/Cargo.lock | 22 +- + src/tools/agent-ctl/Cargo.lock | 95 +- + src/tools/kata-ctl/Cargo.lock | 16 +- + src/tools/trace-forwarder/Cargo.lock | 36 +- + 16 files changed, 2795 insertions(+), 75 deletions(-) create mode 100644 src/dragonball/src/dbs_acpi/Cargo.lock create mode 100644 src/dragonball/src/dbs_address_space/Cargo.lock create mode 100644 src/dragonball/src/dbs_allocator/Cargo.lock @@ -47,356 +33,8 @@ Signed-off-by: Emanuel Lima create mode 100644 src/dragonball/src/dbs_tdx/Cargo.lock create mode 100644 src/dragonball/src/dbs_upcall/Cargo.lock -diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock -index f55144570..c6602ca1f 100644 ---- a/src/agent/Cargo.lock -+++ b/src/agent/Cargo.lock -@@ -324,7 +324,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -386,7 +386,7 @@ checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -561,7 +561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" - dependencies = [ - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -657,7 +657,7 @@ dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - "syn_derive", - ] - -@@ -1244,7 +1244,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1315,7 +1315,7 @@ dependencies = [ - "proc-macro2", - "quote", - "strsim 0.11.1", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1348,7 +1348,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" - dependencies = [ - "darling_core 0.20.10", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1387,7 +1387,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1439,7 +1439,7 @@ dependencies = [ - "darling 0.20.10", - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1449,7 +1449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" - dependencies = [ - "derive_builder_core", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1502,7 +1502,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1652,7 +1652,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1917,7 +1917,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2404,7 +2404,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -3990,7 +3990,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -4470,9 +4470,9 @@ dependencies = [ - - [[package]] - name = "quote" --version = "1.0.36" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" - dependencies = [ - "proc-macro2", - ] -@@ -4831,7 +4831,7 @@ dependencies = [ - "regex", - "relative-path", - "rustc_version", -- "syn 2.0.71", -+ "syn 2.0.77", - "unicode-ident", - ] - -@@ -5076,7 +5076,7 @@ checksum = "d2ee4885492bb655bfa05d039cd9163eb8fe9f79ddebf00ca23a1637510c2fd2" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -5183,9 +5183,9 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.204" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" - dependencies = [ - "serde_derive", - ] -@@ -5222,13 +5222,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" - - [[package]] - name = "serde_derive" --version = "1.0.204" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -5250,7 +5250,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -5639,7 +5639,7 @@ dependencies = [ - "proc-macro2", - "quote", - "rustversion", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -5684,9 +5684,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.71" -+version = "2.0.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" - dependencies = [ - "proc-macro2", - "quote", -@@ -5702,7 +5702,7 @@ dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -5719,7 +5719,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -5811,7 +5811,7 @@ checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -5907,7 +5907,7 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -5936,7 +5936,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -6098,7 +6098,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -6264,9 +6264,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - - [[package]] - name = "unicode-ident" --version = "1.0.12" -+version = "1.0.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - - [[package]] - name = "unicode-normalization" -@@ -6468,7 +6468,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - "wasm-bindgen-shared", - ] - -@@ -6502,7 +6502,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] -@@ -6951,7 +6951,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - "synstructure", - ] - -@@ -7038,7 +7038,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - "synstructure", - ] - -@@ -7059,7 +7059,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] -@@ -7081,7 +7081,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.71", -+ "syn 2.0.77", - ] - - [[package]] diff --git a/src/dragonball/Cargo.lock b/src/dragonball/Cargo.lock -index bb758d1f8..c9646ec67 100644 +index bb758d1f8..26eb61d22 100644 --- a/src/dragonball/Cargo.lock +++ b/src/dragonball/Cargo.lock @@ -428,9 +428,12 @@ dependencies = [ @@ -414,30 +52,6 @@ index bb758d1f8..c9646ec67 100644 [[package]] name = "derivative" -@@ -931,9 +934,9 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - - [[package]] - name = "itoa" --version = "1.0.9" -+version = "1.0.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - - [[package]] - name = "jobserver" -@@ -981,9 +984,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.147" -+version = "0.2.158" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - - [[package]] - name = "libz-sys" @@ -1146,6 +1149,12 @@ dependencies = [ "memoffset", ] @@ -451,28 +65,7 @@ index bb758d1f8..c9646ec67 100644 [[package]] name = "num-traits" version = "0.2.16" -@@ -1167,9 +1176,9 @@ dependencies = [ - - [[package]] - name = "num_threads" --version = "0.1.6" -+version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" - dependencies = [ - "libc", - ] -@@ -1301,7 +1310,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.32", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1379,11 +1388,17 @@ version = "0.3.27" +@@ -1379,6 +1388,12 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" @@ -484,75 +77,7 @@ index bb758d1f8..c9646ec67 100644 + [[package]] name = "proc-macro2" --version = "1.0.66" -+version = "1.0.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" - dependencies = [ - "unicode-ident", - ] -@@ -1441,9 +1456,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" - - [[package]] - name = "quote" --version = "1.0.33" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" - dependencies = [ - "proc-macro2", - ] -@@ -1640,22 +1655,22 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.188" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.188" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.32", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1799,9 +1814,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.32" -+version = "2.0.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" - dependencies = [ - "proc-macro2", - "quote", -@@ -1873,7 +1888,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.32", -+ "syn 2.0.77", - ] - - [[package]] + version = "1.0.66" @@ -1897,14 +1912,16 @@ dependencies = [ [[package]] @@ -594,57 +119,9 @@ index bb758d1f8..c9646ec67 100644 "time-core", ] -@@ -1974,7 +1992,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.32", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2036,7 +2054,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.32", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2068,9 +2086,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - - [[package]] - name = "unicode-ident" --version = "1.0.11" -+version = "1.0.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - - [[package]] - name = "unicode-normalization" -@@ -2226,7 +2244,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.32", -+ "syn 2.0.77", - "wasm-bindgen-shared", - ] - -@@ -2260,7 +2278,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.32", -+ "syn 2.0.77", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] diff --git a/src/dragonball/src/dbs_acpi/Cargo.lock b/src/dragonball/src/dbs_acpi/Cargo.lock new file mode 100644 -index 000000000..33ea45237 +index 000000000..3bbbdef49 --- /dev/null +++ b/src/dragonball/src/dbs_acpi/Cargo.lock @@ -0,0 +1,48 @@ @@ -661,9 +138,9 @@ index 000000000..33ea45237 + +[[package]] +name = "libc" -+version = "0.2.158" ++version = "0.2.165" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" + +[[package]] +name = "vm-memory" @@ -698,7 +175,7 @@ index 000000000..33ea45237 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/dragonball/src/dbs_address_space/Cargo.lock b/src/dragonball/src/dbs_address_space/Cargo.lock new file mode 100644 -index 000000000..73bd11dda +index 000000000..974189c3e --- /dev/null +++ b/src/dragonball/src/dbs_address_space/Cargo.lock @@ -0,0 +1,187 @@ @@ -714,9 +191,9 @@ index 000000000..73bd11dda + +[[package]] +name = "autocfg" -+version = "1.3.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bitflags" @@ -726,9 +203,9 @@ index 000000000..73bd11dda + +[[package]] +name = "cc" -+version = "1.1.21" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" ++checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +dependencies = [ + "shlex", +] @@ -760,9 +237,9 @@ index 000000000..73bd11dda + +[[package]] +name = "libc" -+version = "0.2.158" ++version = "0.2.165" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" + +[[package]] +name = "memoffset" @@ -788,9 +265,9 @@ index 000000000..73bd11dda + +[[package]] +name = "proc-macro2" -+version = "1.0.86" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] @@ -812,9 +289,9 @@ index 000000000..73bd11dda + +[[package]] +name = "syn" -+version = "2.0.77" ++version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", @@ -823,18 +300,18 @@ index 000000000..73bd11dda + +[[package]] +name = "thiserror" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", @@ -843,9 +320,9 @@ index 000000000..73bd11dda + +[[package]] +name = "unicode-ident" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "vm-memory" @@ -891,7 +368,7 @@ index 000000000..73bd11dda +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/dragonball/src/dbs_allocator/Cargo.lock b/src/dragonball/src/dbs_allocator/Cargo.lock new file mode 100644 -index 000000000..9e86c5d15 +index 000000000..380ba4896 --- /dev/null +++ b/src/dragonball/src/dbs_allocator/Cargo.lock @@ -0,0 +1,65 @@ @@ -908,9 +385,9 @@ index 000000000..9e86c5d15 + +[[package]] +name = "proc-macro2" -+version = "1.0.86" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] @@ -926,9 +403,9 @@ index 000000000..9e86c5d15 + +[[package]] +name = "syn" -+version = "2.0.77" ++version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", @@ -937,18 +414,18 @@ index 000000000..9e86c5d15 + +[[package]] +name = "thiserror" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", @@ -957,12 +434,12 @@ index 000000000..9e86c5d15 + +[[package]] +name = "unicode-ident" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" diff --git a/src/dragonball/src/dbs_arch/Cargo.lock b/src/dragonball/src/dbs_arch/Cargo.lock new file mode 100644 -index 000000000..7ec835786 +index 000000000..b64200e86 --- /dev/null +++ b/src/dragonball/src/dbs_arch/Cargo.lock @@ -0,0 +1,160 @@ @@ -972,9 +449,9 @@ index 000000000..7ec835786 + +[[package]] +name = "autocfg" -+version = "1.3.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bitflags" @@ -1017,9 +494,9 @@ index 000000000..7ec835786 + +[[package]] +name = "libc" -+version = "0.2.158" ++version = "0.2.165" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" + +[[package]] +name = "memoffset" @@ -1032,9 +509,9 @@ index 000000000..7ec835786 + +[[package]] +name = "proc-macro2" -+version = "1.0.86" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] @@ -1050,9 +527,9 @@ index 000000000..7ec835786 + +[[package]] +name = "syn" -+version = "2.0.77" ++version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", @@ -1061,18 +538,18 @@ index 000000000..7ec835786 + +[[package]] +name = "thiserror" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", @@ -1081,9 +558,9 @@ index 000000000..7ec835786 + +[[package]] +name = "unicode-ident" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "vm-memory" @@ -1128,7 +605,7 @@ index 000000000..7ec835786 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/dragonball/src/dbs_boot/Cargo.lock b/src/dragonball/src/dbs_boot/Cargo.lock new file mode 100644 -index 000000000..93da8eef1 +index 000000000..44aa72910 --- /dev/null +++ b/src/dragonball/src/dbs_boot/Cargo.lock @@ -0,0 +1,201 @@ @@ -1138,9 +615,9 @@ index 000000000..93da8eef1 + +[[package]] +name = "autocfg" -+version = "1.3.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bitflags" @@ -1218,9 +695,9 @@ index 000000000..93da8eef1 + +[[package]] +name = "libc" -+version = "0.2.158" ++version = "0.2.165" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" + +[[package]] +name = "memoffset" @@ -1233,9 +710,9 @@ index 000000000..93da8eef1 + +[[package]] +name = "proc-macro2" -+version = "1.0.86" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] @@ -1251,9 +728,9 @@ index 000000000..93da8eef1 + +[[package]] +name = "syn" -+version = "2.0.77" ++version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", @@ -1262,18 +739,18 @@ index 000000000..93da8eef1 + +[[package]] +name = "thiserror" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", @@ -1282,9 +759,9 @@ index 000000000..93da8eef1 + +[[package]] +name = "unicode-ident" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "vm-fdt" @@ -1335,7 +812,7 @@ index 000000000..93da8eef1 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/dragonball/src/dbs_device/Cargo.lock b/src/dragonball/src/dbs_device/Cargo.lock new file mode 100644 -index 000000000..fa768eabb +index 000000000..638d662f0 --- /dev/null +++ b/src/dragonball/src/dbs_device/Cargo.lock @@ -0,0 +1,65 @@ @@ -1352,9 +829,9 @@ index 000000000..fa768eabb + +[[package]] +name = "proc-macro2" -+version = "1.0.86" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] @@ -1370,9 +847,9 @@ index 000000000..fa768eabb + +[[package]] +name = "syn" -+version = "2.0.77" ++version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", @@ -1381,18 +858,18 @@ index 000000000..fa768eabb + +[[package]] +name = "thiserror" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", @@ -1401,12 +878,12 @@ index 000000000..fa768eabb + +[[package]] +name = "unicode-ident" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" diff --git a/src/dragonball/src/dbs_interrupt/Cargo.lock b/src/dragonball/src/dbs_interrupt/Cargo.lock new file mode 100644 -index 000000000..337b67053 +index 000000000..613a1f50d --- /dev/null +++ b/src/dragonball/src/dbs_interrupt/Cargo.lock @@ -0,0 +1,179 @@ @@ -1416,9 +893,9 @@ index 000000000..337b67053 + +[[package]] +name = "autocfg" -+version = "1.3.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bitflags" @@ -1480,9 +957,9 @@ index 000000000..337b67053 + +[[package]] +name = "libc" -+version = "0.2.158" ++version = "0.2.165" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" + +[[package]] +name = "memoffset" @@ -1495,9 +972,9 @@ index 000000000..337b67053 + +[[package]] +name = "proc-macro2" -+version = "1.0.86" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] @@ -1513,9 +990,9 @@ index 000000000..337b67053 + +[[package]] +name = "syn" -+version = "2.0.77" ++version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", @@ -1524,18 +1001,18 @@ index 000000000..337b67053 + +[[package]] +name = "thiserror" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", @@ -1544,9 +1021,9 @@ index 000000000..337b67053 + +[[package]] +name = "unicode-ident" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "vm-memory" @@ -1591,7 +1068,7 @@ index 000000000..337b67053 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/dragonball/src/dbs_legacy_devices/Cargo.lock b/src/dragonball/src/dbs_legacy_devices/Cargo.lock new file mode 100644 -index 000000000..937a762ce +index 000000000..613870b71 --- /dev/null +++ b/src/dragonball/src/dbs_legacy_devices/Cargo.lock @@ -0,0 +1,289 @@ @@ -1601,9 +1078,9 @@ index 000000000..937a762ce + +[[package]] +name = "anyhow" -+version = "1.0.89" ++version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" ++checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" + +[[package]] +name = "bitflags" @@ -1673,9 +1150,9 @@ index 000000000..937a762ce + +[[package]] +name = "libc" -+version = "0.2.158" ++version = "0.2.165" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" + +[[package]] +name = "linux-raw-sys" @@ -1691,9 +1168,9 @@ index 000000000..937a762ce + +[[package]] +name = "proc-macro2" -+version = "1.0.86" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] @@ -1709,9 +1186,9 @@ index 000000000..937a762ce + +[[package]] +name = "rustix" -+version = "0.38.37" ++version = "0.38.41" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" ++checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +dependencies = [ + "bitflags 2.6.0", + "errno", @@ -1722,18 +1199,18 @@ index 000000000..937a762ce + +[[package]] +name = "serde" -+version = "1.0.210" ++version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" ++checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.210" ++version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" ++checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +dependencies = [ + "proc-macro2", + "quote", @@ -1742,9 +1219,9 @@ index 000000000..937a762ce + +[[package]] +name = "syn" -+version = "2.0.77" ++version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", @@ -1753,18 +1230,18 @@ index 000000000..937a762ce + +[[package]] +name = "thiserror" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", @@ -1782,9 +1259,9 @@ index 000000000..937a762ce + +[[package]] +name = "unicode-ident" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "vm-superio" @@ -1886,7 +1363,7 @@ index 000000000..937a762ce +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/src/dragonball/src/dbs_tdx/Cargo.lock b/src/dragonball/src/dbs_tdx/Cargo.lock new file mode 100644 -index 000000000..8cc2e7d6d +index 000000000..4f6b6628e --- /dev/null +++ b/src/dragonball/src/dbs_tdx/Cargo.lock @@ -0,0 +1,149 @@ @@ -1912,9 +1389,9 @@ index 000000000..8cc2e7d6d + +[[package]] +name = "itoa" -+version = "1.0.11" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" ++checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" + +[[package]] +name = "kvm-bindings" @@ -1927,9 +1404,9 @@ index 000000000..8cc2e7d6d + +[[package]] +name = "libc" -+version = "0.2.158" ++version = "0.2.165" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" + +[[package]] +name = "memchr" @@ -1939,9 +1416,9 @@ index 000000000..8cc2e7d6d + +[[package]] +name = "proc-macro2" -+version = "1.0.86" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] @@ -1963,18 +1440,18 @@ index 000000000..8cc2e7d6d + +[[package]] +name = "serde" -+version = "1.0.210" ++version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" ++checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.210" ++version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" ++checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +dependencies = [ + "proc-macro2", + "quote", @@ -1983,9 +1460,9 @@ index 000000000..8cc2e7d6d + +[[package]] +name = "serde_json" -+version = "1.0.128" ++version = "1.0.133" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" ++checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +dependencies = [ + "itoa", + "memchr", @@ -1995,9 +1472,9 @@ index 000000000..8cc2e7d6d + +[[package]] +name = "syn" -+version = "2.0.77" ++version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", @@ -2006,18 +1483,18 @@ index 000000000..8cc2e7d6d + +[[package]] +name = "thiserror" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", @@ -2026,9 +1503,9 @@ index 000000000..8cc2e7d6d + +[[package]] +name = "unicode-ident" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "vmm-sys-util" @@ -2041,7 +1518,7 @@ index 000000000..8cc2e7d6d +] diff --git a/src/dragonball/src/dbs_upcall/Cargo.lock b/src/dragonball/src/dbs_upcall/Cargo.lock new file mode 100644 -index 000000000..13349e9c6 +index 000000000..4897e09dd --- /dev/null +++ b/src/dragonball/src/dbs_upcall/Cargo.lock @@ -0,0 +1,1275 @@ @@ -2051,9 +1528,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "addr2line" -+version = "0.24.1" ++version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" ++checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] @@ -2066,9 +1543,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "anyhow" -+version = "1.0.89" ++version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" ++checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" + +[[package]] +name = "arc-swap" @@ -2090,9 +1567,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "autocfg" -+version = "1.3.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "backtrace" @@ -2161,9 +1638,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "cc" -+version = "1.1.21" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" ++checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +dependencies = [ + "jobserver", + "libc", @@ -2178,9 +1655,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "cmake" -+version = "0.1.51" ++version = "0.1.52" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" ++checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" +dependencies = [ + "cc", +] @@ -2199,9 +1676,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "cpufeatures" -+version = "0.2.14" ++version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" ++checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +dependencies = [ + "libc", +] @@ -2398,9 +1875,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "flate2" -+version = "1.0.33" ++version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" ++checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +dependencies = [ + "crc32fast", + "libz-sys", @@ -2453,9 +1930,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "gimli" -+version = "0.31.0" ++version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" ++checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "hermit-abi" @@ -2487,9 +1964,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "itoa" -+version = "1.0.11" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" ++checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" + +[[package]] +name = "jobserver" @@ -2528,9 +2005,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "libc" -+version = "0.2.158" ++version = "0.2.165" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" ++checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" + +[[package]] +name = "libredox" @@ -2570,18 +2047,18 @@ index 000000000..13349e9c6 + +[[package]] +name = "lz4" -+version = "1.27.0" ++version = "1.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a231296ca742e418c43660cb68e082486ff2538e8db432bc818580f3965025ed" ++checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" +dependencies = [ + "lz4-sys", +] + +[[package]] +name = "lz4-sys" -+version = "1.11.0" ++version = "1.11.1+lz4-1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d" ++checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" +dependencies = [ + "cc", + "libc", @@ -2743,24 +2220,24 @@ index 000000000..13349e9c6 + +[[package]] +name = "object" -+version = "0.36.4" ++version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" ++checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" -+version = "1.19.0" ++version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" ++checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "openssl" -+version = "0.10.66" ++version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" ++checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", @@ -2784,18 +2261,18 @@ index 000000000..13349e9c6 + +[[package]] +name = "openssl-src" -+version = "300.3.2+3.3.2" ++version = "300.4.1+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" ++checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" -+version = "0.9.103" ++version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" ++checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", @@ -2806,21 +2283,21 @@ index 000000000..13349e9c6 + +[[package]] +name = "pin-project-lite" -+version = "0.2.14" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" ++checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" + +[[package]] +name = "pkg-config" -+version = "0.3.30" ++version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" ++checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "proc-macro2" -+version = "1.0.86" ++version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] @@ -2836,9 +2313,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "redox_syscall" -+version = "0.5.4" ++version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" ++checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags 2.6.0", +] @@ -2860,9 +2337,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "rustix" -+version = "0.38.37" ++version = "0.38.41" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" ++checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +dependencies = [ + "bitflags 2.6.0", + "errno", @@ -2888,18 +2365,18 @@ index 000000000..13349e9c6 + +[[package]] +name = "serde" -+version = "1.0.210" ++version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" ++checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.210" ++version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" ++checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +dependencies = [ + "proc-macro2", + "quote", @@ -2908,9 +2385,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "serde_json" -+version = "1.0.128" ++version = "1.0.133" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" ++checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +dependencies = [ + "itoa", + "memchr", @@ -2937,9 +2414,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "syn" -+version = "2.0.77" ++version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", @@ -2948,9 +2425,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "tar" -+version = "0.4.41" ++version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" ++checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" +dependencies = [ + "filetime", + "libc", @@ -2959,18 +2436,18 @@ index 000000000..13349e9c6 + +[[package]] +name = "thiserror" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.63" ++version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", @@ -2997,9 +2474,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "tokio" -+version = "1.40.0" ++version = "1.41.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" ++checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +dependencies = [ + "backtrace", + "pin-project-lite", @@ -3034,9 +2511,9 @@ index 000000000..13349e9c6 + +[[package]] +name = "unicode-ident" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" ++checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "vcpkg" @@ -3321,82 +2798,10 @@ index 000000000..13349e9c6 + "pkg-config", +] diff --git a/src/libs/Cargo.lock b/src/libs/Cargo.lock -index 8bf4e8e04..8a1803c06 100644 +index ed7184c48..0993cc287 100644 --- a/src/libs/Cargo.lock +++ b/src/libs/Cargo.lock -@@ -63,7 +63,7 @@ checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -117,7 +117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "fd9e32d7420c85055e8107e5b2463c4eeefeaac18b52359fe9f9c08a18f342b2" - dependencies = [ - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -152,7 +152,7 @@ dependencies = [ - "borsh-schema-derive-internal", - "proc-macro-crate", - "proc-macro2", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -163,7 +163,7 @@ checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -174,7 +174,7 @@ checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -213,7 +213,7 @@ checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -374,7 +374,7 @@ dependencies = [ - "ident_case", - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -399,7 +399,7 @@ checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" - dependencies = [ - "darling_core 0.14.4", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -413,6 +413,15 @@ dependencies = [ +@@ -400,6 +400,15 @@ dependencies = [ "syn 2.0.66", ] @@ -3412,58 +2817,7 @@ index 8bf4e8e04..8a1803c06 100644 [[package]] name = "derive-new" version = "0.5.9" -@@ -421,7 +430,7 @@ checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -576,7 +585,7 @@ checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -629,7 +638,7 @@ dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -795,9 +804,9 @@ dependencies = [ - - [[package]] - name = "itoa" --version = "1.0.1" -+version = "1.0.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" -+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - - [[package]] - name = "js-sys" -@@ -875,9 +884,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.155" -+version = "0.2.158" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - - [[package]] - name = "lock_api" -@@ -1009,6 +1018,12 @@ dependencies = [ +@@ -983,6 +992,12 @@ dependencies = [ "winapi", ] @@ -3476,28 +2830,7 @@ index 8bf4e8e04..8a1803c06 100644 [[package]] name = "num-integer" version = "0.1.44" -@@ -1040,9 +1055,9 @@ dependencies = [ - - [[package]] - name = "num_threads" --version = "0.1.6" -+version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" - dependencies = [ - "libc", - ] -@@ -1131,7 +1146,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1146,6 +1161,12 @@ version = "0.1.0" +@@ -1120,6 +1135,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" @@ -3510,64 +2843,7 @@ index 8bf4e8e04..8a1803c06 100644 [[package]] name = "ppv-lite86" version = "0.2.16" -@@ -1170,7 +1191,7 @@ dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - "version_check", - ] - -@@ -1187,9 +1208,9 @@ dependencies = [ - - [[package]] - name = "proc-macro2" --version = "1.0.85" -+version = "1.0.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" - dependencies = [ - "unicode-ident", - ] -@@ -1232,7 +1253,7 @@ dependencies = [ - "itertools", - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1342,14 +1363,14 @@ checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] - name = "quote" --version = "1.0.36" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" - dependencies = [ - "proc-macro2", - ] -@@ -1502,7 +1523,7 @@ checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1571,9 +1592,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +@@ -1544,9 +1565,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" @@ -3579,25 +2855,7 @@ index 8bf4e8e04..8a1803c06 100644 dependencies = [ "serde_derive", ] -@@ -1586,7 +1607,7 @@ checksum = "6eb8ec7724e4e524b2492b510e66957fe1a2c76c26a6975ec80823f2439da685" - dependencies = [ - "darling_core 0.14.4", - "serde-rename-rule", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1599,7 +1620,7 @@ dependencies = [ - "proc-macro2", - "quote", - "serde-attributes", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1610,13 +1631,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" +@@ -1583,13 +1604,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" [[package]] name = "serde_derive" @@ -3614,16 +2872,7 @@ index 8bf4e8e04..8a1803c06 100644 ] [[package]] -@@ -1649,7 +1670,7 @@ checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1730,7 +1751,7 @@ dependencies = [ +@@ -1703,7 +1724,7 @@ dependencies = [ "slog", "term", "thread_local", @@ -3632,33 +2881,7 @@ index 8bf4e8e04..8a1803c06 100644 ] [[package]] -@@ -1796,13 +1817,13 @@ dependencies = [ - - [[package]] - name = "syn" --version = "1.0.91" -+version = "1.0.109" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" -+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" - dependencies = [ - "proc-macro2", - "quote", -- "unicode-xid", -+ "unicode-ident", - ] - - [[package]] -@@ -1892,7 +1913,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - ] - - [[package]] -@@ -1916,13 +1937,16 @@ dependencies = [ +@@ -1889,13 +1910,16 @@ dependencies = [ [[package]] name = "time" @@ -3677,7 +2900,7 @@ index 8bf4e8e04..8a1803c06 100644 "serde", "time-core", "time-macros", -@@ -1930,16 +1954,17 @@ dependencies = [ +@@ -1903,16 +1927,17 @@ dependencies = [ [[package]] name = "time-core" @@ -3699,80 +2922,10 @@ index 8bf4e8e04..8a1803c06 100644 "time-core", ] -@@ -2090,9 +2115,9 @@ dependencies = [ - - [[package]] - name = "unicode-ident" --version = "1.0.12" -+version = "1.0.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - - [[package]] - name = "unicode-segmentation" -@@ -2100,12 +2125,6 @@ version = "1.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - --[[package]] --name = "unicode-xid" --version = "0.2.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -- - [[package]] - name = "utf8-width" - version = "0.1.7" -@@ -2177,7 +2196,7 @@ dependencies = [ - "log", - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - "wasm-bindgen-shared", - ] - -@@ -2199,7 +2218,7 @@ checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] diff --git a/src/runtime-rs/Cargo.lock b/src/runtime-rs/Cargo.lock -index 45e80c388..2a3408e93 100644 +index b838ca9c1..ac1341226 100644 --- a/src/runtime-rs/Cargo.lock +++ b/src/runtime-rs/Cargo.lock -@@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" - dependencies = [ - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -238,7 +238,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -316,7 +316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "78d456f91b4c1fdebf2698214e599fec3d7f8b46e3140fb254a9ea88c970ab0a" - dependencies = [ - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] @@ -571,7 +571,7 @@ dependencies = [ "signal-hook", "signal-hook-tokio", @@ -3782,76 +2935,7 @@ index 45e80c388..2a3408e93 100644 "tokio", "windows-sys 0.48.0", ] -@@ -749,7 +749,7 @@ dependencies = [ - "proc-macro2", - "quote", - "strsim", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -771,7 +771,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" - dependencies = [ - "darling_core 0.20.10", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -998,7 +998,7 @@ dependencies = [ - "darling 0.20.10", - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1008,7 +1008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" - dependencies = [ - "derive_builder_core", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1359,7 +1359,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1811,9 +1811,9 @@ dependencies = [ - - [[package]] - name = "itoa" --version = "1.0.9" -+version = "1.0.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - - [[package]] - name = "jobserver" -@@ -1922,9 +1922,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.153" -+version = "0.2.158" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - - [[package]] - name = "libz-sys" -@@ -2275,6 +2275,12 @@ dependencies = [ +@@ -2279,6 +2279,12 @@ dependencies = [ "winapi", ] @@ -3864,99 +2948,7 @@ index 45e80c388..2a3408e93 100644 [[package]] name = "num-traits" version = "0.2.16" -@@ -2296,9 +2302,9 @@ dependencies = [ - - [[package]] - name = "num_threads" --version = "0.1.6" -+version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" - dependencies = [ - "libc", - ] -@@ -2453,7 +2459,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2735,7 +2741,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2820,9 +2826,9 @@ dependencies = [ - - [[package]] - name = "proc-macro2" --version = "1.0.75" -+version = "1.0.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" - dependencies = [ - "unicode-ident", - ] -@@ -3062,9 +3068,9 @@ dependencies = [ - - [[package]] - name = "quote" --version = "1.0.35" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" - dependencies = [ - "proc-macro2", - ] -@@ -3576,9 +3582,9 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.194" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" - dependencies = [ - "serde_derive", - ] -@@ -3615,13 +3621,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" - - [[package]] - name = "serde_derive" --version = "1.0.194" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -3691,7 +3697,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -3884,7 +3890,7 @@ dependencies = [ +@@ -3889,7 +3895,7 @@ dependencies = [ "serde", "serde_json", "slog", @@ -3965,7 +2957,7 @@ index 45e80c388..2a3408e93 100644 ] [[package]] -@@ -3919,7 +3925,7 @@ dependencies = [ +@@ -3924,7 +3930,7 @@ dependencies = [ "slog", "term", "thread_local", @@ -3974,37 +2966,7 @@ index 45e80c388..2a3408e93 100644 ] [[package]] -@@ -3998,7 +4004,7 @@ dependencies = [ - "proc-macro2", - "quote", - "rustversion", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -4030,9 +4036,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.48" -+version = "2.0.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" - dependencies = [ - "proc-macro2", - "quote", -@@ -4138,7 +4144,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -4186,13 +4192,14 @@ dependencies = [ +@@ -4191,13 +4197,14 @@ dependencies = [ [[package]] name = "time" @@ -4021,7 +2983,7 @@ index 45e80c388..2a3408e93 100644 "num_threads", "powerfmt", "serde", -@@ -4208,10 +4215,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +@@ -4213,10 +4220,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" @@ -4035,100 +2997,70 @@ index 45e80c388..2a3408e93 100644 "time-core", ] -@@ -4266,7 +4274,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -4361,7 +4369,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - ] - - [[package]] -@@ -4481,9 +4489,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - - [[package]] - name = "unicode-ident" --version = "1.0.11" -+version = "1.0.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - - [[package]] - name = "unicode-normalization" -@@ -4755,7 +4763,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - "wasm-bindgen-shared", - ] - -@@ -4789,7 +4797,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.48", -+ "syn 2.0.77", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] diff --git a/src/tools/agent-ctl/Cargo.lock b/src/tools/agent-ctl/Cargo.lock -index 7ecbd1ac0..8de5438fb 100644 +index e4094eaf1..6e1abe6f1 100644 --- a/src/tools/agent-ctl/Cargo.lock +++ b/src/tools/agent-ctl/Cargo.lock -@@ -181,7 +181,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +@@ -224,7 +224,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -198,7 +198,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +@@ -241,7 +241,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -329,7 +329,7 @@ dependencies = [ +@@ -485,7 +485,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", "syn_derive", ] -@@ -631,7 +631,7 @@ dependencies = [ +@@ -887,7 +887,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" + dependencies = [ "proc-macro2", "quote", - "strsim 0.11.1", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -653,7 +653,16 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +@@ -934,7 +934,7 @@ dependencies = [ + "proc-macro2", + "quote", + "strsim 0.11.1", +- "syn 2.0.79", ++ "syn 2.0.87", + ] + + [[package]] +@@ -956,7 +956,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core 0.20.9", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", + ] + + [[package]] +@@ -986,7 +986,16 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.79", ++ "syn 2.0.87", +] + +[[package]] @@ -4141,68 +3073,44 @@ index 7ecbd1ac0..8de5438fb 100644 ] [[package]] -@@ -696,7 +705,7 @@ dependencies = [ +@@ -1029,7 +1038,7 @@ dependencies = [ "darling 0.20.9", "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -706,7 +715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1039,7 +1048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -764,7 +773,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +@@ -1159,7 +1168,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -903,7 +912,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +@@ -1373,7 +1382,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -1142,9 +1151,9 @@ dependencies = [ - - [[package]] - name = "itoa" --version = "1.0.6" -+version = "1.0.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" -+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - - [[package]] - name = "js-sys" -@@ -1240,9 +1249,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.155" -+version = "0.2.158" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - - [[package]] - name = "linux-raw-sys" -@@ -1379,6 +1388,12 @@ dependencies = [ - "winapi", +@@ -2474,6 +2483,12 @@ dependencies = [ + "zeroize", ] +[[package]] @@ -4212,23 +3120,20 @@ index 7ecbd1ac0..8de5438fb 100644 +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] - name = "num-traits" - version = "0.2.15" -@@ -1400,9 +1415,9 @@ dependencies = [ + name = "num-integer" + version = "0.1.46" +@@ -2820,7 +2835,7 @@ checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.79", ++ "syn 2.0.87", + ] [[package]] - name = "num_threads" --version = "0.1.6" -+version = "0.1.7" +@@ -2912,6 +2927,12 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" - dependencies = [ - "libc", - ] -@@ -1512,6 +1527,12 @@ dependencies = [ - "windows-sys 0.48.0", - ] + checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +[[package]] +name = "powerfmt" @@ -4239,126 +3144,84 @@ index 7ecbd1ac0..8de5438fb 100644 [[package]] name = "ppv-lite86" version = "0.2.17" -@@ -1554,9 +1575,9 @@ dependencies = [ - - [[package]] - name = "proc-macro2" --version = "1.0.85" -+version = "1.0.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" - dependencies = [ - "unicode-ident", - ] -@@ -1713,9 +1734,9 @@ dependencies = [ - - [[package]] - name = "quote" --version = "1.0.36" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" - dependencies = [ - "proc-macro2", - ] -@@ -2007,9 +2028,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +@@ -3755,9 +3776,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.163" -+version = "1.0.210" ++version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" ++checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] -@@ -2046,13 +2067,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" +@@ -3794,13 +3815,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" [[package]] name = "serde_derive" -version = "1.0.163" -+version = "1.0.210" ++version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" ++checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -2074,7 +2095,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +@@ -3822,7 +3843,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -2155,7 +2176,7 @@ dependencies = [ - "serde", - "serde_json", - "slog", -- "time 0.3.21", -+ "time 0.3.36", - ] - - [[package]] -@@ -2179,7 +2200,7 @@ dependencies = [ - "slog", - "term", - "thread_local", -- "time 0.3.21", -+ "time 0.3.36", - ] - - [[package]] -@@ -2236,7 +2257,7 @@ dependencies = [ +@@ -4107,7 +4128,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -2262,9 +2283,9 @@ dependencies = [ +@@ -4139,9 +4160,9 @@ dependencies = [ [[package]] name = "syn" --version = "2.0.18" -+version = "2.0.77" +-version = "2.0.79" ++version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" ++checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", -@@ -2280,7 +2301,7 @@ dependencies = [ +@@ -4157,7 +4178,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -2360,7 +2381,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +@@ -4252,7 +4273,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -2386,13 +2407,16 @@ dependencies = [ +@@ -4267,13 +4288,16 @@ dependencies = [ [[package]] name = "time" @@ -4377,7 +3240,7 @@ index 7ecbd1ac0..8de5438fb 100644 "serde", "time-core", "time-macros", -@@ -2400,16 +2424,17 @@ dependencies = [ +@@ -4281,16 +4305,17 @@ dependencies = [ [[package]] name = "time-core" @@ -4399,313 +3262,65 @@ index 7ecbd1ac0..8de5438fb 100644 "time-core", ] -@@ -2453,7 +2478,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +@@ -4327,7 +4352,7 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" dependencies = [ "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -2515,7 +2540,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +@@ -4365,7 +4390,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", ] [[package]] -@@ -2589,9 +2614,9 @@ dependencies = [ +@@ -4536,7 +4561,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.79", ++ "syn 2.0.87", + ] [[package]] - name = "unicode-ident" --version = "1.0.9" -+version = "1.0.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - - [[package]] - name = "unicode-segmentation" -@@ -2678,7 +2703,7 @@ dependencies = [ +@@ -4776,7 +4801,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", "wasm-bindgen-shared", ] -@@ -2700,7 +2725,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +@@ -4810,7 +4835,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", -- "syn 2.0.18", -+ "syn 2.0.77", +- "syn 2.0.79", ++ "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] +@@ -5330,7 +5355,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.79", ++ "syn 2.0.87", + ] + + [[package]] diff --git a/src/tools/kata-ctl/Cargo.lock b/src/tools/kata-ctl/Cargo.lock -index 2746bf64e..2b767bb25 100644 +index bd2de0038..e6a2e7960 100644 --- a/src/tools/kata-ctl/Cargo.lock +++ b/src/tools/kata-ctl/Cargo.lock -@@ -27,7 +27,7 @@ dependencies = [ - "log", - "logging", - "nix 0.24.3", -- "oci", -+ "oci-spec", - "protobuf 3.3.0", - "protocols", - "serde", -@@ -149,7 +149,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -218,7 +218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" - dependencies = [ - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -253,7 +253,7 @@ dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - "syn_derive", - ] - -@@ -376,7 +376,7 @@ dependencies = [ - "anstream", - "anstyle", - "clap_lex", -- "strsim", -+ "strsim 0.10.0", - ] - - [[package]] -@@ -388,7 +388,7 @@ dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -523,12 +523,12 @@ dependencies = [ - - [[package]] - name = "darling" --version = "0.20.3" -+version = "0.20.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" - dependencies = [ -- "darling_core 0.20.3", -- "darling_macro 0.20.3", -+ "darling_core 0.20.10", -+ "darling_macro 0.20.10", - ] - - [[package]] -@@ -546,16 +546,16 @@ dependencies = [ - - [[package]] - name = "darling_core" --version = "0.20.3" -+version = "0.20.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" - dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", -- "strsim", -- "syn 2.0.39", -+ "strsim 0.11.1", -+ "syn 2.0.77", - ] - - [[package]] -@@ -571,20 +571,20 @@ dependencies = [ - - [[package]] - name = "darling_macro" --version = "0.20.3" -+version = "0.20.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" - dependencies = [ -- "darling_core 0.20.3", -+ "darling_core 0.20.10", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] - name = "deranged" --version = "0.3.9" -+version = "0.3.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" - dependencies = [ - "powerfmt", - "serde", -@@ -601,6 +601,37 @@ dependencies = [ - "syn 1.0.109", - ] - -+[[package]] -+name = "derive_builder" -+version = "0.20.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" -+dependencies = [ -+ "derive_builder_macro", -+] -+ -+[[package]] -+name = "derive_builder_core" -+version = "0.20.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" -+dependencies = [ -+ "darling 0.20.10", -+ "proc-macro2", -+ "quote", -+ "syn 2.0.77", -+] -+ -+[[package]] -+name = "derive_builder_macro" -+version = "0.20.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" -+dependencies = [ -+ "derive_builder_core", -+ "syn 2.0.77", -+] -+ - [[package]] - name = "dirs-next" - version = "2.0.0" -@@ -788,7 +819,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -832,6 +863,18 @@ dependencies = [ - "wasi", - ] - -+[[package]] -+name = "getset" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c" -+dependencies = [ -+ "proc-macro-error2", -+ "proc-macro2", -+ "quote", -+ "syn 2.0.77", -+] -+ - [[package]] - name = "gimli" - version = "0.28.1" -@@ -893,6 +936,12 @@ version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -+[[package]] -+name = "heck" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -+ - [[package]] - name = "hermit-abi" - version = "0.1.19" -@@ -1118,9 +1167,9 @@ dependencies = [ - - [[package]] - name = "itoa" --version = "1.0.9" -+version = "1.0.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - - [[package]] - name = "js-sys" -@@ -1167,8 +1216,8 @@ dependencies = [ - "shim-interface", - "slog", - "slog-scope", -- "strum", -- "strum_macros", -+ "strum 0.24.1", -+ "strum_macros 0.24.3", - "sys-info", - "tempfile", - "test-utils", -@@ -1195,9 +1244,10 @@ dependencies = [ - "lazy_static", - "libc", - "nix 0.24.3", -- "oci", -+ "oci-spec", - "once_cell", - "rand", -+ "runtime-spec", - "safe-path", - "serde", - "serde_json", -@@ -1218,7 +1268,7 @@ dependencies = [ - "glob", - "lazy_static", - "num_cpus", -- "oci", -+ "oci-spec", - "regex", - "safe-path", - "serde", -@@ -1239,9 +1289,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.155" -+version = "0.2.158" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - - [[package]] - name = "libredox" -@@ -1440,6 +1490,12 @@ dependencies = [ +@@ -1476,6 +1476,12 @@ dependencies = [ "winapi", ] @@ -4718,287 +3333,7 @@ index 2746bf64e..2b767bb25 100644 [[package]] name = "num-traits" version = "0.2.17" -@@ -1461,9 +1517,9 @@ dependencies = [ - - [[package]] - name = "num_threads" --version = "0.1.6" -+version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" - dependencies = [ - "libc", - ] -@@ -1478,20 +1534,27 @@ dependencies = [ - ] - - [[package]] --name = "oci" --version = "0.1.0" -+name = "oci-spec" -+version = "0.6.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f5a3fe998d50101ae009351fec56d88a69f4ed182e11000e711068c2f5abf72" - dependencies = [ -- "libc", -+ "derive_builder", -+ "getset", -+ "once_cell", -+ "regex", - "serde", -- "serde_derive", - "serde_json", -+ "strum 0.26.3", -+ "strum_macros 0.26.4", -+ "thiserror", - ] - - [[package]] - name = "once_cell" --version = "1.18.0" -+version = "1.19.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - - [[package]] - name = "openssl" -@@ -1516,7 +1579,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1618,7 +1681,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1693,11 +1756,33 @@ dependencies = [ - "version_check", - ] - -+[[package]] -+name = "proc-macro-error-attr2" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+] -+ -+[[package]] -+name = "proc-macro-error2" -+version = "2.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -+dependencies = [ -+ "proc-macro-error-attr2", -+ "proc-macro2", -+ "quote", -+ "syn 2.0.77", -+] -+ - [[package]] - name = "proc-macro2" --version = "1.0.70" -+version = "1.0.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" - dependencies = [ - "unicode-ident", - ] -@@ -1879,7 +1964,8 @@ name = "protocols" - version = "0.1.0" - dependencies = [ - "async-trait", -- "oci", -+ "kata-sys-util", -+ "oci-spec", - "protobuf 3.3.0", - "ttrpc 0.8.1", - "ttrpc-codegen", -@@ -1917,9 +2003,9 @@ dependencies = [ - - [[package]] - name = "quote" --version = "1.0.33" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" - dependencies = [ - "proc-macro2", - ] -@@ -2011,9 +2097,9 @@ dependencies = [ - - [[package]] - name = "regex" --version = "1.10.2" -+version = "1.10.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" - dependencies = [ - "aho-corasick", - "memchr", -@@ -2023,9 +2109,9 @@ dependencies = [ - - [[package]] - name = "regex-automata" --version = "0.4.3" -+version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" - dependencies = [ - "aho-corasick", - "memchr", -@@ -2145,6 +2231,16 @@ dependencies = [ - "serde_derive", - ] - -+[[package]] -+name = "runtime-spec" -+version = "0.1.0" -+dependencies = [ -+ "libc", -+ "serde", -+ "serde_derive", -+ "serde_json", -+] -+ - [[package]] - name = "rust_decimal" - version = "1.35.0" -@@ -2306,9 +2402,9 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - - [[package]] - name = "serde" --version = "1.0.193" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" - dependencies = [ - "serde_derive", - ] -@@ -2345,13 +2441,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" - - [[package]] - name = "serde_derive" --version = "1.0.193" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2399,10 +2495,10 @@ version = "2.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" - dependencies = [ -- "darling 0.20.3", -+ "darling 0.20.10", - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2569,12 +2665,24 @@ version = "0.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -+[[package]] -+name = "strsim" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -+ - [[package]] - name = "strum" - version = "0.24.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" - -+[[package]] -+name = "strum" -+version = "0.26.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -+ - [[package]] - name = "strum_macros" - version = "0.24.3" -@@ -2588,6 +2696,19 @@ dependencies = [ - "syn 1.0.109", - ] - -+[[package]] -+name = "strum_macros" -+version = "0.26.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -+dependencies = [ -+ "heck 0.5.0", -+ "proc-macro2", -+ "quote", -+ "rustversion", -+ "syn 2.0.77", -+] -+ - [[package]] - name = "subprocess" - version = "0.2.9" -@@ -2611,9 +2732,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.39" -+version = "2.0.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" - dependencies = [ - "proc-macro2", - "quote", -@@ -2629,7 +2750,7 @@ dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2738,7 +2859,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2753,13 +2874,14 @@ dependencies = [ +@@ -2855,13 +2861,14 @@ dependencies = [ [[package]] name = "time" @@ -5015,7 +3350,7 @@ index 2746bf64e..2b767bb25 100644 "num_threads", "powerfmt", "serde", -@@ -2775,10 +2897,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +@@ -2877,10 +2884,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" @@ -5029,287 +3364,8 @@ index 2746bf64e..2b767bb25 100644 "time-core", ] -@@ -2823,7 +2946,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2924,7 +3047,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - ] - - [[package]] -@@ -3013,9 +3136,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - - [[package]] - name = "unicode-ident" --version = "1.0.12" -+version = "1.0.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - - [[package]] - name = "unicode-normalization" -@@ -3141,7 +3264,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - "wasm-bindgen-shared", - ] - -@@ -3175,7 +3298,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.39", -+ "syn 2.0.77", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] -diff --git a/src/tools/runk/Cargo.lock b/src/tools/runk/Cargo.lock -index e1afc6f91..94492e0be 100644 ---- a/src/tools/runk/Cargo.lock -+++ b/src/tools/runk/Cargo.lock -@@ -201,7 +201,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -236,7 +236,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -314,7 +314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" - dependencies = [ - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -371,7 +371,7 @@ dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - "syn_derive", - ] - -@@ -721,7 +721,7 @@ dependencies = [ - "proc-macro2", - "quote", - "strsim 0.11.1", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -754,7 +754,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" - dependencies = [ - "darling_core 0.20.9", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -827,7 +827,7 @@ dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -847,7 +847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" - dependencies = [ - "derive_builder_core 0.20.0", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -905,7 +905,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -1100,7 +1100,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2097,9 +2097,9 @@ dependencies = [ - - [[package]] - name = "quote" --version = "1.0.36" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" - dependencies = [ - "proc-macro2", - ] -@@ -2435,9 +2435,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - - [[package]] - name = "serde" --version = "1.0.203" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" - dependencies = [ - "serde_derive", - ] -@@ -2474,13 +2474,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" - - [[package]] - name = "serde_derive" --version = "1.0.203" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2502,7 +2502,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2660,7 +2660,7 @@ dependencies = [ - "proc-macro2", - "quote", - "rustversion", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2686,9 +2686,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.68" -+version = "2.0.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" - dependencies = [ - "proc-macro2", - "quote", -@@ -2704,7 +2704,7 @@ dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2805,7 +2805,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2891,7 +2891,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -2963,7 +2963,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - ] - - [[package]] -@@ -3038,9 +3038,9 @@ dependencies = [ - - [[package]] - name = "unicode-ident" --version = "1.0.12" -+version = "1.0.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - - [[package]] - name = "unicode-segmentation" -@@ -3125,7 +3125,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - "wasm-bindgen-shared", - ] - -@@ -3147,7 +3147,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.68", -+ "syn 2.0.77", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] diff --git a/src/tools/trace-forwarder/Cargo.lock b/src/tools/trace-forwarder/Cargo.lock -index 6e2791328..6aa19b3f6 100644 +index 6e2791328..7713e245c 100644 --- a/src/tools/trace-forwarder/Cargo.lock +++ b/src/tools/trace-forwarder/Cargo.lock @@ -141,9 +141,12 @@ dependencies = [ @@ -5327,30 +3383,6 @@ index 6e2791328..6aa19b3f6 100644 [[package]] name = "dirs-next" -@@ -288,9 +291,9 @@ checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" - - [[package]] - name = "itoa" --version = "1.0.1" -+version = "1.0.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" -+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - - [[package]] - name = "js-sys" -@@ -334,9 +337,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.112" -+version = "0.2.158" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" -+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - - [[package]] - name = "log" @@ -389,6 +392,12 @@ dependencies = [ "memoffset", ] @@ -5364,18 +3396,6 @@ index 6e2791328..6aa19b3f6 100644 [[package]] name = "num-integer" version = "0.1.44" -@@ -420,9 +429,9 @@ dependencies = [ - - [[package]] - name = "num_threads" --version = "0.1.6" -+version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" - dependencies = [ - "libc", - ] @@ -528,6 +537,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" @@ -5389,57 +3409,6 @@ index 6e2791328..6aa19b3f6 100644 [[package]] name = "ppv-lite86" version = "0.2.15" -@@ -558,18 +573,18 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - - [[package]] - name = "proc-macro2" --version = "1.0.67" -+version = "1.0.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" - dependencies = [ - "unicode-ident", - ] - - [[package]] - name = "quote" --version = "1.0.33" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" - dependencies = [ - "proc-macro2", - ] -@@ -657,22 +672,22 @@ checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" - - [[package]] - name = "serde" --version = "1.0.188" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.188" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.33", -+ "syn 2.0.77", - ] - - [[package]] @@ -752,7 +767,7 @@ dependencies = [ "slog", "term", @@ -5449,18 +3418,6 @@ index 6e2791328..6aa19b3f6 100644 ] [[package]] -@@ -780,9 +795,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.33" -+version = "2.0.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" -+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" - dependencies = [ - "proc-macro2", - "quote", @@ -892,14 +907,16 @@ dependencies = [ [[package]] @@ -5502,18 +3459,6 @@ index 6e2791328..6aa19b3f6 100644 "time-core", ] -@@ -992,9 +1010,9 @@ dependencies = [ - - [[package]] - name = "unicode-ident" --version = "1.0.12" -+version = "1.0.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - - [[package]] - name = "unicode-width" -- -2.43.5 +2.47.0 diff --git a/1005-build-Fix-RPM-build-fail-due-to-AGENT_POLICY.patch b/1005-build-Fix-RPM-build-fail-due-to-AGENT_POLICY.patch deleted file mode 100644 index e50e4fe..0000000 --- a/1005-build-Fix-RPM-build-fail-due-to-AGENT_POLICY.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e989e7ee4e0f7a4b838dc0ef80a5f1e237db2113 Mon Sep 17 00:00:00 2001 -From: Emanuel Lima -Date: Mon, 7 Oct 2024 15:23:02 -0300 -Subject: [PATCH] build: Fix RPM build fail due to AGENT_POLICY - -By checking for AGENT_POLICY we ensure we only try to read -allow-all.rego if AGENT_POLICY is set to "yes" - -Signed-off-by: Emanuel Lima ---- - tools/osbuilder/rootfs-builder/rootfs.sh | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh -index 21816a2cf..04a855a0c 100755 ---- a/tools/osbuilder/rootfs-builder/rootfs.sh -+++ b/tools/osbuilder/rootfs-builder/rootfs.sh -@@ -39,7 +39,9 @@ PAUSE_IMAGE_TARBALL=${PAUSE_IMAGE_TARBALL:-""} - lib_file="${script_dir}/../scripts/lib.sh" - source "$lib_file" - --agent_policy_file="$(readlink -f -v "${AGENT_POLICY_FILE:-"${script_dir}/../../../src/kata-opa/allow-all.rego"}")" -+if [[ "${AGENT_POLICY}" == "yes" ]]; then -+ agent_policy_file="$(readlink -f -v "${AGENT_POLICY_FILE:-"${script_dir}/../../../src/kata-opa/allow-all.rego"}")" -+fi - - #For cross build - CROSS_BUILD=${CROSS_BUILD:-false} -@@ -361,7 +363,9 @@ check_env_variables() - - [ -n "${KERNEL_MODULES_DIR}" ] && [ ! -d "${KERNEL_MODULES_DIR}" ] && die "KERNEL_MODULES_DIR defined but is not an existing directory" - -- [ ! -f "${agent_policy_file}" ] && die "agent policy file not found in '${agent_policy_file}'" -+ if [[ "${AGENT_POLICY}" == "yes" ]]; then -+ [ ! -f "${agent_policy_file}" ] && die "agent policy file not found in '${agent_policy_file}'" -+ fi - - [ -n "${OSBUILDER_VERSION}" ] || die "need osbuilder version" - } -@@ -724,7 +728,7 @@ EOF - fi - fi - -- if [ "${AGENT_POLICY}" == "yes" ]; then -+ if [[ "${AGENT_POLICY}" == "yes" ]]; then - info "Install the default policy" - # Install default settings for the kata-opa service. - local opa_settings_dir="/etc/kata-opa" --- -2.43.5 - diff --git a/kata-containers.spec b/kata-containers.spec index 6b5eace..e76bc36 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 3.9.0 +Version: 3.11.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -69,9 +69,8 @@ Patch0999: 0999-osbuilder-Adjust-agent_version-for-our-builds.patch Patch1000: 1000-Remove-shebang-in-non-executable-completion-script.patch Patch1001: 1001-Remove-warnings-as-compilation-errors.patch Patch1002: 1002-Remove-warnings-as-errors-from-genpolicy.patch -Patch1003: 1003-Fix-time-dependency-compilation-error.patch +Patch1003: 1003-Bumping-time-dependency-for-Kata.patch Patch1004: 1004-Fix-arch-name-compilation-failure.patch -Patch1005: 1005-build-Fix-RPM-build-fail-due-to-AGENT_POLICY.patch %if 0%{?have_go_rpm_macros} BuildRequires: go-rpm-macros @@ -393,6 +392,9 @@ fi %changelog +* Tue Nov 26 2024 Emanuel Lima - 3.11.0-1 +- kata-containers 3.11.0 + * Mon Oct 07 2024 Emanuel Lima - 3.9.0-1 - kata-containers 3.9.0 Fix warnings as compilation errors patch diff --git a/sources b/sources index e5dfd6d..f95ca4b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.9.0-vendor.tar.gz) = e4e4d9f8b6154d9e9a1e16fc889796871fd973413469d570c709232ef6e4e8b4cac07e0b1db2b12250ec0c2ad89f16b3a76c6aae9ed6c32a07ba2856b7e792fd -SHA512 (kata-containers-3.9.0.tar.gz) = e2bb0bf6c3ef4e5635c9a6be080168f3217d6597c63493aca99c820d9d02628534873bb49269d2b7b20fadbb8833b709dd830f2f935cabe389205022042000af +SHA512 (kata-containers-3.11.0-vendor.tar.gz) = 1cab9180f2aa123322308bcef28effe5b2cd2627157e882c39d39096b5de72e6afa57494f3cbf32c3f9dda82435cbd39e08c180fccd390d8152db392f6e4a751 +SHA512 (kata-containers-3.11.0.tar.gz) = 968b99b4b711811c24572643be7183d646698a174ecba2747176a6a95f9e9156bb23807eb9d9f769868f5fc9b03078112c12a6051d92c0d750ccf29b568e12a2 From c7176d99b35d6b7645dce6aeb52590019c606139 Mon Sep 17 00:00:00 2001 From: Emanuel Lima Date: Mon, 6 Jan 2025 16:35:05 -0300 Subject: [PATCH 42/65] Bump to Kata 3.12.0 Signed-off-by: Emanuel Lima --- .gitignore | 2 + ...emove-warnings-as-compilation-errors.patch | 175 ++++--- ...> 1002-Bump-time-dependency-for-Kata.patch | 482 +++++++++++------- 1002-Fix-invalid-target_arch.patch | 77 --- ...ve-warnings-as-errors-from-genpolicy.patch | 39 -- ...03-Fix-arch-name-compilation-failure.patch | 114 ++--- 1003-Remove-genpolicy-warning-errors.patch | 39 -- kata-containers.spec | 13 +- sources | 4 +- 9 files changed, 452 insertions(+), 493 deletions(-) rename 1003-Bumping-time-dependency-for-Kata.patch => 1002-Bump-time-dependency-for-Kata.patch (88%) delete mode 100644 1002-Fix-invalid-target_arch.patch delete mode 100644 1002-Remove-warnings-as-errors-from-genpolicy.patch rename 1004-Fix-arch-name-compilation-failure.patch => 1003-Fix-arch-name-compilation-failure.patch (83%) delete mode 100644 1003-Remove-genpolicy-warning-errors.patch diff --git a/.gitignore b/.gitignore index ca2ace5..cd18957 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ /kata-containers-3.9.0.tar.gz /kata-containers-3.11.0-vendor.tar.gz /kata-containers-3.11.0.tar.gz +/kata-containers-3.12.0-vendor.tar.gz +/kata-containers-3.12.0.tar.gz diff --git a/1001-Remove-warnings-as-compilation-errors.patch b/1001-Remove-warnings-as-compilation-errors.patch index c2110a8..3bae429 100644 --- a/1001-Remove-warnings-as-compilation-errors.patch +++ b/1001-Remove-warnings-as-compilation-errors.patch @@ -1,175 +1,212 @@ -From f8f40b91620577323b0167eda66b2a3885d1031e Mon Sep 17 00:00:00 2001 +From 983b1fb5ba4a4b8ecbb24938b3fd055c007a73d8 Mon Sep 17 00:00:00 2001 From: Emanuel Lima -Date: Thu, 25 Jul 2024 12:01:32 -0300 +Date: Mon, 6 Jan 2025 16:11:19 -0300 Subject: [PATCH] Remove warnings as compilation errors -This is blocking kata-containers to be built with rust 1.79 - Signed-off-by: Emanuel Lima --- - src/agent/Makefile | 4 +- - src/dragonball/Makefile | 1 - - src/libs/Makefile | 1 - - src/runtime-rs/Makefile | 4 +- - src/tools/agent-ctl/Makefile | 4 +- - src/tools/kata-ctl/Makefile | 6 +- - src/tools/runk/Makefile | 2 +- - src/tools/trace-forwarder/Makefile | 2 +- - utils.mk | 1 - - 9 files changed + src/agent/Makefile | 4 ++-- + src/dragonball/Makefile | 4 ++-- + src/libs/Makefile | 2 +- + src/runtime-rs/Makefile | 4 ++-- + src/tools/agent-ctl/Makefile | 4 ++-- + src/tools/genpolicy/Makefile | 6 +++--- + src/tools/kata-ctl/Makefile | 6 +++--- + src/tools/runk/Makefile | 2 +- + src/tools/trace-forwarder/Makefile | 2 +- + utils.mk | 2 +- + 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/agent/Makefile b/src/agent/Makefile -index e0e76a9cd..5b8b3b0d5 100644 +index e62a894aa..39d351213 100644 --- a/src/agent/Makefile +++ b/src/agent/Makefile @@ -134,14 +134,14 @@ static-checks-build: $(GENERATED_CODE) $(TARGET): $(GENERATED_CODE) $(TARGET_PATH) - + $(TARGET_PATH): show-summary - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) - ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + $(GENERATED_FILES): %: %.in @sed $(foreach r,$(GENERATED_REPLACEMENTS),-e 's|@$r@|$($r)|g') "$<" > "$@" - + ##TARGET optimize: optimized build optimize: show-summary show-header - @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -+ @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) - ++ @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + ##TARGET install: install agent install: install-services diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile -index 40bb7f915..27f12c30b 100644 +index 40bb7f915..5eb2c1016 100644 --- a/src/dragonball/Makefile +++ b/src/dragonball/Makefile -@@ -27,7 +27,6 @@ clippy: +@@ -27,14 +27,14 @@ clippy: @echo "INFO: cargo clippy..." cargo clippy --all-targets --all-features \ -- \ - -D warnings - ++ + vendor: @echo "INFO: vendor do nothing.." + + format: + @echo "INFO: rust fmt..." +- # This is kinda dirty step here simply because cargo fmt --all will apply fmt to all dependencies of dragonball which will include /src/libs/protocols with some file generated during compilation time and could not be formatted when you use cargo fmt --all before building the whole project. In order to avoid this problem, we do fmt check in this following way. ++ # This is kinda dirty step here simply because cargo fmt --all will apply fmt to all dependencies of dragonball which will include /src/libs/protocols with some file generated during compilation time and could not be formatted when you use cargo fmt --all before building the whole project. In order to avoid this problem, we do fmt check in this following way. + rustfmt --edition 2018 ./src/dbs_address_space/src/lib.rs ./src/dbs_allocator/src/lib.rs ./src/dbs_arch/src/lib.rs ./src/dbs_boot/src/lib.rs ./src/dbs_device/src/lib.rs ./src/dbs_interrupt/src/lib.rs ./src/dbs_legacy_devices/src/lib.rs ./src/dbs_pci/src/lib.rs ./src/dbs_upcall/src/lib.rs ./src/dbs_utils/src/lib.rs ./src/dbs_virtio_devices/src/lib.rs ./src/lib.rs --check + + clean: diff --git a/src/libs/Makefile b/src/libs/Makefile -index aabaa3391..c79d437f9 100644 +index aabaa3391..1fb6b20c3 100644 --- a/src/libs/Makefile +++ b/src/libs/Makefile -@@ -25,7 +25,6 @@ clippy: +@@ -25,7 +25,7 @@ clippy: @echo "INFO: cargo clippy..." cargo clippy --all-targets --all-features --release \ -- \ - -D warnings - ++ + format: @echo "INFO: cargo fmt..." diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile -index 7e1c787cc..f282facff 100644 +index 0bb0617ff..188040864 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile -@@ -559,7 +559,7 @@ static-checks-build: $(GENERATED_FILES) +@@ -580,7 +580,7 @@ static-checks-build: $(GENERATED_FILES) $(TARGET): $(GENERATED_FILES) $(TARGET_PATH) - + $(TARGET_PATH): $(SOURCES) | show-summary -- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) - +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + $(GENERATED_FILES): %: %.in @sed \ -@@ -569,7 +569,7 @@ $(GENERATED_FILES): %: %.in - +@@ -590,7 +590,7 @@ $(GENERATED_FILES): %: %.in + ##TARGET optimize: optimized build optimize: $(SOURCES) | show-summary show-header - @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) -+ @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) - ++ @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) + ##TARGET clean: clean build clean: clean-generated-files diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile -index a49f88e6b..3a7354b70 100644 +index a49f88e6b..855017db4 100644 --- a/src/tools/agent-ctl/Makefile +++ b/src/tools/agent-ctl/Makefile @@ -13,7 +13,7 @@ endif default: build - + build: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) - ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) + static-checks-build: @echo "INFO: static-checks-build do nothing.." @@ -27,7 +27,7 @@ vendor: test: - + install: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo install --locked --target $(TRIPLE) --path . - ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo install --locked --target $(TRIPLE) --path . + check: standard_rust_check - + +diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile +index 7410e20ed..b33541467 100644 +--- a/src/tools/genpolicy/Makefile ++++ b/src/tools/genpolicy/Makefile +@@ -28,7 +28,7 @@ $(GENERATED_FILES): %: %.in + default: build + + build: $(GENERATED_FILES) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) + + static-checks-build: + @echo "INFO: static-checks-build do nothing.." +@@ -41,10 +41,10 @@ vendor: + cargo vendor + + test: $(GENERATED_FILES) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo test --all-targets --all-features --target $(TRIPLE) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo test --all-targets --all-features --target $(TRIPLE) + + install: $(GENERATED_FILES) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo install --locked --target $(TRIPLE) --path . + + check: $(GENERATED_CODE) standard_rust_check + diff --git a/src/tools/kata-ctl/Makefile b/src/tools/kata-ctl/Makefile -index 7595c0c23..0fb312c63 100644 +index 7595c0c23..05d171f5a 100644 --- a/src/tools/kata-ctl/Makefile +++ b/src/tools/kata-ctl/Makefile @@ -43,7 +43,7 @@ default: $(TARGET) build $(TARGET): $(GENERATED_CODE) - + build: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) - ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + static-checks-build: $(GENERATED_CODE) - + @@ -59,10 +59,10 @@ vendor: cargo vendor - + test: $(GENERATED_CODE) - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo test --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -- --nocapture -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo test --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -- --nocapture - ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo test --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -- --nocapture + install: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . --root $(INSTALL_PATH) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo install --locked --target $(TRIPLE) --path . --root $(INSTALL_PATH) - ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo install --locked --target $(TRIPLE) --path . --root $(INSTALL_PATH) + check: $(GENERATED_CODE) standard_rust_check - + diff --git a/src/tools/runk/Makefile b/src/tools/runk/Makefile -index 186955679..633e0416a 100644 +index 186955679..b23cab145 100644 --- a/src/tools/runk/Makefile +++ b/src/tools/runk/Makefile @@ -36,7 +36,7 @@ endif default: build - + build: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) - ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) + static-checks-build: @echo "INFO: static-checks-build do nothing.." diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Makefile -index 5d9f71856..249520a1f 100644 +index 5d9f71856..bf6b80a54 100644 --- a/src/tools/trace-forwarder/Makefile +++ b/src/tools/trace-forwarder/Makefile @@ -13,7 +13,7 @@ endif default: build - + build: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) - ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) + static-checks-build: @echo "INFO: static-checks-build do nothing.." diff --git a/utils.mk b/utils.mk -index 1a153e26c..14c575f8d 100644 +index 1a153e26c..4edba5524 100644 --- a/utils.mk +++ b/utils.mk -@@ -176,7 +176,6 @@ standard_rust_check: +@@ -176,7 +176,7 @@ standard_rust_check: cargo fmt -- --check cargo clippy --all-targets --all-features --release \ -- \ - -D warnings - ++ + # Install a file (full version). # --- -2.43.5 +-- +2.47.1 + diff --git a/1003-Bumping-time-dependency-for-Kata.patch b/1002-Bump-time-dependency-for-Kata.patch similarity index 88% rename from 1003-Bumping-time-dependency-for-Kata.patch rename to 1002-Bump-time-dependency-for-Kata.patch index 1edbef8..0447de9 100644 --- a/1003-Bumping-time-dependency-for-Kata.patch +++ b/1002-Bump-time-dependency-for-Kata.patch @@ -1,11 +1,15 @@ -From 1f6af40aea0bd48cbf8c441bf468ff202e11d586 Mon Sep 17 00:00:00 2001 +From 953623cb82571abe35b83ff94a2c6f2dea120cfe Mon Sep 17 00:00:00 2001 From: Emanuel Lima -Date: Tue, 26 Nov 2024 16:15:14 -0300 -Subject: [PATCH] Bumping time dependency for Kata v3.11.0 +Date: Mon, 6 Jan 2025 15:02:50 -0300 +Subject: [PATCH] Bump time dependency for Kata + +This is necessary to make Kata compilable +by the latest stable Rust (v1.83.0) Signed-off-by: Emanuel Lima --- - src/dragonball/Cargo.lock | 34 +- + src/agent/Cargo.lock | 10 +- + src/dragonball/Cargo.lock | 36 +- src/dragonball/src/dbs_acpi/Cargo.lock | 48 + .../src/dbs_address_space/Cargo.lock | 187 +++ src/dragonball/src/dbs_allocator/Cargo.lock | 65 + @@ -15,13 +19,14 @@ Signed-off-by: Emanuel Lima src/dragonball/src/dbs_interrupt/Cargo.lock | 179 +++ .../src/dbs_legacy_devices/Cargo.lock | 289 ++++ src/dragonball/src/dbs_tdx/Cargo.lock | 149 ++ - src/dragonball/src/dbs_upcall/Cargo.lock | 1275 +++++++++++++++++ - src/libs/Cargo.lock | 49 +- - src/runtime-rs/Cargo.lock | 22 +- - src/tools/agent-ctl/Cargo.lock | 95 +- - src/tools/kata-ctl/Cargo.lock | 16 +- - src/tools/trace-forwarder/Cargo.lock | 36 +- - 16 files changed, 2795 insertions(+), 75 deletions(-) + src/dragonball/src/dbs_upcall/Cargo.lock | 1266 +++++++++++++++++ + src/libs/Cargo.lock | 51 +- + src/runtime-rs/Cargo.lock | 24 +- + src/tools/agent-ctl/Cargo.lock | 97 +- + src/tools/kata-ctl/Cargo.lock | 18 +- + src/tools/runk/Cargo.lock | 10 +- + src/tools/trace-forwarder/Cargo.lock | 38 +- + 18 files changed, 2802 insertions(+), 91 deletions(-) create mode 100644 src/dragonball/src/dbs_acpi/Cargo.lock create mode 100644 src/dragonball/src/dbs_address_space/Cargo.lock create mode 100644 src/dragonball/src/dbs_allocator/Cargo.lock @@ -33,10 +38,54 @@ Signed-off-by: Emanuel Lima create mode 100644 src/dragonball/src/dbs_tdx/Cargo.lock create mode 100644 src/dragonball/src/dbs_upcall/Cargo.lock +diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock +index 67b183027..69abb8310 100644 +--- a/src/agent/Cargo.lock ++++ b/src/agent/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "addr2line" +@@ -6125,9 +6125,9 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.36" ++version = "0.3.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" + dependencies = [ + "deranged", + "itoa", +@@ -6146,9 +6146,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.18" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" + dependencies = [ + "num-conv", + "time-core", diff --git a/src/dragonball/Cargo.lock b/src/dragonball/Cargo.lock -index bb758d1f8..26eb61d22 100644 +index bb758d1f8..ef6f5fffa 100644 --- a/src/dragonball/Cargo.lock +++ b/src/dragonball/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "addr2line" @@ -428,9 +428,12 @@ dependencies = [ [[package]] @@ -83,10 +132,10 @@ index bb758d1f8..26eb61d22 100644 [[package]] name = "time" -version = "0.3.28" -+version = "0.3.36" ++version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -110,10 +159,10 @@ index bb758d1f8..26eb61d22 100644 [[package]] name = "time-macros" -version = "0.2.14" -+version = "0.2.18" ++version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ + "num-conv", "time-core", @@ -121,13 +170,13 @@ index bb758d1f8..26eb61d22 100644 diff --git a/src/dragonball/src/dbs_acpi/Cargo.lock b/src/dragonball/src/dbs_acpi/Cargo.lock new file mode 100644 -index 000000000..3bbbdef49 +index 000000000..417a27c3b --- /dev/null +++ b/src/dragonball/src/dbs_acpi/Cargo.lock @@ -0,0 +1,48 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "dbs-acpi" @@ -138,9 +187,9 @@ index 000000000..3bbbdef49 + +[[package]] +name = "libc" -+version = "0.2.165" ++version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" ++checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "vm-memory" @@ -175,13 +224,13 @@ index 000000000..3bbbdef49 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/dragonball/src/dbs_address_space/Cargo.lock b/src/dragonball/src/dbs_address_space/Cargo.lock new file mode 100644 -index 000000000..974189c3e +index 000000000..60f441054 --- /dev/null +++ b/src/dragonball/src/dbs_address_space/Cargo.lock @@ -0,0 +1,187 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "arc-swap" @@ -203,9 +252,9 @@ index 000000000..974189c3e + +[[package]] +name = "cc" -+version = "1.2.1" ++version = "1.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" ++checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +dependencies = [ + "shlex", +] @@ -237,9 +286,9 @@ index 000000000..974189c3e + +[[package]] +name = "libc" -+version = "0.2.165" ++version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" ++checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "memoffset" @@ -274,9 +323,9 @@ index 000000000..974189c3e + +[[package]] +name = "quote" -+version = "1.0.37" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] @@ -289,9 +338,9 @@ index 000000000..974189c3e + +[[package]] +name = "syn" -+version = "2.0.89" ++version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" ++checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +dependencies = [ + "proc-macro2", + "quote", @@ -368,13 +417,13 @@ index 000000000..974189c3e +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/dragonball/src/dbs_allocator/Cargo.lock b/src/dragonball/src/dbs_allocator/Cargo.lock new file mode 100644 -index 000000000..380ba4896 +index 000000000..a05af8cb0 --- /dev/null +++ b/src/dragonball/src/dbs_allocator/Cargo.lock @@ -0,0 +1,65 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "dbs-allocator" @@ -394,18 +443,18 @@ index 000000000..380ba4896 + +[[package]] +name = "quote" -+version = "1.0.37" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "syn" -+version = "2.0.89" ++version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" ++checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +dependencies = [ + "proc-macro2", + "quote", @@ -439,13 +488,13 @@ index 000000000..380ba4896 +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" diff --git a/src/dragonball/src/dbs_arch/Cargo.lock b/src/dragonball/src/dbs_arch/Cargo.lock new file mode 100644 -index 000000000..b64200e86 +index 000000000..4b12784e3 --- /dev/null +++ b/src/dragonball/src/dbs_arch/Cargo.lock @@ -0,0 +1,160 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "autocfg" @@ -494,9 +543,9 @@ index 000000000..b64200e86 + +[[package]] +name = "libc" -+version = "0.2.165" ++version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" ++checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "memoffset" @@ -518,18 +567,18 @@ index 000000000..b64200e86 + +[[package]] +name = "quote" -+version = "1.0.37" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "syn" -+version = "2.0.89" ++version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" ++checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +dependencies = [ + "proc-macro2", + "quote", @@ -605,13 +654,13 @@ index 000000000..b64200e86 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/dragonball/src/dbs_boot/Cargo.lock b/src/dragonball/src/dbs_boot/Cargo.lock new file mode 100644 -index 000000000..44aa72910 +index 000000000..8e833d480 --- /dev/null +++ b/src/dragonball/src/dbs_boot/Cargo.lock @@ -0,0 +1,201 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "autocfg" @@ -695,9 +744,9 @@ index 000000000..44aa72910 + +[[package]] +name = "libc" -+version = "0.2.165" ++version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" ++checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "memoffset" @@ -719,18 +768,18 @@ index 000000000..44aa72910 + +[[package]] +name = "quote" -+version = "1.0.37" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "syn" -+version = "2.0.89" ++version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" ++checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +dependencies = [ + "proc-macro2", + "quote", @@ -812,13 +861,13 @@ index 000000000..44aa72910 +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/dragonball/src/dbs_device/Cargo.lock b/src/dragonball/src/dbs_device/Cargo.lock new file mode 100644 -index 000000000..638d662f0 +index 000000000..8452cc5bb --- /dev/null +++ b/src/dragonball/src/dbs_device/Cargo.lock @@ -0,0 +1,65 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "dbs-device" @@ -838,18 +887,18 @@ index 000000000..638d662f0 + +[[package]] +name = "quote" -+version = "1.0.37" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "syn" -+version = "2.0.89" ++version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" ++checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +dependencies = [ + "proc-macro2", + "quote", @@ -883,13 +932,13 @@ index 000000000..638d662f0 +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" diff --git a/src/dragonball/src/dbs_interrupt/Cargo.lock b/src/dragonball/src/dbs_interrupt/Cargo.lock new file mode 100644 -index 000000000..613a1f50d +index 000000000..3af378eda --- /dev/null +++ b/src/dragonball/src/dbs_interrupt/Cargo.lock @@ -0,0 +1,179 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "autocfg" @@ -957,9 +1006,9 @@ index 000000000..613a1f50d + +[[package]] +name = "libc" -+version = "0.2.165" ++version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" ++checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "memoffset" @@ -981,18 +1030,18 @@ index 000000000..613a1f50d + +[[package]] +name = "quote" -+version = "1.0.37" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "syn" -+version = "2.0.89" ++version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" ++checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +dependencies = [ + "proc-macro2", + "quote", @@ -1068,19 +1117,19 @@ index 000000000..613a1f50d +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/dragonball/src/dbs_legacy_devices/Cargo.lock b/src/dragonball/src/dbs_legacy_devices/Cargo.lock new file mode 100644 -index 000000000..613870b71 +index 000000000..3587e954b --- /dev/null +++ b/src/dragonball/src/dbs_legacy_devices/Cargo.lock @@ -0,0 +1,289 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "anyhow" -+version = "1.0.93" ++version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" ++checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" + +[[package]] +name = "bitflags" @@ -1130,9 +1179,9 @@ index 000000000..613870b71 + +[[package]] +name = "errno" -+version = "0.3.9" ++version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" ++checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +dependencies = [ + "libc", + "windows-sys", @@ -1150,9 +1199,9 @@ index 000000000..613870b71 + +[[package]] +name = "libc" -+version = "0.2.165" ++version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" ++checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "linux-raw-sys" @@ -1177,18 +1226,18 @@ index 000000000..613870b71 + +[[package]] +name = "quote" -+version = "1.0.37" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rustix" -+version = "0.38.41" ++version = "0.38.42" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" ++checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +dependencies = [ + "bitflags 2.6.0", + "errno", @@ -1199,18 +1248,18 @@ index 000000000..613870b71 + +[[package]] +name = "serde" -+version = "1.0.215" ++version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" ++checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.215" ++version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" ++checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +dependencies = [ + "proc-macro2", + "quote", @@ -1219,9 +1268,9 @@ index 000000000..613870b71 + +[[package]] +name = "syn" -+version = "2.0.89" ++version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" ++checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +dependencies = [ + "proc-macro2", + "quote", @@ -1291,9 +1340,9 @@ index 000000000..613870b71 + +[[package]] +name = "windows-sys" -+version = "0.52.0" ++version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] @@ -1363,13 +1412,13 @@ index 000000000..613870b71 +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/src/dragonball/src/dbs_tdx/Cargo.lock b/src/dragonball/src/dbs_tdx/Cargo.lock new file mode 100644 -index 000000000..4f6b6628e +index 000000000..f5db1bd23 --- /dev/null +++ b/src/dragonball/src/dbs_tdx/Cargo.lock @@ -0,0 +1,149 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "bitflags" @@ -1404,9 +1453,9 @@ index 000000000..4f6b6628e + +[[package]] +name = "libc" -+version = "0.2.165" ++version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" ++checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "memchr" @@ -1425,9 +1474,9 @@ index 000000000..4f6b6628e + +[[package]] +name = "quote" -+version = "1.0.37" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] @@ -1440,18 +1489,18 @@ index 000000000..4f6b6628e + +[[package]] +name = "serde" -+version = "1.0.215" ++version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" ++checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.215" ++version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" ++checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +dependencies = [ + "proc-macro2", + "quote", @@ -1460,9 +1509,9 @@ index 000000000..4f6b6628e + +[[package]] +name = "serde_json" -+version = "1.0.133" ++version = "1.0.134" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" ++checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +dependencies = [ + "itoa", + "memchr", @@ -1472,9 +1521,9 @@ index 000000000..4f6b6628e + +[[package]] +name = "syn" -+version = "2.0.89" ++version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" ++checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +dependencies = [ + "proc-macro2", + "quote", @@ -1518,13 +1567,13 @@ index 000000000..4f6b6628e +] diff --git a/src/dragonball/src/dbs_upcall/Cargo.lock b/src/dragonball/src/dbs_upcall/Cargo.lock new file mode 100644 -index 000000000..4897e09dd +index 000000000..c50a43f0a --- /dev/null +++ b/src/dragonball/src/dbs_upcall/Cargo.lock -@@ -0,0 +1,1275 @@ +@@ -0,0 +1,1266 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "addr2line" @@ -1543,9 +1592,9 @@ index 000000000..4897e09dd + +[[package]] +name = "anyhow" -+version = "1.0.93" ++version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" ++checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" + +[[package]] +name = "arc-swap" @@ -1600,9 +1649,9 @@ index 000000000..4897e09dd + +[[package]] +name = "blake3" -+version = "1.5.4" ++version = "1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" ++checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" +dependencies = [ + "arrayref", + "arrayvec", @@ -1638,9 +1687,9 @@ index 000000000..4897e09dd + +[[package]] +name = "cc" -+version = "1.2.1" ++version = "1.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" ++checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +dependencies = [ + "jobserver", + "libc", @@ -1843,12 +1892,12 @@ index 000000000..4897e09dd + +[[package]] +name = "errno" -+version = "0.3.9" ++version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" ++checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +dependencies = [ + "libc", -+ "windows-sys 0.52.0", ++ "windows-sys 0.59.0", +] + +[[package]] @@ -2005,9 +2054,9 @@ index 000000000..4897e09dd + +[[package]] +name = "libc" -+version = "0.2.165" ++version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" ++checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "libredox" @@ -2081,9 +2130,9 @@ index 000000000..4897e09dd + +[[package]] +name = "miniz_oxide" -+version = "0.8.0" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" ++checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +dependencies = [ + "adler2", +] @@ -2220,9 +2269,9 @@ index 000000000..4897e09dd + +[[package]] +name = "object" -+version = "0.36.5" ++version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" ++checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] @@ -2283,9 +2332,9 @@ index 000000000..4897e09dd + +[[package]] +name = "pin-project-lite" -+version = "0.2.15" ++version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" ++checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pkg-config" @@ -2304,18 +2353,18 @@ index 000000000..4897e09dd + +[[package]] +name = "quote" -+version = "1.0.37" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" ++checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" -+version = "0.5.7" ++version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" ++checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +dependencies = [ + "bitflags 2.6.0", +] @@ -2337,15 +2386,15 @@ index 000000000..4897e09dd + +[[package]] +name = "rustix" -+version = "0.38.41" ++version = "0.38.42" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" ++checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", -+ "windows-sys 0.52.0", ++ "windows-sys 0.59.0", +] + +[[package]] @@ -2365,18 +2414,18 @@ index 000000000..4897e09dd + +[[package]] +name = "serde" -+version = "1.0.215" ++version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" ++checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.215" ++version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" ++checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +dependencies = [ + "proc-macro2", + "quote", @@ -2385,9 +2434,9 @@ index 000000000..4897e09dd + +[[package]] +name = "serde_json" -+version = "1.0.133" ++version = "1.0.134" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" ++checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +dependencies = [ + "itoa", + "memchr", @@ -2414,9 +2463,9 @@ index 000000000..4897e09dd + +[[package]] +name = "syn" -+version = "2.0.89" ++version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" ++checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +dependencies = [ + "proc-macro2", + "quote", @@ -2474,9 +2523,9 @@ index 000000000..4897e09dd + +[[package]] +name = "tokio" -+version = "1.41.1" ++version = "1.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" ++checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +dependencies = [ + "backtrace", + "pin-project-lite", @@ -2621,15 +2670,6 @@ index 000000000..4897e09dd + +[[package]] +name = "windows-sys" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -+dependencies = [ -+ "windows-targets 0.52.6", -+] -+ -+[[package]] -+name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" @@ -2760,9 +2800,9 @@ index 000000000..4897e09dd + +[[package]] +name = "xattr" -+version = "1.3.1" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" ++checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909" +dependencies = [ + "libc", + "linux-raw-sys", @@ -2798,9 +2838,17 @@ index 000000000..4897e09dd + "pkg-config", +] diff --git a/src/libs/Cargo.lock b/src/libs/Cargo.lock -index ed7184c48..0993cc287 100644 +index ed7184c48..4a2b6cf72 100644 --- a/src/libs/Cargo.lock +++ b/src/libs/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "addr2line" @@ -400,6 +400,15 @@ dependencies = [ "syn 2.0.66", ] @@ -2877,7 +2925,7 @@ index ed7184c48..0993cc287 100644 "term", "thread_local", - "time 0.3.22", -+ "time 0.3.36", ++ "time 0.3.37", ] [[package]] @@ -2886,10 +2934,10 @@ index ed7184c48..0993cc287 100644 [[package]] name = "time" -version = "0.3.22" -+version = "0.3.36" ++version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ + "deranged", "itoa", @@ -2913,25 +2961,33 @@ index ed7184c48..0993cc287 100644 [[package]] name = "time-macros" -version = "0.2.9" -+version = "0.2.18" ++version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ + "num-conv", "time-core", ] diff --git a/src/runtime-rs/Cargo.lock b/src/runtime-rs/Cargo.lock -index b838ca9c1..ac1341226 100644 +index b838ca9c1..83191f16a 100644 --- a/src/runtime-rs/Cargo.lock +++ b/src/runtime-rs/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "actix-macros" @@ -571,7 +571,7 @@ dependencies = [ "signal-hook", "signal-hook-tokio", "thiserror", - "time 0.3.31", -+ "time 0.3.36", ++ "time 0.3.37", "tokio", "windows-sys 0.48.0", ] @@ -2953,7 +3009,7 @@ index b838ca9c1..ac1341226 100644 "serde_json", "slog", - "time 0.3.31", -+ "time 0.3.36", ++ "time 0.3.37", ] [[package]] @@ -2962,7 +3018,7 @@ index b838ca9c1..ac1341226 100644 "term", "thread_local", - "time 0.3.31", -+ "time 0.3.36", ++ "time 0.3.37", ] [[package]] @@ -2971,10 +3027,10 @@ index b838ca9c1..ac1341226 100644 [[package]] name = "time" -version = "0.3.31" -+version = "0.3.36" ++version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -2988,19 +3044,27 @@ index b838ca9c1..ac1341226 100644 [[package]] name = "time-macros" -version = "0.2.16" -+version = "0.2.18" ++version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ + "num-conv", "time-core", ] diff --git a/src/tools/agent-ctl/Cargo.lock b/src/tools/agent-ctl/Cargo.lock -index e4094eaf1..6e1abe6f1 100644 +index e4094eaf1..5a354a226 100644 --- a/src/tools/agent-ctl/Cargo.lock +++ b/src/tools/agent-ctl/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "addr2line" @@ -224,7 +224,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", @@ -3149,10 +3213,10 @@ index e4094eaf1..6e1abe6f1 100644 [[package]] name = "serde" -version = "1.0.163" -+version = "1.0.215" ++version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" ++checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -3161,10 +3225,10 @@ index e4094eaf1..6e1abe6f1 100644 [[package]] name = "serde_derive" -version = "1.0.163" -+version = "1.0.215" ++version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" ++checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -3226,10 +3290,10 @@ index e4094eaf1..6e1abe6f1 100644 [[package]] name = "time" -version = "0.3.21" -+version = "0.3.36" ++version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ + "deranged", "itoa", @@ -3253,10 +3317,10 @@ index e4094eaf1..6e1abe6f1 100644 [[package]] name = "time-macros" -version = "0.2.9" -+version = "0.2.18" ++version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ + "num-conv", "time-core", @@ -3317,9 +3381,17 @@ index e4094eaf1..6e1abe6f1 100644 [[package]] diff --git a/src/tools/kata-ctl/Cargo.lock b/src/tools/kata-ctl/Cargo.lock -index bd2de0038..e6a2e7960 100644 +index bd2de0038..a61832901 100644 --- a/src/tools/kata-ctl/Cargo.lock +++ b/src/tools/kata-ctl/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "addr2line" @@ -1476,6 +1476,12 @@ dependencies = [ "winapi", ] @@ -3338,10 +3410,10 @@ index bd2de0038..e6a2e7960 100644 [[package]] name = "time" -version = "0.3.30" -+version = "0.3.36" ++version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -3355,19 +3427,63 @@ index bd2de0038..e6a2e7960 100644 [[package]] name = "time-macros" -version = "0.2.15" -+version = "0.2.18" ++version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ + "num-conv", "time-core", ] +diff --git a/src/tools/runk/Cargo.lock b/src/tools/runk/Cargo.lock +index 6f41aef6e..1d1795937 100644 +--- a/src/tools/runk/Cargo.lock ++++ b/src/tools/runk/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "addr2line" +@@ -2820,9 +2820,9 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.36" ++version = "0.3.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" + dependencies = [ + "deranged", + "itoa", +@@ -2841,9 +2841,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.18" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" + dependencies = [ + "num-conv", + "time-core", diff --git a/src/tools/trace-forwarder/Cargo.lock b/src/tools/trace-forwarder/Cargo.lock -index 6e2791328..7713e245c 100644 +index 6e2791328..5f54aa2be 100644 --- a/src/tools/trace-forwarder/Cargo.lock +++ b/src/tools/trace-forwarder/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "ansi_term" @@ -141,9 +141,12 @@ dependencies = [ [[package]] @@ -3414,7 +3530,7 @@ index 6e2791328..7713e245c 100644 "term", "thread_local", - "time 0.3.28", -+ "time 0.3.36", ++ "time 0.3.37", ] [[package]] @@ -3423,10 +3539,10 @@ index 6e2791328..7713e245c 100644 [[package]] name = "time" -version = "0.3.28" -+version = "0.3.36" ++version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -3450,15 +3566,15 @@ index 6e2791328..7713e245c 100644 [[package]] name = "time-macros" -version = "0.2.14" -+version = "0.2.18" ++version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ + "num-conv", "time-core", ] -- -2.47.0 +2.47.1 diff --git a/1002-Fix-invalid-target_arch.patch b/1002-Fix-invalid-target_arch.patch deleted file mode 100644 index 63e1ca9..0000000 --- a/1002-Fix-invalid-target_arch.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 9dcd503753ef484610278dee111f224b96e647d9 Mon Sep 17 00:00:00 2001 -From: Emanuel Lima -Date: Mon, 26 Aug 2024 11:50:10 -0300 -Subject: [PATCH] Fix invalid target_arch - -Based on https://github.com/kata-containers/kata-containers/pull/10079 - -Signed-off-by: Emanuel Lima ---- - src/libs/kata-sys-util/src/protection.rs | 4 ++-- - src/tools/kata-ctl/src/arch/mod.rs | 6 +++--- - src/tools/kata-ctl/src/arch/powerpc64le/mod.rs | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/libs/kata-sys-util/src/protection.rs b/src/libs/kata-sys-util/src/protection.rs -index 74ccd5006..ac9a21c15 100644 ---- a/src/libs/kata-sys-util/src/protection.rs -+++ b/src/libs/kata-sys-util/src/protection.rs -@@ -14,7 +14,7 @@ use std::path::Path; - use std::path::PathBuf; - use thiserror::Error; - --#[cfg(any(target_arch = "s390x", target_arch = "powerpc64le"))] -+#[cfg(any(target_arch = "s390x", target_arch = "powerpc64"))] - use nix::unistd::Uid; - - #[cfg(target_arch = "x86_64")] -@@ -234,7 +234,7 @@ pub fn available_guest_protection() -> Result - Ok(GuestProtection::Se) - } - --#[cfg(target_arch = "powerpc64le")] -+#[cfg(all(target_arch = "powerpc64", target_endian = "little"))] - pub fn available_guest_protection() -> Result { - if !Uid::effective().is_root() { - return Err(check::ProtectionError::NoPerms); -diff --git a/src/tools/kata-ctl/src/arch/mod.rs b/src/tools/kata-ctl/src/arch/mod.rs -index b0010955d..949e1aad5 100644 ---- a/src/tools/kata-ctl/src/arch/mod.rs -+++ b/src/tools/kata-ctl/src/arch/mod.rs -@@ -8,9 +8,9 @@ pub mod aarch64; - #[cfg(target_arch = "aarch64")] - pub use aarch64 as arch_specific; - --#[cfg(target_arch = "powerpc64le")] -+#[cfg(all(target_arch = "powerpc64", target_endian = "little"))] - pub mod powerpc64le; --#[cfg(target_arch = "powerpc64le")] -+#[cfg(all(target_arch = "powerpc64", target_endian = "little"))] - pub use powerpc64le as arch_specific; - - #[cfg(target_arch = "s390x")] -@@ -25,7 +25,7 @@ pub use x86_64 as arch_specific; - - #[cfg(not(any( - target_arch = "aarch64", -- target_arch = "powerpc64le", -+ target_arch = "powerpc64", - target_arch = "s390x", - target_arch = "x86_64" - )))] -diff --git a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs b/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs -index bf5822c04..b59d1539c 100644 ---- a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs -+++ b/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs -@@ -4,7 +4,7 @@ - // - - use crate::types::*; --#[cfg(target_arch = "powerpc64le")] -+#[cfg(all(target_arch = "powerpc64", target_endian = "little"))] - pub use arch_specific::*; - - mod arch_specific { --- -2.43.5 - diff --git a/1002-Remove-warnings-as-errors-from-genpolicy.patch b/1002-Remove-warnings-as-errors-from-genpolicy.patch deleted file mode 100644 index cdf9977..0000000 --- a/1002-Remove-warnings-as-errors-from-genpolicy.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d370d9900c13a7fc2023ddf5af794f45b97b9d0f Mon Sep 17 00:00:00 2001 -From: Emanuel Lima -Date: Mon, 23 Sep 2024 10:48:55 -0300 -Subject: [PATCH] Remove warnings as errors from genpolicy - -Signed-off-by: Emanuel Lima ---- - src/tools/genpolicy/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile -index 7410e20ed..567431257 100644 ---- a/src/tools/genpolicy/Makefile -+++ b/src/tools/genpolicy/Makefile -@@ -28,7 +28,7 @@ $(GENERATED_FILES): %: %.in - default: build - - build: $(GENERATED_FILES) -- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) - - static-checks-build: - @echo "INFO: static-checks-build do nothing.." -@@ -41,10 +41,10 @@ vendor: - cargo vendor - - test: $(GENERATED_FILES) -- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo test --all-targets --all-features --target $(TRIPLE) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo test --all-targets --all-features --target $(TRIPLE) - - install: $(GENERATED_FILES) -- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo install --locked --target $(TRIPLE) --path . - - check: $(GENERATED_CODE) standard_rust_check - --- -2.43.5 - diff --git a/1004-Fix-arch-name-compilation-failure.patch b/1003-Fix-arch-name-compilation-failure.patch similarity index 83% rename from 1004-Fix-arch-name-compilation-failure.patch rename to 1003-Fix-arch-name-compilation-failure.patch index b59da11..8ae61a4 100644 --- a/1004-Fix-arch-name-compilation-failure.patch +++ b/1003-Fix-arch-name-compilation-failure.patch @@ -1,37 +1,7 @@ -From 0f83ea2f61e31a4e181f5d6141ef9a8594a03df5 Mon Sep 17 00:00:00 2001 +From 7cca06342688f838f1b5c13d5f8fb8800e55f0d9 Mon Sep 17 00:00:00 2001 From: Emanuel Lima -Date: Mon, 16 Sep 2024 10:40:00 -0300 -Subject: [PATCH] build: Fix compilation failure with Rust v1.80 - -Starting with version 1.80, the Rust linter does not accept an invalid -value for `target_arch` in configuration checks: - -``` - Compiling kata-sys-util v0.1.0 (/home/ddd/Work/kata/kata-containers/src/libs/kata-sys-util) -error: unexpected `cfg` condition value: `powerpc64le` - - --> /home/ddd/Work/kata/kata-containers/src/libs/kata-sys-util/src/protection.rs:17:34 - | -17 | #[cfg(any(target_arch = "s390x", target_arch = "powerpc64le"))] - | ^^^^^^^^^^^^^^------------- - | | - | help: there is a expected value with a similar name: `"powerpc64"` - | - = note: expected values for `target_arch` are: `aarch64`, `arm`, `arm64ec`, `avr`, `bpf`, `csky`, `hexagon`, `loongarch64`, `m68k`, `mips`, `mips32r6`, `mips64`, `mips64r6`, `msp430`, `nvptx64`, `powerpc`, `powerpc64`, `riscv32`, `riscv64`, `s390x`, `sparc`, `sparc64`, `wasm32`, `wasm64`, `x86`, and `x86_64` - = note: see for more information about checking conditional configuration - = note: `-D unexpected-cfgs` implied by `-D warnings` - = help: to override `-D warnings` add `#[allow(unexpected_cfgs)]` -``` - -According [to GitHub user @Urgau][explain], this is a new warning -introduced in Rust 1.80, but the problem exists before. The correct -architecture name should be `powerpc64`, and the differentiation -between `powerpc64le` and `powerpc64` should use the `target_endian = -"little"` check. - -[explain]: #10072 (comment) - -Fixes: #10067 +Date: Mon, 6 Jan 2025 16:18:26 -0300 +Subject: [PATCH] Fix arch name compilation failure Signed-off-by: Christophe de Dinechin [emlima: fix some more occurences and typos] @@ -45,7 +15,7 @@ Signed-off-by: Emanuel Lima src/tools/genpolicy/Makefile | 2 +- src/tools/kata-ctl/Cross.toml | 2 +- src/tools/kata-ctl/src/arch/mod.rs | 10 +++++----- - .../src/arch/{powerpc64le => powerpc64}/mod.rs | 4 ++-- + src/tools/kata-ctl/src/arch/powerpc64le/mod.rs | 4 ++-- src/tools/runk/Makefile | 2 +- src/tools/trace-forwarder/Makefile | 2 +- tests/common.bash | 4 ++-- @@ -57,17 +27,16 @@ Signed-off-by: Emanuel Lima tools/packaging/scripts/configure-hypervisor.sh | 2 +- tools/packaging/static-build/agent/Dockerfile | 2 +- .../static-build/coco-guest-components/Dockerfile | 2 +- - tools/packaging/static-build/qemu/Dockerfile | 4 ++-- + tools/packaging/static-build/qemu/Dockerfile | 3 +-- tools/packaging/static-build/shim-v2/Dockerfile | 12 ++++++------ tools/packaging/static-build/shim-v2/build.sh | 2 +- .../packaging/static-build/virtiofsd/gnu/Dockerfile | 2 +- .../packaging/static-build/virtiofsd/musl/Dockerfile | 2 +- utils.mk | 2 +- - 26 files changed, 44 insertions(+), 44 deletions(-) - rename src/tools/kata-ctl/src/arch/{powerpc64le => powerpc64}/mod.rs (89%) + 26 files changed, 43 insertions(+), 44 deletions(-) diff --git a/docs/Developer-Guide.md b/docs/Developer-Guide.md -index 4b2260571..fa13eaac8 100644 +index dcb88d49a..14928ea0a 100644 --- a/docs/Developer-Guide.md +++ b/docs/Developer-Guide.md @@ -239,7 +239,7 @@ The agent is built with a statically linked `musl.` The default `libc` used is ` @@ -103,7 +72,7 @@ index 4b2260571..fa13eaac8 100644 ``` diff --git a/src/agent/Makefile b/src/agent/Makefile -index e62a894aa..893f40d4a 100644 +index 39d351213..1f818ebaf 100644 --- a/src/agent/Makefile +++ b/src/agent/Makefile @@ -54,7 +54,7 @@ endif @@ -116,7 +85,7 @@ index e62a894aa..893f40d4a 100644 ##VAR STANDARD_OCI_RUNTIME=yes|no define if agent enables standard oci runtime feature diff --git a/src/libs/kata-sys-util/src/protection.rs b/src/libs/kata-sys-util/src/protection.rs -index 74ccd5006..623170d75 100644 +index 74ccd5006..dba40a5d5 100644 --- a/src/libs/kata-sys-util/src/protection.rs +++ b/src/libs/kata-sys-util/src/protection.rs @@ -14,7 +14,7 @@ use std::path::Path; @@ -133,12 +102,12 @@ index 74ccd5006..623170d75 100644 } -#[cfg(target_arch = "powerpc64le")] -+#[cfg(all(target_arch = "powerpc64"))] ++#[cfg(target_arch = "powerpc64")] pub fn available_guest_protection() -> Result { if !Uid::effective().is_root() { return Err(check::ProtectionError::NoPerms); diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile -index 707e3ab5f..e3631f3e6 100644 +index 188040864..46912d480 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -18,7 +18,7 @@ CONTAINERD_RUNTIME_NAME = io.containerd.kata.v2 @@ -160,7 +129,7 @@ index 707e3ab5f..e3631f3e6 100644 @echo "PowerPC 64 LE is not currently supported" exit 0 diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile -index a49f88e6b..da2b545e0 100644 +index 855017db4..cf168e862 100644 --- a/src/tools/agent-ctl/Makefile +++ b/src/tools/agent-ctl/Makefile @@ -6,7 +6,7 @@ @@ -173,7 +142,7 @@ index a49f88e6b..da2b545e0 100644 .DEFAULT_GOAL := default diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile -index 7410e20ed..a4351a89f 100644 +index b33541467..f1b4b754a 100644 --- a/src/tools/genpolicy/Makefile +++ b/src/tools/genpolicy/Makefile @@ -7,7 +7,7 @@ @@ -197,7 +166,7 @@ index 88f18e96e..e07b885a8 100644 +[target.powerpc64-unknown-linux-gnu] pre-build = ["dpkg --add-architecture ppc64le && apt-get update && apt-get install -y libssl-dev:ppc64le"] diff --git a/src/tools/kata-ctl/src/arch/mod.rs b/src/tools/kata-ctl/src/arch/mod.rs -index b0010955d..26543088a 100644 +index b0010955d..aa6a527ff 100644 --- a/src/tools/kata-ctl/src/arch/mod.rs +++ b/src/tools/kata-ctl/src/arch/mod.rs @@ -8,10 +8,10 @@ pub mod aarch64; @@ -208,9 +177,9 @@ index b0010955d..26543088a 100644 -pub mod powerpc64le; -#[cfg(target_arch = "powerpc64le")] -pub use powerpc64le as arch_specific; -+#[cfg(all(target_arch = "powerpc64"))] ++#[cfg(target_arch = "powerpc64")] +pub mod powerpc64; -+#[cfg(all(target_arch = "powerpc64"))] ++#[cfg(target_arch = "powerpc64")] +pub use powerpc64 as arch_specific; #[cfg(target_arch = "s390x")] @@ -224,19 +193,16 @@ index b0010955d..26543088a 100644 target_arch = "s390x", target_arch = "x86_64" )))] -diff --git a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs b/src/tools/kata-ctl/src/arch/powerpc64/mod.rs -similarity index 89% -rename from src/tools/kata-ctl/src/arch/powerpc64le/mod.rs -rename to src/tools/kata-ctl/src/arch/powerpc64/mod.rs -index bf5822c04..4437cb895 100644 +diff --git a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs b/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs +index bf5822c04..dbd09e651 100644 --- a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs -+++ b/src/tools/kata-ctl/src/arch/powerpc64/mod.rs ++++ b/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs @@ -4,7 +4,7 @@ // use crate::types::*; -#[cfg(target_arch = "powerpc64le")] -+#[cfg(all(target_arch = "powerpc64"))] ++#[cfg(target_arch = "powerpc64")] pub use arch_specific::*; mod arch_specific { @@ -250,7 +216,7 @@ index bf5822c04..4437cb895 100644 pub fn get_checks() -> Option<&'static [CheckItem<'static>]> { diff --git a/src/tools/runk/Makefile b/src/tools/runk/Makefile -index 186955679..fbbfcc423 100644 +index b23cab145..af85ba6d6 100644 --- a/src/tools/runk/Makefile +++ b/src/tools/runk/Makefile @@ -9,7 +9,7 @@ LIBC ?= gnu @@ -263,7 +229,7 @@ index 186955679..fbbfcc423 100644 TARGET = runk diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Makefile -index 5d9f71856..2ea1b2a7f 100644 +index bf6b80a54..81de556c7 100644 --- a/src/tools/trace-forwarder/Makefile +++ b/src/tools/trace-forwarder/Makefile @@ -6,7 +6,7 @@ @@ -276,10 +242,10 @@ index 5d9f71856..2ea1b2a7f 100644 .DEFAULT_GOAL := default diff --git a/tests/common.bash b/tests/common.bash -index 7374d0942..3317eff29 100644 +index ca8b59bbf..78f894287 100644 --- a/tests/common.bash +++ b/tests/common.bash -@@ -595,7 +595,7 @@ function clone_cri_containerd() { +@@ -601,7 +601,7 @@ function clone_cri_containerd() { # version: the version of the tarball that will be downloaded # tarball-name: the name of the tarball that will be downloaded function download_github_project_tarball() { @@ -288,7 +254,7 @@ index 7374d0942..3317eff29 100644 version="${2}" tarball_name="${3}" -@@ -746,7 +746,7 @@ function arch_to_rust() { +@@ -752,7 +752,7 @@ function arch_to_rust() { case "${arch}" in aarch64) echo "${arch}";; @@ -324,10 +290,10 @@ index 38146ef72..1a6643fe0 100755 echo "${arch}" diff --git a/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in b/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in -index 4360fa619..f1cc8ac96 100644 +index d67bceb99..6ea7e3d23 100644 --- a/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in +++ b/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in -@@ -34,7 +34,7 @@ RUN apt-get update && \ +@@ -33,7 +33,7 @@ RUN apt-get update && \ $(gcc_arch="@ARCH@" && [ "$(uname -m)" != "$gcc_arch" ] && ( \ libc_arch="$gcc_arch" && \ [ "$gcc_arch" = aarch64 ] && libc_arch=arm64; \ @@ -336,7 +302,7 @@ index 4360fa619..f1cc8ac96 100644 [ "$gcc_arch" = s390x ] && gcc_arch=s390x && libc_arch=s390x; \ [ "$gcc_arch" = x86_64 ] && gcc_arch=x86-64 && libc_arch=amd64; \ echo "gcc-$gcc_arch-linux-gnu libc6-dev-$libc_arch-cross")) \ -@@ -76,7 +76,7 @@ RUN ARCH=$(uname -m); \ +@@ -77,7 +77,7 @@ RUN ARCH=$(uname -m); \ libc=""; \ case "${ARCH}" in \ "aarch64") rust_arch="${ARCH}"; libc="musl"; ;; \ @@ -372,7 +338,7 @@ index 5e3687595..670e58c24 100644 [ -n "${http_proxy:-}" ] && readonly set_proxy="RUN sed -i '$ a proxy="${http_proxy:-}"' /etc/dnf/dnf.conf /etc/yum.conf; true" diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh -index f88536dec..612164176 100755 +index 73f51817b..6e948d183 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -213,7 +213,7 @@ generate_qemu_options() { @@ -411,10 +377,10 @@ index d5fcedb05..1b7054f31 100644 "s390x") rust_arch="${ARCH}" ;; \ *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ diff --git a/tools/packaging/static-build/qemu/Dockerfile b/tools/packaging/static-build/qemu/Dockerfile -index f8e477f07..fecd03f04 100644 +index 7a910958f..2560fc7da 100644 --- a/tools/packaging/static-build/qemu/Dockerfile +++ b/tools/packaging/static-build/qemu/Dockerfile -@@ -65,14 +65,14 @@ RUN apt-get update && apt-get upgrade -y && \ +@@ -67,7 +67,6 @@ RUN apt-get update && apt-get upgrade -y && \ rsync \ zlib1g-dev${DPKG_ARCH} && \ if [ "${ARCH}" != s390x ]; then apt-get install -y --no-install-recommends libpmem-dev${DPKG_ARCH}; fi && \ @@ -422,15 +388,7 @@ index f8e477f07..fecd03f04 100644 + GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64"; fi && \ if [ "${ARCH}" != "$(uname -m)" ]; then apt-get install --no-install-recommends -y gcc-"${GCC_ARCH}"-linux-gnu; fi && \ apt-get clean && rm -rf /var/lib/apt/lists/ - - RUN git clone https://github.com/axboe/liburing/ ~/liburing && \ - cd ~/liburing && \ - git checkout tags/liburing-2.1 && \ -- GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64le"; fi && \ -+ GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64"; fi && \ - if [ "${ARCH}" != "$(uname -m)" ]; then PREFIX="${GCC_ARCH}-linux-gnu"; fi && \ - ./configure --cc=${GCC_ARCH}-linux-gnu-gcc --cxx=${GCC_ARCH}-linux-gnu-cpp --prefix=/usr/${PREFIX}/ && \ - make && make install && ldconfig +- diff --git a/tools/packaging/static-build/shim-v2/Dockerfile b/tools/packaging/static-build/shim-v2/Dockerfile index 808f24346..cc3930e1f 100644 --- a/tools/packaging/static-build/shim-v2/Dockerfile @@ -477,10 +435,10 @@ index 808f24346..cc3930e1f 100644 # aarch64 requires this name -- link for all RUN ln -s /usr/bin/musl-gcc "/usr/bin/$(uname -m)-linux-musl-gcc" diff --git a/tools/packaging/static-build/shim-v2/build.sh b/tools/packaging/static-build/shim-v2/build.sh -index 9a1160f7b..813808759 100755 +index 3944b0928..8fa9013d8 100755 --- a/tools/packaging/static-build/shim-v2/build.sh +++ b/tools/packaging/static-build/shim-v2/build.sh -@@ -48,7 +48,7 @@ docker pull ${container_image} || \ +@@ -49,7 +49,7 @@ docker pull ${container_image} || \ arch=${ARCH:-$(uname -m)} GCC_ARCH=${arch} if [ ${arch} = "ppc64le" ]; then @@ -516,7 +474,7 @@ index 270aadf52..85e3db10f 100644 "s390x") rust_arch="${ARCH}"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ diff --git a/utils.mk b/utils.mk -index 1a153e26c..df334ee12 100644 +index 4edba5524..23b73fc8d 100644 --- a/utils.mk +++ b/utils.mk @@ -147,7 +147,7 @@ endif @@ -529,5 +487,5 @@ index 1a153e26c..df334ee12 100644 ifeq ($(ARCH), s390x) -- -2.43.5 +2.47.1 diff --git a/1003-Remove-genpolicy-warning-errors.patch b/1003-Remove-genpolicy-warning-errors.patch deleted file mode 100644 index 1cf365a..0000000 --- a/1003-Remove-genpolicy-warning-errors.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bee6ba24e144d7d919799885d2023f8d8dc78005 Mon Sep 17 00:00:00 2001 -From: Emanuel Lima -Date: Mon, 26 Aug 2024 12:25:22 -0300 -Subject: [PATCH] Remove genpolicy warning errors - -Signed-off-by: Emanuel Lima ---- - src/tools/genpolicy/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile -index 7410e20ed..567431257 100644 ---- a/src/tools/genpolicy/Makefile -+++ b/src/tools/genpolicy/Makefile -@@ -28,7 +28,7 @@ $(GENERATED_FILES): %: %.in - default: build - - build: $(GENERATED_FILES) -- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo build --target $(TRIPLE) --$(BUILD_TYPE) - - static-checks-build: - @echo "INFO: static-checks-build do nothing.." -@@ -41,10 +41,10 @@ vendor: - cargo vendor - - test: $(GENERATED_FILES) -- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo test --all-targets --all-features --target $(TRIPLE) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo test --all-targets --all-features --target $(TRIPLE) - - install: $(GENERATED_FILES) -- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS)" cargo install --locked --target $(TRIPLE) --path . - - check: $(GENERATED_CODE) standard_rust_check - --- -2.43.5 - diff --git a/kata-containers.spec b/kata-containers.spec index e76bc36..58cdb5a 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -27,8 +27,8 @@ %global rcstr -%{rcver} %endif -# htps://github.com/kata-containers/kata-containers -Version: 3.11.0 +# https://github.com/kata-containers/kata-containers +Version: 3.12.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -68,9 +68,8 @@ Source5: 50-kata Patch0999: 0999-osbuilder-Adjust-agent_version-for-our-builds.patch Patch1000: 1000-Remove-shebang-in-non-executable-completion-script.patch Patch1001: 1001-Remove-warnings-as-compilation-errors.patch -Patch1002: 1002-Remove-warnings-as-errors-from-genpolicy.patch -Patch1003: 1003-Bumping-time-dependency-for-Kata.patch -Patch1004: 1004-Fix-arch-name-compilation-failure.patch +Patch1002: 1002-Bump-time-dependency-for-Kata.patch +Patch1003: 1003-Fix-arch-name-compilation-failure.patch %if 0%{?have_go_rpm_macros} BuildRequires: go-rpm-macros @@ -385,13 +384,15 @@ fi %exclude %{katadefaults}/configuration-*.toml %exclude %{kataosbuilderdir}/rootfs-builder/alpine %exclude %{kataosbuilderdir}/rootfs-builder/centos -%exclude %{kataosbuilderdir}/rootfs-builder/clearlinux %exclude %{kataosbuilderdir}/rootfs-builder/debian %exclude %{kataosbuilderdir}/rootfs-builder/template %exclude %{kataosbuilderdir}/rootfs-builder/ubuntu %changelog +* Mon Jan 06 2025 Emanuel Lima - 3.12.0-1 +- kata-containers 3.12.0 + * Tue Nov 26 2024 Emanuel Lima - 3.11.0-1 - kata-containers 3.11.0 diff --git a/sources b/sources index f95ca4b..8360fb7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.11.0-vendor.tar.gz) = 1cab9180f2aa123322308bcef28effe5b2cd2627157e882c39d39096b5de72e6afa57494f3cbf32c3f9dda82435cbd39e08c180fccd390d8152db392f6e4a751 -SHA512 (kata-containers-3.11.0.tar.gz) = 968b99b4b711811c24572643be7183d646698a174ecba2747176a6a95f9e9156bb23807eb9d9f769868f5fc9b03078112c12a6051d92c0d750ccf29b568e12a2 +SHA512 (kata-containers-3.12.0-vendor.tar.gz) = 5d84664f6fbc6c7be53509391e248959247f1873fac171373a23dcb8f12f0fcf5dd6e72ab22e36488694d93f73d94197e1c86bba32ea3a0cdacb3a57b03952de +SHA512 (kata-containers-3.12.0.tar.gz) = efef81a537498b4d5ee02f836e054c635849db4a8916f099d4b4935d657fbaa095a041a2077b5b78f047282a4d11e583ee202a15705821fedbd663a0890156ea From 06487cd0d20a200fb3ec9d74e4c938d738d80705 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:17:40 +0000 Subject: [PATCH 43/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index 58cdb5a..fb804f4 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist}.0 +Release: 1%{?rcrel}%{?dist}.1 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -390,6 +390,9 @@ fi %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 3.12.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jan 06 2025 Emanuel Lima - 3.12.0-1 - kata-containers 3.12.0 From 05a8b4f81ed06c513176cc0b89ec01fa259460be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 07:31:18 +0000 Subject: [PATCH 44/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index fb804f4..e4604c7 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist}.1 +Release: 1%{?rcrel}%{?dist}.2 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -390,6 +390,9 @@ fi %changelog +* Mon Jan 20 2025 Fedora Release Engineering - 3.12.0-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 3.12.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 13346c448b4d84566771087deb3a2496a3aba817 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Mon, 7 Jul 2025 16:04:53 +0200 Subject: [PATCH 45/65] Bump to Kata Containers 3.13 The upstream vendor tarball contains an outdated version of the Rust `time` crate, which causes problems with recent Rust compiler versions. This was addressed earlier by patching the `Cargo.lock` to require a more recent version of the `time` crate, but that itself caused some dependencies to not be found in the upstream vendor tarball. In order to address the issue, both `kata-agent` and `kata-ctl` had to be revendored to pick up time version 0.3.37. As a result, the `kata-containers-3.13.0-vendor.tar.gz` that was added to sources does not match the upstream source. If you need to reconstruct the vendor tarball, the required steps are documented in the `vendor-tarball.sh` script. Signed-off-by: Christophe de Dinechin --- .gitignore | 2 ++ kata-containers.spec | 7 ++++-- sources | 4 +-- vendor-tarball.sh | 59 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 4 deletions(-) create mode 100755 vendor-tarball.sh diff --git a/.gitignore b/.gitignore index cd18957..3481e70 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,5 @@ /kata-containers-3.11.0.tar.gz /kata-containers-3.12.0-vendor.tar.gz /kata-containers-3.12.0.tar.gz +/kata-containers-3.13.0-vendor.tar.gz +/kata-containers-3.13.0.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index e4604c7..ee58cf2 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.12.0 +Version: 3.13.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist}.2 +Release: 1%{?rcrel}%{?dist} Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -390,6 +390,9 @@ fi %changelog +* Mon Jul 07 2025 Christophe de Dinechin - 3.13.0-1 +- kata-containers 3.13.0, required vendor source correction + * Mon Jan 20 2025 Fedora Release Engineering - 3.12.0-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 8360fb7..4d56c0a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.12.0-vendor.tar.gz) = 5d84664f6fbc6c7be53509391e248959247f1873fac171373a23dcb8f12f0fcf5dd6e72ab22e36488694d93f73d94197e1c86bba32ea3a0cdacb3a57b03952de -SHA512 (kata-containers-3.12.0.tar.gz) = efef81a537498b4d5ee02f836e054c635849db4a8916f099d4b4935d657fbaa095a041a2077b5b78f047282a4d11e583ee202a15705821fedbd663a0890156ea +SHA512 (kata-containers-3.13.0.tar.gz) = a1a56e0b8bf9a27c54144bbf2a03b3ee600079d780836946cfe6ceb32d9bec606639bb038dc73d489c36e9c0c7da6c4c7ef708b9abec821b789f1973b98f7641 +SHA512 (kata-containers-3.13.0-vendor.tar.gz) = a15257dfd09c460d4c5661e5c0523533df83e2d48a5779096a02d27463de6a1c1a28cdfe967896e6cc1d96a8074e0e88572d9c4ab92ee2cb6da5adec298e0459 diff --git a/vendor-tarball.sh b/vendor-tarball.sh new file mode 100755 index 0000000..14aa396 --- /dev/null +++ b/vendor-tarball.sh @@ -0,0 +1,59 @@ +#!/bin/bash +set -xeuo pipefail + +# Kata version +KATA_VERSION=3.13.0 +RUST_SOURCES_TO_FIX="src/agent src/tools/kata-ctl" + +# Original vendor tarball downloaded from upstream +ORIG_TARBALL="kata-containers-${KATA_VERSION}.tar.gz" +ORIG_VENDOR_TARBALL="kata-containers-${KATA_VERSION}-vendor.tar.gz" +TMPDIR="tmp_vendor_extract" + +# Build directories for agent and kata-ctl +RPM_BUILD_DIR="$HOME/rpmbuild/BUILD/kata-containers-${KATA_VERSION}-build/kata-containers-${KATA_VERSION}" +KATA_AGENT_BUILD_DIR="$RPM_BUILD_DIR/src/agent" +KATA_CTL_BUILD_DIR="$RPM_BUILD_DIR/src/tools/kata-ctl" + +# Extracted directories in the tarball +KATA_AGENT_EXTRACTED_DIR="$TMPDIR/src/agent" +KATA_CTL_EXTRACTED_DIR="$TMPDIR/src/tools/kata-ctl" + +# 1. Extract the original vendor tarball +rm -rf "$TMPDIR" +mkdir -p "$TMPDIR" +[ -f "$ORIG_VENDOR_TARBALL" ] || wget https://github.com/kata-containers/kata-containers/releases/download/$KATA_VERSION/$ORIG_VENDOR_TARBALL + +tar xzf "$ORIG_VENDOR_TARBALL" -C "$TMPDIR" + +# 2. Run cargo vendor in both build directories +mkdir -p $RPM_BUILD_DIR +[ -f "$ORIG_TARBALL" ] || wget https://github.com/kata-containers/kata-containers/archive/$KATA_VERSION/$ORIG_TARBALL +tar xzf "$ORIG_TARBALL" -C $RPM_BUILD_DIR/.. +for dir in "$KATA_AGENT_BUILD_DIR" "$KATA_CTL_BUILD_DIR"; do + pushd "$dir" + cargo vendor + popd +done + +# 3. Copy updated vendor and Cargo.lock into the extracted tree for both components +for src_dir in $RUST_SOURCES_TO_FIX; do + BUILD_DIR="$HOME/rpmbuild/BUILD/kata-containers-${KATA_VERSION}-build/kata-containers-${KATA_VERSION}/$src_dir" + EXTRACTED_DIR="$TMPDIR/$src_dir" + rm -rf "$EXTRACTED_DIR/vendor" + cp -a "$BUILD_DIR/vendor" "$EXTRACTED_DIR/" + cp "$BUILD_DIR/Cargo.lock" "$EXTRACTED_DIR/" +done + +# 4. Remove stale ext.rs if both ext.rs and ext/mod.rs exist in time crate for both +for EXTRACTED_DIR in "$KATA_AGENT_EXTRACTED_DIR" "$KATA_CTL_EXTRACTED_DIR"; do + TIME_SRC="$EXTRACTED_DIR/vendor/time/src" + if [[ -f "$TIME_SRC/ext.rs" && -d "$TIME_SRC/ext" ]]; then + rm -f "$TIME_SRC/ext.rs" + fi +done + +# 5. Repack the updated vendor tarball +tar czf "$ORIG_VENDOR_TARBALL" -C "$TMPDIR" . + +echo "Updated vendor tarball created: $ORIG_VENDOR_TARBALL" From 567494580636b25c33be8ef4026f6b2cf2a72c2d Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Wed, 9 Jul 2025 11:50:30 +0200 Subject: [PATCH 46/65] Bump to Kata Containers 3.14 Adjusted patch 1001-Remove-warnings-as-compilation-errors.patch Removed patches 1000, 1002 and 1003, no longer needed Signed-off-by: Christophe de Dinechin --- .gitignore | 2 + ...-in-non-executable-completion-script.patch | 25 - ...emove-warnings-as-compilation-errors.patch | 82 +- 1002-Bump-time-dependency-for-Kata.patch | 3580 ----------------- 1003-Fix-arch-name-compilation-failure.patch | 491 --- kata-containers.spec | 8 +- sources | 4 +- vendor-tarball.sh | 2 +- 8 files changed, 46 insertions(+), 4148 deletions(-) delete mode 100644 1000-Remove-shebang-in-non-executable-completion-script.patch delete mode 100644 1002-Bump-time-dependency-for-Kata.patch delete mode 100644 1003-Fix-arch-name-compilation-failure.patch diff --git a/.gitignore b/.gitignore index 3481e70..6cae878 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,5 @@ /kata-containers-3.12.0.tar.gz /kata-containers-3.13.0-vendor.tar.gz /kata-containers-3.13.0.tar.gz +/kata-containers-3.14.0-vendor.tar.gz +/kata-containers-3.14.0.tar.gz diff --git a/1000-Remove-shebang-in-non-executable-completion-script.patch b/1000-Remove-shebang-in-non-executable-completion-script.patch deleted file mode 100644 index 6122484..0000000 --- a/1000-Remove-shebang-in-non-executable-completion-script.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1c65024709d7c28bf78b42c59a135df17513d78d Mon Sep 17 00:00:00 2001 -From: Christophe de Dinechin -Date: Thu, 12 Sep 2019 12:57:39 +0200 -Subject: [PATCH] Remove shebang in non-executable completion script - -Raised during package review [1] by rpmlint - -[1] https://bugzilla.redhat.com/show_bug.cgi?id=1590425#c8 - -Signed-off-by: Christophe de Dinechin ---- - src/runtime/data/completions/bash/kata-runtime | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/runtime/data/completions/bash/kata-runtime b/src/runtime/data/completions/bash/kata-runtime -index c293483..58ab978 100644 ---- a/src/runtime/data/completions/bash/kata-runtime -+++ b/src/runtime/data/completions/bash/kata-runtime -@@ -1,4 +1,3 @@ --#!/usr/bin/env bash - # - # Copyright (c) 2018 Intel Corporation - # --- -2.21.0 diff --git a/1001-Remove-warnings-as-compilation-errors.patch b/1001-Remove-warnings-as-compilation-errors.patch index 3bae429..47ab17c 100644 --- a/1001-Remove-warnings-as-compilation-errors.patch +++ b/1001-Remove-warnings-as-compilation-errors.patch @@ -23,42 +23,35 @@ index e62a894aa..39d351213 100644 +++ b/src/agent/Makefile @@ -134,14 +134,14 @@ static-checks-build: $(GENERATED_CODE) $(TARGET): $(GENERATED_CODE) $(TARGET_PATH) - + $(TARGET_PATH): show-summary - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) - + $(GENERATED_FILES): %: %.in @sed $(foreach r,$(GENERATED_REPLACEMENTS),-e 's|@$r@|$($r)|g') "$<" > "$@" - + ##TARGET optimize: optimized build optimize: show-summary show-header - @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) - + ##TARGET install: install agent install: install-services diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile index 40bb7f915..5eb2c1016 100644 --- a/src/dragonball/Makefile +++ b/src/dragonball/Makefile -@@ -27,14 +27,14 @@ clippy: +@@ -27,8 +27,8 @@ clippy: @echo "INFO: cargo clippy..." cargo clippy --all-targets --all-features \ -- \ - -D warnings + - + vendor: @echo "INFO: vendor do nothing.." - - format: - @echo "INFO: rust fmt..." -- # This is kinda dirty step here simply because cargo fmt --all will apply fmt to all dependencies of dragonball which will include /src/libs/protocols with some file generated during compilation time and could not be formatted when you use cargo fmt --all before building the whole project. In order to avoid this problem, we do fmt check in this following way. -+ # This is kinda dirty step here simply because cargo fmt --all will apply fmt to all dependencies of dragonball which will include /src/libs/protocols with some file generated during compilation time and could not be formatted when you use cargo fmt --all before building the whole project. In order to avoid this problem, we do fmt check in this following way. - rustfmt --edition 2018 ./src/dbs_address_space/src/lib.rs ./src/dbs_allocator/src/lib.rs ./src/dbs_arch/src/lib.rs ./src/dbs_boot/src/lib.rs ./src/dbs_device/src/lib.rs ./src/dbs_interrupt/src/lib.rs ./src/dbs_legacy_devices/src/lib.rs ./src/dbs_pci/src/lib.rs ./src/dbs_upcall/src/lib.rs ./src/dbs_utils/src/lib.rs ./src/dbs_virtio_devices/src/lib.rs ./src/lib.rs --check - - clean: + diff --git a/src/libs/Makefile b/src/libs/Makefile index aabaa3391..1fb6b20c3 100644 --- a/src/libs/Makefile @@ -69,7 +62,7 @@ index aabaa3391..1fb6b20c3 100644 -- \ - -D warnings + - + format: @echo "INFO: cargo fmt..." diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile @@ -78,20 +71,20 @@ index 0bb0617ff..188040864 100644 +++ b/src/runtime-rs/Makefile @@ -580,7 +580,7 @@ static-checks-build: $(GENERATED_FILES) $(TARGET): $(GENERATED_FILES) $(TARGET_PATH) - + $(TARGET_PATH): $(SOURCES) | show-summary - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) - + $(GENERATED_FILES): %: %.in @sed \ @@ -590,7 +590,7 @@ $(GENERATED_FILES): %: %.in - + ##TARGET optimize: optimized build optimize: $(SOURCES) | show-summary show-header - @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) + @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) - + ##TARGET clean: clean build clean: clean-generated-files diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile @@ -100,85 +93,85 @@ index a49f88e6b..855017db4 100644 +++ b/src/tools/agent-ctl/Makefile @@ -13,7 +13,7 @@ endif default: build - + build: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) - + static-checks-build: @echo "INFO: static-checks-build do nothing.." @@ -27,7 +27,7 @@ vendor: test: - + install: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo install --locked --target $(TRIPLE) --path . - + check: standard_rust_check - + diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile index 7410e20ed..b33541467 100644 --- a/src/tools/genpolicy/Makefile +++ b/src/tools/genpolicy/Makefile @@ -28,7 +28,7 @@ $(GENERATED_FILES): %: %.in default: build - + build: $(GENERATED_FILES) - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) - + static-checks-build: @echo "INFO: static-checks-build do nothing.." @@ -41,10 +41,10 @@ vendor: cargo vendor - + test: $(GENERATED_FILES) - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo test --all-targets --all-features --target $(TRIPLE) + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo test --all-targets --all-features --target $(TRIPLE) - + install: $(GENERATED_FILES) - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo install --locked --target $(TRIPLE) --path . - + check: $(GENERATED_CODE) standard_rust_check - + diff --git a/src/tools/kata-ctl/Makefile b/src/tools/kata-ctl/Makefile index 7595c0c23..05d171f5a 100644 --- a/src/tools/kata-ctl/Makefile +++ b/src/tools/kata-ctl/Makefile @@ -43,7 +43,7 @@ default: $(TARGET) build $(TARGET): $(GENERATED_CODE) - + build: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) - + static-checks-build: $(GENERATED_CODE) - + @@ -59,10 +59,10 @@ vendor: cargo vendor - + test: $(GENERATED_CODE) - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo test --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -- --nocapture + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo test --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) -- --nocapture - + install: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo install --locked --target $(TRIPLE) --path . --root $(INSTALL_PATH) + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo install --locked --target $(TRIPLE) --path . --root $(INSTALL_PATH) - + check: $(GENERATED_CODE) standard_rust_check - + diff --git a/src/tools/runk/Makefile b/src/tools/runk/Makefile index 186955679..b23cab145 100644 --- a/src/tools/runk/Makefile +++ b/src/tools/runk/Makefile @@ -36,7 +36,7 @@ endif default: build - + build: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) - + static-checks-build: @echo "INFO: static-checks-build do nothing.." diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Makefile @@ -187,26 +180,25 @@ index 5d9f71856..bf6b80a54 100644 +++ b/src/tools/trace-forwarder/Makefile @@ -13,7 +13,7 @@ endif default: build - + build: - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) - + static-checks-build: @echo "INFO: static-checks-build do nothing.." diff --git a/utils.mk b/utils.mk index 1a153e26c..4edba5524 100644 --- a/utils.mk +++ b/utils.mk -@@ -176,7 +176,7 @@ standard_rust_check: +@@ -177,7 +177,7 @@ standard_rust_check: cargo fmt -- --check cargo clippy --all-targets --all-features --release \ -- \ - -D warnings + - + # Install a file (full version). # --- +-- 2.47.1 - diff --git a/1002-Bump-time-dependency-for-Kata.patch b/1002-Bump-time-dependency-for-Kata.patch deleted file mode 100644 index 0447de9..0000000 --- a/1002-Bump-time-dependency-for-Kata.patch +++ /dev/null @@ -1,3580 +0,0 @@ -From 953623cb82571abe35b83ff94a2c6f2dea120cfe Mon Sep 17 00:00:00 2001 -From: Emanuel Lima -Date: Mon, 6 Jan 2025 15:02:50 -0300 -Subject: [PATCH] Bump time dependency for Kata - -This is necessary to make Kata compilable -by the latest stable Rust (v1.83.0) - -Signed-off-by: Emanuel Lima ---- - src/agent/Cargo.lock | 10 +- - src/dragonball/Cargo.lock | 36 +- - src/dragonball/src/dbs_acpi/Cargo.lock | 48 + - .../src/dbs_address_space/Cargo.lock | 187 +++ - src/dragonball/src/dbs_allocator/Cargo.lock | 65 + - src/dragonball/src/dbs_arch/Cargo.lock | 160 +++ - src/dragonball/src/dbs_boot/Cargo.lock | 201 +++ - src/dragonball/src/dbs_device/Cargo.lock | 65 + - src/dragonball/src/dbs_interrupt/Cargo.lock | 179 +++ - .../src/dbs_legacy_devices/Cargo.lock | 289 ++++ - src/dragonball/src/dbs_tdx/Cargo.lock | 149 ++ - src/dragonball/src/dbs_upcall/Cargo.lock | 1266 +++++++++++++++++ - src/libs/Cargo.lock | 51 +- - src/runtime-rs/Cargo.lock | 24 +- - src/tools/agent-ctl/Cargo.lock | 97 +- - src/tools/kata-ctl/Cargo.lock | 18 +- - src/tools/runk/Cargo.lock | 10 +- - src/tools/trace-forwarder/Cargo.lock | 38 +- - 18 files changed, 2802 insertions(+), 91 deletions(-) - create mode 100644 src/dragonball/src/dbs_acpi/Cargo.lock - create mode 100644 src/dragonball/src/dbs_address_space/Cargo.lock - create mode 100644 src/dragonball/src/dbs_allocator/Cargo.lock - create mode 100644 src/dragonball/src/dbs_arch/Cargo.lock - create mode 100644 src/dragonball/src/dbs_boot/Cargo.lock - create mode 100644 src/dragonball/src/dbs_device/Cargo.lock - create mode 100644 src/dragonball/src/dbs_interrupt/Cargo.lock - create mode 100644 src/dragonball/src/dbs_legacy_devices/Cargo.lock - create mode 100644 src/dragonball/src/dbs_tdx/Cargo.lock - create mode 100644 src/dragonball/src/dbs_upcall/Cargo.lock - -diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock -index 67b183027..69abb8310 100644 ---- a/src/agent/Cargo.lock -+++ b/src/agent/Cargo.lock -@@ -1,6 +1,6 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. --version = 3 -+version = 4 - - [[package]] - name = "addr2line" -@@ -6125,9 +6125,9 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.36" -+version = "0.3.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" - dependencies = [ - "deranged", - "itoa", -@@ -6146,9 +6146,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.18" -+version = "0.2.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" - dependencies = [ - "num-conv", - "time-core", -diff --git a/src/dragonball/Cargo.lock b/src/dragonball/Cargo.lock -index bb758d1f8..ef6f5fffa 100644 ---- a/src/dragonball/Cargo.lock -+++ b/src/dragonball/Cargo.lock -@@ -1,6 +1,6 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. --version = 3 -+version = 4 - - [[package]] - name = "addr2line" -@@ -428,9 +428,12 @@ dependencies = [ - - [[package]] - name = "deranged" --version = "0.3.8" -+version = "0.3.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", -+] - - [[package]] - name = "derivative" -@@ -1146,6 +1149,12 @@ dependencies = [ - "memoffset", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-traits" - version = "0.2.16" -@@ -1379,6 +1388,12 @@ version = "0.3.27" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "proc-macro2" - version = "1.0.66" -@@ -1897,14 +1912,16 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.28" -+version = "0.3.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" -+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" - dependencies = [ - "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -1912,16 +1929,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.1" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.14" -+version = "0.2.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" -+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" - dependencies = [ -+ "num-conv", - "time-core", - ] - -diff --git a/src/dragonball/src/dbs_acpi/Cargo.lock b/src/dragonball/src/dbs_acpi/Cargo.lock -new file mode 100644 -index 000000000..417a27c3b ---- /dev/null -+++ b/src/dragonball/src/dbs_acpi/Cargo.lock -@@ -0,0 +1,48 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 4 -+ -+[[package]] -+name = "dbs-acpi" -+version = "0.1.0" -+dependencies = [ -+ "vm-memory", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.169" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" -+ -+[[package]] -+name = "vm-memory" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "583f213899e8a5eea23d9c507252d4bed5bc88f0ecbe0783262f80034630744b" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -diff --git a/src/dragonball/src/dbs_address_space/Cargo.lock b/src/dragonball/src/dbs_address_space/Cargo.lock -new file mode 100644 -index 000000000..60f441054 ---- /dev/null -+++ b/src/dragonball/src/dbs_address_space/Cargo.lock -@@ -0,0 +1,187 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 4 -+ -+[[package]] -+name = "arc-swap" -+version = "1.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" -+ -+[[package]] -+name = "autocfg" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "cc" -+version = "1.2.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" -+dependencies = [ -+ "shlex", -+] -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "dbs-address-space" -+version = "0.3.0" -+dependencies = [ -+ "arc-swap", -+ "lazy_static", -+ "libc", -+ "nix", -+ "thiserror", -+ "vm-memory", -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -+ -+[[package]] -+name = "libc" -+version = "0.2.169" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" -+ -+[[package]] -+name = "memoffset" -+version = "0.6.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "nix" -+version = "0.23.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -+dependencies = [ -+ "bitflags", -+ "cc", -+ "cfg-if", -+ "libc", -+ "memoffset", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.92" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.38" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "shlex" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -+ -+[[package]] -+name = "syn" -+version = "2.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -+ -+[[package]] -+name = "vm-memory" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" -+dependencies = [ -+ "arc-swap", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "vmm-sys-util" -+version = "0.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" -+dependencies = [ -+ "bitflags", -+ "libc", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -diff --git a/src/dragonball/src/dbs_allocator/Cargo.lock b/src/dragonball/src/dbs_allocator/Cargo.lock -new file mode 100644 -index 000000000..a05af8cb0 ---- /dev/null -+++ b/src/dragonball/src/dbs_allocator/Cargo.lock -@@ -0,0 +1,65 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 4 -+ -+[[package]] -+name = "dbs-allocator" -+version = "0.1.1" -+dependencies = [ -+ "thiserror", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.92" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.38" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "syn" -+version = "2.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -diff --git a/src/dragonball/src/dbs_arch/Cargo.lock b/src/dragonball/src/dbs_arch/Cargo.lock -new file mode 100644 -index 000000000..4b12784e3 ---- /dev/null -+++ b/src/dragonball/src/dbs_arch/Cargo.lock -@@ -0,0 +1,160 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 4 -+ -+[[package]] -+name = "autocfg" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "dbs-arch" -+version = "0.2.3" -+dependencies = [ -+ "kvm-bindings", -+ "kvm-ioctls", -+ "libc", -+ "memoffset", -+ "thiserror", -+ "vm-memory", -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "kvm-bindings" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "efe70e65a5b092161d17f5005b66e5eefe7a94a70c332e755036fc4af78c4e79" -+dependencies = [ -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "kvm-ioctls" -+version = "0.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4" -+dependencies = [ -+ "kvm-bindings", -+ "libc", -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.169" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" -+ -+[[package]] -+name = "memoffset" -+version = "0.6.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.92" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.38" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "syn" -+version = "2.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -+ -+[[package]] -+name = "vm-memory" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "vmm-sys-util" -+version = "0.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" -+dependencies = [ -+ "bitflags", -+ "libc", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -diff --git a/src/dragonball/src/dbs_boot/Cargo.lock b/src/dragonball/src/dbs_boot/Cargo.lock -new file mode 100644 -index 000000000..8e833d480 ---- /dev/null -+++ b/src/dragonball/src/dbs_boot/Cargo.lock -@@ -0,0 +1,201 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 4 -+ -+[[package]] -+name = "autocfg" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "dbs-arch" -+version = "0.2.3" -+dependencies = [ -+ "kvm-bindings", -+ "kvm-ioctls", -+ "libc", -+ "memoffset", -+ "thiserror", -+ "vm-memory", -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "dbs-boot" -+version = "0.4.0" -+dependencies = [ -+ "dbs-arch", -+ "dbs-device", -+ "device_tree", -+ "kvm-bindings", -+ "kvm-ioctls", -+ "lazy_static", -+ "libc", -+ "thiserror", -+ "vm-fdt", -+ "vm-memory", -+] -+ -+[[package]] -+name = "dbs-device" -+version = "0.2.0" -+dependencies = [ -+ "thiserror", -+] -+ -+[[package]] -+name = "device_tree" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f18f717c5c7c2e3483feb64cccebd077245ad6d19007c2db0fd341d38595353c" -+ -+[[package]] -+name = "kvm-bindings" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "efe70e65a5b092161d17f5005b66e5eefe7a94a70c332e755036fc4af78c4e79" -+dependencies = [ -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "kvm-ioctls" -+version = "0.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4" -+dependencies = [ -+ "kvm-bindings", -+ "libc", -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -+ -+[[package]] -+name = "libc" -+version = "0.2.169" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" -+ -+[[package]] -+name = "memoffset" -+version = "0.6.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.92" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.38" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "syn" -+version = "2.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -+ -+[[package]] -+name = "vm-fdt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f43fb5a6bd1a7d423ad72802801036719b7546cf847a103f8fe4575f5b0d45a6" -+ -+[[package]] -+name = "vm-memory" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "vmm-sys-util" -+version = "0.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" -+dependencies = [ -+ "bitflags", -+ "libc", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -diff --git a/src/dragonball/src/dbs_device/Cargo.lock b/src/dragonball/src/dbs_device/Cargo.lock -new file mode 100644 -index 000000000..8452cc5bb ---- /dev/null -+++ b/src/dragonball/src/dbs_device/Cargo.lock -@@ -0,0 +1,65 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 4 -+ -+[[package]] -+name = "dbs-device" -+version = "0.2.0" -+dependencies = [ -+ "thiserror", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.92" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.38" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "syn" -+version = "2.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -diff --git a/src/dragonball/src/dbs_interrupt/Cargo.lock b/src/dragonball/src/dbs_interrupt/Cargo.lock -new file mode 100644 -index 000000000..3af378eda ---- /dev/null -+++ b/src/dragonball/src/dbs_interrupt/Cargo.lock -@@ -0,0 +1,179 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 4 -+ -+[[package]] -+name = "autocfg" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "dbs-arch" -+version = "0.2.3" -+dependencies = [ -+ "kvm-bindings", -+ "kvm-ioctls", -+ "libc", -+ "memoffset", -+ "thiserror", -+ "vm-memory", -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "dbs-device" -+version = "0.2.0" -+dependencies = [ -+ "thiserror", -+] -+ -+[[package]] -+name = "dbs-interrupt" -+version = "0.2.2" -+dependencies = [ -+ "dbs-arch", -+ "dbs-device", -+ "kvm-bindings", -+ "kvm-ioctls", -+ "libc", -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "kvm-bindings" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "efe70e65a5b092161d17f5005b66e5eefe7a94a70c332e755036fc4af78c4e79" -+dependencies = [ -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "kvm-ioctls" -+version = "0.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4" -+dependencies = [ -+ "kvm-bindings", -+ "libc", -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.169" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" -+ -+[[package]] -+name = "memoffset" -+version = "0.6.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.92" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.38" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "syn" -+version = "2.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -+ -+[[package]] -+name = "vm-memory" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "vmm-sys-util" -+version = "0.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" -+dependencies = [ -+ "bitflags", -+ "libc", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -diff --git a/src/dragonball/src/dbs_legacy_devices/Cargo.lock b/src/dragonball/src/dbs_legacy_devices/Cargo.lock -new file mode 100644 -index 000000000..3587e954b ---- /dev/null -+++ b/src/dragonball/src/dbs_legacy_devices/Cargo.lock -@@ -0,0 +1,289 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 4 -+ -+[[package]] -+name = "anyhow" -+version = "1.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "bitflags" -+version = "2.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -+ -+[[package]] -+name = "dbs-device" -+version = "0.2.0" -+dependencies = [ -+ "thiserror", -+] -+ -+[[package]] -+name = "dbs-legacy-devices" -+version = "0.1.1" -+dependencies = [ -+ "dbs-device", -+ "dbs-utils", -+ "libc", -+ "log", -+ "serde", -+ "vm-superio", -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "dbs-utils" -+version = "0.2.1" -+dependencies = [ -+ "anyhow", -+ "event-manager", -+ "libc", -+ "log", -+ "serde", -+ "thiserror", -+ "timerfd", -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "errno" -+version = "0.3.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" -+dependencies = [ -+ "libc", -+ "windows-sys", -+] -+ -+[[package]] -+name = "event-manager" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "377fa591135fbe23396a18e2655a6d5481bf7c5823cdfa3cc81b01a229cbe640" -+dependencies = [ -+ "libc", -+ "vmm-sys-util 0.12.1", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.169" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" -+ -+[[package]] -+name = "linux-raw-sys" -+version = "0.4.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -+ -+[[package]] -+name = "log" -+version = "0.4.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.92" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.38" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "rustix" -+version = "0.38.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" -+dependencies = [ -+ "bitflags 2.6.0", -+ "errno", -+ "libc", -+ "linux-raw-sys", -+ "windows-sys", -+] -+ -+[[package]] -+name = "serde" -+version = "1.0.217" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.217" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "syn" -+version = "2.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "timerfd" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "84e482e368cf7efa2c8b570f476e5b9fd9fd5e9b9219fc567832b05f13511091" -+dependencies = [ -+ "rustix", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -+ -+[[package]] -+name = "vm-superio" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4b5231d334edbc03b22704caa1a022e4c07491d6df736593f26094df8b04a51" -+ -+[[package]] -+name = "vmm-sys-util" -+version = "0.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" -+dependencies = [ -+ "bitflags 1.3.2", -+ "libc", -+] -+ -+[[package]] -+name = "vmm-sys-util" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede" -+dependencies = [ -+ "bitflags 1.3.2", -+ "libc", -+] -+ -+[[package]] -+name = "windows-sys" -+version = "0.59.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -+dependencies = [ -+ "windows-targets", -+] -+ -+[[package]] -+name = "windows-targets" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -+dependencies = [ -+ "windows_aarch64_gnullvm", -+ "windows_aarch64_msvc", -+ "windows_i686_gnu", -+ "windows_i686_gnullvm", -+ "windows_i686_msvc", -+ "windows_x86_64_gnu", -+ "windows_x86_64_gnullvm", -+ "windows_x86_64_msvc", -+] -+ -+[[package]] -+name = "windows_aarch64_gnullvm" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -+ -+[[package]] -+name = "windows_i686_gnullvm" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -+ -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -diff --git a/src/dragonball/src/dbs_tdx/Cargo.lock b/src/dragonball/src/dbs_tdx/Cargo.lock -new file mode 100644 -index 000000000..f5db1bd23 ---- /dev/null -+++ b/src/dragonball/src/dbs_tdx/Cargo.lock -@@ -0,0 +1,149 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 4 -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "dbs-tdx" -+version = "0.1.0" -+dependencies = [ -+ "kvm-bindings", -+ "serde_json", -+ "thiserror", -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "itoa" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" -+ -+[[package]] -+name = "kvm-bindings" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "efe70e65a5b092161d17f5005b66e5eefe7a94a70c332e755036fc4af78c4e79" -+dependencies = [ -+ "vmm-sys-util", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.169" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" -+ -+[[package]] -+name = "memchr" -+version = "2.7.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.92" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.38" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -+ -+[[package]] -+name = "serde" -+version = "1.0.217" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.217" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.134" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" -+dependencies = [ -+ "itoa", -+ "memchr", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "syn" -+version = "2.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -+ -+[[package]] -+name = "vmm-sys-util" -+version = "0.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" -+dependencies = [ -+ "bitflags", -+ "libc", -+] -diff --git a/src/dragonball/src/dbs_upcall/Cargo.lock b/src/dragonball/src/dbs_upcall/Cargo.lock -new file mode 100644 -index 000000000..c50a43f0a ---- /dev/null -+++ b/src/dragonball/src/dbs_upcall/Cargo.lock -@@ -0,0 +1,1266 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 4 -+ -+[[package]] -+name = "addr2line" -+version = "0.24.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -+dependencies = [ -+ "gimli", -+] -+ -+[[package]] -+name = "adler2" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -+ -+[[package]] -+name = "anyhow" -+version = "1.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" -+ -+[[package]] -+name = "arc-swap" -+version = "1.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" -+ -+[[package]] -+name = "arrayref" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" -+ -+[[package]] -+name = "arrayvec" -+version = "0.7.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" -+ -+[[package]] -+name = "autocfg" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.74" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -+dependencies = [ -+ "addr2line", -+ "cfg-if", -+ "libc", -+ "miniz_oxide", -+ "object", -+ "rustc-demangle", -+ "windows-targets 0.52.6", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "bitflags" -+version = "2.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -+ -+[[package]] -+name = "blake3" -+version = "1.5.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" -+dependencies = [ -+ "arrayref", -+ "arrayvec", -+ "cc", -+ "cfg-if", -+ "constant_time_eq", -+] -+ -+[[package]] -+name = "block-buffer" -+version = "0.10.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] -+name = "byteorder" -+version = "1.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -+ -+[[package]] -+name = "caps" -+version = "0.5.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" -+dependencies = [ -+ "libc", -+ "thiserror", -+] -+ -+[[package]] -+name = "cc" -+version = "1.2.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" -+dependencies = [ -+ "jobserver", -+ "libc", -+ "shlex", -+] -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "cmake" -+version = "0.1.52" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "constant_time_eq" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.8.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -+ -+[[package]] -+name = "cpufeatures" -+version = "0.2.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "crc32fast" -+version = "1.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "crypto-common" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -+dependencies = [ -+ "generic-array", -+ "typenum", -+] -+ -+[[package]] -+name = "dbs-address-space" -+version = "0.3.0" -+dependencies = [ -+ "arc-swap", -+ "lazy_static", -+ "libc", -+ "nix 0.23.2", -+ "thiserror", -+ "vm-memory", -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "dbs-arch" -+version = "0.2.3" -+dependencies = [ -+ "kvm-bindings", -+ "kvm-ioctls", -+ "libc", -+ "memoffset", -+ "thiserror", -+ "vm-memory", -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "dbs-boot" -+version = "0.4.0" -+dependencies = [ -+ "dbs-arch", -+ "kvm-bindings", -+ "kvm-ioctls", -+ "lazy_static", -+ "libc", -+ "thiserror", -+ "vm-fdt", -+ "vm-memory", -+] -+ -+[[package]] -+name = "dbs-device" -+version = "0.2.0" -+dependencies = [ -+ "thiserror", -+] -+ -+[[package]] -+name = "dbs-interrupt" -+version = "0.2.2" -+dependencies = [ -+ "dbs-arch", -+ "dbs-device", -+ "kvm-bindings", -+ "kvm-ioctls", -+ "libc", -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "dbs-upcall" -+version = "0.3.0" -+dependencies = [ -+ "anyhow", -+ "dbs-utils", -+ "dbs-virtio-devices", -+ "log", -+ "thiserror", -+ "timerfd", -+] -+ -+[[package]] -+name = "dbs-utils" -+version = "0.2.1" -+dependencies = [ -+ "anyhow", -+ "event-manager", -+ "libc", -+ "log", -+ "serde", -+ "thiserror", -+ "timerfd", -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "dbs-virtio-devices" -+version = "0.3.1" -+dependencies = [ -+ "byteorder", -+ "caps", -+ "dbs-address-space", -+ "dbs-boot", -+ "dbs-device", -+ "dbs-interrupt", -+ "dbs-utils", -+ "epoll", -+ "io-uring", -+ "kvm-bindings", -+ "kvm-ioctls", -+ "libc", -+ "log", -+ "nix 0.24.3", -+ "nydus-api", -+ "nydus-rafs", -+ "nydus-storage", -+ "rlimit", -+ "sendfd", -+ "serde", -+ "serde_json", -+ "thiserror", -+ "threadpool", -+ "timerfd", -+ "virtio-bindings", -+ "virtio-queue", -+ "vm-memory", -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "digest" -+version = "0.10.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -+dependencies = [ -+ "block-buffer", -+ "crypto-common", -+] -+ -+[[package]] -+name = "epoll" -+version = "4.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20df693c700404f7e19d4d6fae6b15215d2913c27955d2b9d6f2c0f537511cd0" -+dependencies = [ -+ "bitflags 1.3.2", -+ "libc", -+] -+ -+[[package]] -+name = "errno" -+version = "0.3.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" -+dependencies = [ -+ "libc", -+ "windows-sys 0.59.0", -+] -+ -+[[package]] -+name = "event-manager" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "377fa591135fbe23396a18e2655a6d5481bf7c5823cdfa3cc81b01a229cbe640" -+dependencies = [ -+ "libc", -+ "vmm-sys-util 0.12.1", -+] -+ -+[[package]] -+name = "filetime" -+version = "0.2.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "libredox", -+ "windows-sys 0.59.0", -+] -+ -+[[package]] -+name = "flate2" -+version = "1.0.35" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" -+dependencies = [ -+ "crc32fast", -+ "libz-sys", -+ "miniz_oxide", -+] -+ -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+dependencies = [ -+ "foreign-types-shared", -+] -+ -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ -+[[package]] -+name = "fuse-backend-rs" -+version = "0.10.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f85357722be4bf3d0b7548bedf7499686c77628c2c61cb99c6519463f7a9e5f0" -+dependencies = [ -+ "arc-swap", -+ "bitflags 1.3.2", -+ "caps", -+ "core-foundation-sys", -+ "lazy_static", -+ "libc", -+ "log", -+ "mio", -+ "nix 0.24.3", -+ "vm-memory", -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "generic-array" -+version = "0.14.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -+dependencies = [ -+ "typenum", -+ "version_check", -+] -+ -+[[package]] -+name = "gimli" -+version = "0.31.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" -+ -+[[package]] -+name = "hermit-abi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" -+ -+[[package]] -+name = "hex" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -+ -+[[package]] -+name = "httpdate" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -+ -+[[package]] -+name = "io-uring" -+version = "0.5.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd1e1a01cfb924fd8c5c43b6827965db394f5a3a16c599ce03452266e1cf984c" -+dependencies = [ -+ "bitflags 1.3.2", -+ "libc", -+] -+ -+[[package]] -+name = "itoa" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" -+ -+[[package]] -+name = "jobserver" -+version = "0.1.32" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "kvm-bindings" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "efe70e65a5b092161d17f5005b66e5eefe7a94a70c332e755036fc4af78c4e79" -+dependencies = [ -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "kvm-ioctls" -+version = "0.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4" -+dependencies = [ -+ "kvm-bindings", -+ "libc", -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -+ -+[[package]] -+name = "libc" -+version = "0.2.169" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" -+ -+[[package]] -+name = "libredox" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -+dependencies = [ -+ "bitflags 2.6.0", -+ "libc", -+ "redox_syscall", -+] -+ -+[[package]] -+name = "libz-sys" -+version = "1.1.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" -+dependencies = [ -+ "cc", -+ "cmake", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "linux-raw-sys" -+version = "0.4.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -+ -+[[package]] -+name = "log" -+version = "0.4.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -+ -+[[package]] -+name = "lz4" -+version = "1.28.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" -+dependencies = [ -+ "lz4-sys", -+] -+ -+[[package]] -+name = "lz4-sys" -+version = "1.11.1+lz4-1.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" -+dependencies = [ -+ "cc", -+ "libc", -+] -+ -+[[package]] -+name = "memchr" -+version = "2.7.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -+ -+[[package]] -+name = "memoffset" -+version = "0.6.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" -+dependencies = [ -+ "adler2", -+] -+ -+[[package]] -+name = "mio" -+version = "0.8.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -+dependencies = [ -+ "libc", -+ "log", -+ "wasi", -+ "windows-sys 0.48.0", -+] -+ -+[[package]] -+name = "nix" -+version = "0.23.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -+dependencies = [ -+ "bitflags 1.3.2", -+ "cc", -+ "cfg-if", -+ "libc", -+ "memoffset", -+] -+ -+[[package]] -+name = "nix" -+version = "0.24.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -+dependencies = [ -+ "bitflags 1.3.2", -+ "cfg-if", -+ "libc", -+ "memoffset", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.16.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "nydus-api" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c64c62d8a36c10b654b87246a39861b2c05f68e96ab3b2f002f5a54f406d5e0e" -+dependencies = [ -+ "libc", -+ "log", -+ "serde", -+ "serde_json", -+ "toml", -+] -+ -+[[package]] -+name = "nydus-rafs" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adde865ef71c91c5f139c4c05ca5aedb6fbd53f530d646b13409ac5220b85467" -+dependencies = [ -+ "anyhow", -+ "arc-swap", -+ "bitflags 1.3.2", -+ "fuse-backend-rs", -+ "lazy_static", -+ "libc", -+ "log", -+ "nix 0.24.3", -+ "nydus-api", -+ "nydus-storage", -+ "nydus-utils", -+ "serde", -+ "serde_json", -+ "vm-memory", -+] -+ -+[[package]] -+name = "nydus-storage" -+version = "0.6.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4023f15303dbbda47797d07e9acd2045862ce82c7e28cd66f70b09bda5584cbb" -+dependencies = [ -+ "arc-swap", -+ "bitflags 1.3.2", -+ "fuse-backend-rs", -+ "hex", -+ "lazy_static", -+ "libc", -+ "log", -+ "nix 0.24.3", -+ "nydus-api", -+ "nydus-utils", -+ "serde", -+ "serde_json", -+ "tar", -+ "tokio", -+ "vm-memory", -+] -+ -+[[package]] -+name = "nydus-utils" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c1f7bcde0f3906cf49101f2d40e485b0155eee97e3358eefd4783448c4f69c96" -+dependencies = [ -+ "blake3", -+ "flate2", -+ "httpdate", -+ "lazy_static", -+ "libc", -+ "libz-sys", -+ "log", -+ "lz4", -+ "lz4-sys", -+ "nix 0.24.3", -+ "nydus-api", -+ "openssl", -+ "serde", -+ "serde_json", -+ "sha2", -+ "tokio", -+ "zstd", -+] -+ -+[[package]] -+name = "object" -+version = "0.36.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.20.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -+ -+[[package]] -+name = "openssl" -+version = "0.10.68" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" -+dependencies = [ -+ "bitflags 2.6.0", -+ "cfg-if", -+ "foreign-types", -+ "libc", -+ "once_cell", -+ "openssl-macros", -+ "openssl-sys", -+] -+ -+[[package]] -+name = "openssl-macros" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "openssl-src" -+version = "300.4.1+3.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "openssl-sys" -+version = "0.9.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" -+dependencies = [ -+ "cc", -+ "libc", -+ "openssl-src", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "pin-project-lite" -+version = "0.2.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.92" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.38" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.5.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" -+dependencies = [ -+ "bitflags 2.6.0", -+] -+ -+[[package]] -+name = "rlimit" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "347703a5ae47adf1e693144157be231dde38c72bd485925cae7407ad3e52480b" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -+ -+[[package]] -+name = "rustix" -+version = "0.38.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" -+dependencies = [ -+ "bitflags 2.6.0", -+ "errno", -+ "libc", -+ "linux-raw-sys", -+ "windows-sys 0.59.0", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -+ -+[[package]] -+name = "sendfd" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "serde" -+version = "1.0.217" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.217" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.134" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" -+dependencies = [ -+ "itoa", -+ "memchr", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "sha2" -+version = "0.10.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -+dependencies = [ -+ "cfg-if", -+ "cpufeatures", -+ "digest", -+] -+ -+[[package]] -+name = "shlex" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -+ -+[[package]] -+name = "syn" -+version = "2.0.95" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "tar" -+version = "0.4.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" -+dependencies = [ -+ "filetime", -+ "libc", -+ "xattr", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "threadpool" -+version = "1.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -+dependencies = [ -+ "num_cpus", -+] -+ -+[[package]] -+name = "timerfd" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "84e482e368cf7efa2c8b570f476e5b9fd9fd5e9b9219fc567832b05f13511091" -+dependencies = [ -+ "rustix", -+] -+ -+[[package]] -+name = "tokio" -+version = "1.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" -+dependencies = [ -+ "backtrace", -+ "pin-project-lite", -+ "tokio-macros", -+] -+ -+[[package]] -+name = "tokio-macros" -+version = "2.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "typenum" -+version = "1.17.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -+ -+[[package]] -+name = "version_check" -+version = "0.9.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -+ -+[[package]] -+name = "virtio-bindings" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b" -+ -+[[package]] -+name = "virtio-queue" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ba81e2bcc21c0d2fc5e6683e79367e26ad219197423a498df801d79d5ba77bd" -+dependencies = [ -+ "log", -+ "virtio-bindings", -+ "vm-memory", -+ "vmm-sys-util 0.11.2", -+] -+ -+[[package]] -+name = "vm-fdt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f43fb5a6bd1a7d423ad72802801036719b7546cf847a103f8fe4575f5b0d45a6" -+ -+[[package]] -+name = "vm-memory" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" -+dependencies = [ -+ "arc-swap", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "vmm-sys-util" -+version = "0.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29" -+dependencies = [ -+ "bitflags 1.3.2", -+ "libc", -+] -+ -+[[package]] -+name = "vmm-sys-util" -+version = "0.12.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede" -+dependencies = [ -+ "bitflags 1.3.2", -+ "libc", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.11.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "windows-sys" -+version = "0.48.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -+dependencies = [ -+ "windows-targets 0.48.5", -+] -+ -+[[package]] -+name = "windows-sys" -+version = "0.59.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -+dependencies = [ -+ "windows-targets 0.52.6", -+] -+ -+[[package]] -+name = "windows-targets" -+version = "0.48.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -+dependencies = [ -+ "windows_aarch64_gnullvm 0.48.5", -+ "windows_aarch64_msvc 0.48.5", -+ "windows_i686_gnu 0.48.5", -+ "windows_i686_msvc 0.48.5", -+ "windows_x86_64_gnu 0.48.5", -+ "windows_x86_64_gnullvm 0.48.5", -+ "windows_x86_64_msvc 0.48.5", -+] -+ -+[[package]] -+name = "windows-targets" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -+dependencies = [ -+ "windows_aarch64_gnullvm 0.52.6", -+ "windows_aarch64_msvc 0.52.6", -+ "windows_i686_gnu 0.52.6", -+ "windows_i686_gnullvm", -+ "windows_i686_msvc 0.52.6", -+ "windows_x86_64_gnu 0.52.6", -+ "windows_x86_64_gnullvm 0.52.6", -+ "windows_x86_64_msvc 0.52.6", -+] -+ -+[[package]] -+name = "windows_aarch64_gnullvm" -+version = "0.48.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" -+ -+[[package]] -+name = "windows_aarch64_gnullvm" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.48.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.48.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -+ -+[[package]] -+name = "windows_i686_gnullvm" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.48.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.48.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -+ -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.48.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" -+ -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.48.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.52.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -+ -+[[package]] -+name = "xattr" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909" -+dependencies = [ -+ "libc", -+ "linux-raw-sys", -+ "rustix", -+] -+ -+[[package]] -+name = "zstd" -+version = "0.11.2+zstd.1.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -+dependencies = [ -+ "zstd-safe", -+] -+ -+[[package]] -+name = "zstd-safe" -+version = "5.0.2+zstd.1.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -+dependencies = [ -+ "libc", -+ "zstd-sys", -+] -+ -+[[package]] -+name = "zstd-sys" -+version = "2.0.13+zstd.1.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -+dependencies = [ -+ "cc", -+ "pkg-config", -+] -diff --git a/src/libs/Cargo.lock b/src/libs/Cargo.lock -index ed7184c48..4a2b6cf72 100644 ---- a/src/libs/Cargo.lock -+++ b/src/libs/Cargo.lock -@@ -1,6 +1,6 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. --version = 3 -+version = 4 - - [[package]] - name = "addr2line" -@@ -400,6 +400,15 @@ dependencies = [ - "syn 2.0.66", - ] - -+[[package]] -+name = "deranged" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", -+] -+ - [[package]] - name = "derive-new" - version = "0.5.9" -@@ -983,6 +992,12 @@ dependencies = [ - "winapi", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-integer" - version = "0.1.44" -@@ -1120,6 +1135,12 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.16" -@@ -1544,9 +1565,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - - [[package]] - name = "serde" --version = "1.0.147" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" -+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" - dependencies = [ - "serde_derive", - ] -@@ -1583,13 +1604,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" - - [[package]] - name = "serde_derive" --version = "1.0.147" -+version = "1.0.210" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" -+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 1.0.91", -+ "syn 2.0.66", - ] - - [[package]] -@@ -1703,7 +1724,7 @@ dependencies = [ - "slog", - "term", - "thread_local", -- "time 0.3.22", -+ "time 0.3.37", - ] - - [[package]] -@@ -1889,13 +1910,16 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.22" -+version = "0.3.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" -+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" - dependencies = [ -+ "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -1903,16 +1927,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.1" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.9" -+version = "0.2.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" - dependencies = [ -+ "num-conv", - "time-core", - ] - -diff --git a/src/runtime-rs/Cargo.lock b/src/runtime-rs/Cargo.lock -index b838ca9c1..83191f16a 100644 ---- a/src/runtime-rs/Cargo.lock -+++ b/src/runtime-rs/Cargo.lock -@@ -1,6 +1,6 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. --version = 3 -+version = 4 - - [[package]] - name = "actix-macros" -@@ -571,7 +571,7 @@ dependencies = [ - "signal-hook", - "signal-hook-tokio", - "thiserror", -- "time 0.3.31", -+ "time 0.3.37", - "tokio", - "windows-sys 0.48.0", - ] -@@ -2279,6 +2279,12 @@ dependencies = [ - "winapi", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-traits" - version = "0.2.16" -@@ -3889,7 +3895,7 @@ dependencies = [ - "serde", - "serde_json", - "slog", -- "time 0.3.31", -+ "time 0.3.37", - ] - - [[package]] -@@ -3924,7 +3930,7 @@ dependencies = [ - "slog", - "term", - "thread_local", -- "time 0.3.31", -+ "time 0.3.37", - ] - - [[package]] -@@ -4191,13 +4197,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.31" -+version = "0.3.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" -+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" - dependencies = [ - "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", - "powerfmt", - "serde", -@@ -4213,10 +4220,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.16" -+version = "0.2.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" -+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" - dependencies = [ -+ "num-conv", - "time-core", - ] - -diff --git a/src/tools/agent-ctl/Cargo.lock b/src/tools/agent-ctl/Cargo.lock -index e4094eaf1..5a354a226 100644 ---- a/src/tools/agent-ctl/Cargo.lock -+++ b/src/tools/agent-ctl/Cargo.lock -@@ -1,6 +1,6 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. --version = 3 -+version = 4 - - [[package]] - name = "addr2line" -@@ -224,7 +224,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -241,7 +241,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -485,7 +485,7 @@ dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - "syn_derive", - ] - -@@ -887,7 +887,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -934,7 +934,7 @@ dependencies = [ - "proc-macro2", - "quote", - "strsim 0.11.1", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -956,7 +956,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" - dependencies = [ - "darling_core 0.20.9", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -986,7 +986,16 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", -+] -+ -+[[package]] -+name = "deranged" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", - ] - - [[package]] -@@ -1029,7 +1038,7 @@ dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -1039,7 +1048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" - dependencies = [ - "derive_builder_core", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -1159,7 +1168,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -1373,7 +1382,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -2474,6 +2483,12 @@ dependencies = [ - "zeroize", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-integer" - version = "0.1.46" -@@ -2820,7 +2835,7 @@ checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -2912,6 +2927,12 @@ version = "1.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.17" -@@ -3755,9 +3776,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - - [[package]] - name = "serde" --version = "1.0.163" -+version = "1.0.217" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" - dependencies = [ - "serde_derive", - ] -@@ -3794,13 +3815,13 @@ checksum = "794e44574226fc701e3be5c651feb7939038fc67fb73f6f4dd5c4ba90fd3be70" - - [[package]] - name = "serde_derive" --version = "1.0.163" -+version = "1.0.217" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -3822,7 +3843,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -4107,7 +4128,7 @@ dependencies = [ - "proc-macro2", - "quote", - "rustversion", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -4139,9 +4160,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.79" -+version = "2.0.87" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" -+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" - dependencies = [ - "proc-macro2", - "quote", -@@ -4157,7 +4178,7 @@ dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -4252,7 +4273,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -4267,13 +4288,16 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.21" -+version = "0.3.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" -+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" - dependencies = [ -+ "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -4281,16 +4305,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.1" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.9" -+version = "0.2.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" - dependencies = [ -+ "num-conv", - "time-core", - ] - -@@ -4327,7 +4352,7 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -4365,7 +4390,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -4536,7 +4561,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -@@ -4776,7 +4801,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - "wasm-bindgen-shared", - ] - -@@ -4810,7 +4835,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] -@@ -5330,7 +5355,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.79", -+ "syn 2.0.87", - ] - - [[package]] -diff --git a/src/tools/kata-ctl/Cargo.lock b/src/tools/kata-ctl/Cargo.lock -index bd2de0038..a61832901 100644 ---- a/src/tools/kata-ctl/Cargo.lock -+++ b/src/tools/kata-ctl/Cargo.lock -@@ -1,6 +1,6 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. --version = 3 -+version = 4 - - [[package]] - name = "addr2line" -@@ -1476,6 +1476,12 @@ dependencies = [ - "winapi", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-traits" - version = "0.2.17" -@@ -2855,13 +2861,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.30" -+version = "0.3.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" - dependencies = [ - "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", - "powerfmt", - "serde", -@@ -2877,10 +2884,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.15" -+version = "0.2.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" - dependencies = [ -+ "num-conv", - "time-core", - ] - -diff --git a/src/tools/runk/Cargo.lock b/src/tools/runk/Cargo.lock -index 6f41aef6e..1d1795937 100644 ---- a/src/tools/runk/Cargo.lock -+++ b/src/tools/runk/Cargo.lock -@@ -1,6 +1,6 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. --version = 3 -+version = 4 - - [[package]] - name = "addr2line" -@@ -2820,9 +2820,9 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.36" -+version = "0.3.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" - dependencies = [ - "deranged", - "itoa", -@@ -2841,9 +2841,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.18" -+version = "0.2.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" - dependencies = [ - "num-conv", - "time-core", -diff --git a/src/tools/trace-forwarder/Cargo.lock b/src/tools/trace-forwarder/Cargo.lock -index 6e2791328..5f54aa2be 100644 ---- a/src/tools/trace-forwarder/Cargo.lock -+++ b/src/tools/trace-forwarder/Cargo.lock -@@ -1,6 +1,6 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. --version = 3 -+version = 4 - - [[package]] - name = "ansi_term" -@@ -141,9 +141,12 @@ dependencies = [ - - [[package]] - name = "deranged" --version = "0.3.8" -+version = "0.3.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", -+] - - [[package]] - name = "dirs-next" -@@ -389,6 +392,12 @@ dependencies = [ - "memoffset", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-integer" - version = "0.1.44" -@@ -528,6 +537,12 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.15" -@@ -752,7 +767,7 @@ dependencies = [ - "slog", - "term", - "thread_local", -- "time 0.3.28", -+ "time 0.3.37", - ] - - [[package]] -@@ -892,14 +907,16 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.28" -+version = "0.3.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" -+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" - dependencies = [ - "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -907,16 +924,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.1" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.14" -+version = "0.2.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" -+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" - dependencies = [ -+ "num-conv", - "time-core", - ] - --- -2.47.1 - diff --git a/1003-Fix-arch-name-compilation-failure.patch b/1003-Fix-arch-name-compilation-failure.patch deleted file mode 100644 index 8ae61a4..0000000 --- a/1003-Fix-arch-name-compilation-failure.patch +++ /dev/null @@ -1,491 +0,0 @@ -From 7cca06342688f838f1b5c13d5f8fb8800e55f0d9 Mon Sep 17 00:00:00 2001 -From: Emanuel Lima -Date: Mon, 6 Jan 2025 16:18:26 -0300 -Subject: [PATCH] Fix arch name compilation failure - -Signed-off-by: Christophe de Dinechin -[emlima: fix some more occurences and typos] -Signed-off-by: Emanuel Lima ---- - docs/Developer-Guide.md | 8 ++++---- - src/agent/Makefile | 2 +- - src/libs/kata-sys-util/src/protection.rs | 4 ++-- - src/runtime-rs/Makefile | 4 ++-- - src/tools/agent-ctl/Makefile | 2 +- - src/tools/genpolicy/Makefile | 2 +- - src/tools/kata-ctl/Cross.toml | 2 +- - src/tools/kata-ctl/src/arch/mod.rs | 10 +++++----- - src/tools/kata-ctl/src/arch/powerpc64le/mod.rs | 4 ++-- - src/tools/runk/Makefile | 2 +- - src/tools/trace-forwarder/Makefile | 2 +- - tests/common.bash | 4 ++-- - tests/install_rust.sh | 2 +- - tests/kata-arch.sh | 2 +- - tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in | 4 ++-- - tools/osbuilder/rootfs-builder/ubuntu/config.sh | 2 +- - tools/osbuilder/scripts/lib.sh | 2 +- - tools/packaging/scripts/configure-hypervisor.sh | 2 +- - tools/packaging/static-build/agent/Dockerfile | 2 +- - .../static-build/coco-guest-components/Dockerfile | 2 +- - tools/packaging/static-build/qemu/Dockerfile | 3 +-- - tools/packaging/static-build/shim-v2/Dockerfile | 12 ++++++------ - tools/packaging/static-build/shim-v2/build.sh | 2 +- - .../packaging/static-build/virtiofsd/gnu/Dockerfile | 2 +- - .../packaging/static-build/virtiofsd/musl/Dockerfile | 2 +- - utils.mk | 2 +- - 26 files changed, 43 insertions(+), 44 deletions(-) - -diff --git a/docs/Developer-Guide.md b/docs/Developer-Guide.md -index dcb88d49a..14928ea0a 100644 ---- a/docs/Developer-Guide.md -+++ b/docs/Developer-Guide.md -@@ -239,7 +239,7 @@ The agent is built with a statically linked `musl.` The default `libc` used is ` - ```bash - $ export ARCH="$(uname -m)" - $ if [ "$ARCH" = "ppc64le" -o "$ARCH" = "s390x" ]; then export LIBC=gnu; else export LIBC=musl; fi --$ [ "${ARCH}" == "ppc64le" ] && export ARCH=powerpc64le -+$ [ "${ARCH}" == "ppc64le" ] && export ARCH=powerpc64 - $ rustup target add "${ARCH}-unknown-linux-${LIBC}" - ``` - -@@ -268,7 +268,7 @@ to install `libseccomp` for the agent. - - ```bash - $ mkdir -p ${seccomp_install_path} ${gperf_install_path} --$ pushd kata-containers/ci -+$ pushd kata-containers/ci - $ script -fec 'sudo -E ./install_libseccomp.sh ${seccomp_install_path} ${gperf_install_path}"' - $ export LIBSECCOMP_LIB_PATH="${seccomp_install_path}/lib" - $ popd -@@ -415,11 +415,11 @@ $ script -fec 'sudo -E AGENT_INIT=yes USE_DOCKER=true SECCOMP=no ./rootfs.sh "${ - > - Check the [compatibility matrix](../tools/osbuilder/README.md#platform-distro-compatibility-matrix) before creating rootfs. - - Optionally, add your custom agent binary to the rootfs with the following commands. The default `$LIBC` used --is `musl`, but on ppc64le and s390x, `gnu` should be used. Also, Rust refers to ppc64le as `powerpc64le`: -+is `musl`, but on ppc64le and s390x, `gnu` should be used. Also, Rust refers to ppc64le as `powerpc64`: - ```bash - $ export ARCH="$(uname -m)" - $ [ "${ARCH}" == "ppc64le" ] || [ "${ARCH}" == "s390x" ] && export LIBC=gnu || export LIBC=musl --$ [ "${ARCH}" == "ppc64le" ] && export ARCH=powerpc64le -+$ [ "${ARCH}" == "ppc64le" ] && export ARCH=powerpc64 - $ sudo install -o root -g root -m 0550 -T "${ROOTFS_DIR}/../../../../src/agent/target/${ARCH}-unknown-linux-${LIBC}/release/kata-agent" "${ROOTFS_DIR}/sbin/init" - ``` - -diff --git a/src/agent/Makefile b/src/agent/Makefile -index 39d351213..1f818ebaf 100644 ---- a/src/agent/Makefile -+++ b/src/agent/Makefile -@@ -54,7 +54,7 @@ endif - include ../../utils.mk - - ifeq ($(ARCH), ppc64le) -- override ARCH = powerpc64le -+ override ARCH = powerpc64 - endif - - ##VAR STANDARD_OCI_RUNTIME=yes|no define if agent enables standard oci runtime feature -diff --git a/src/libs/kata-sys-util/src/protection.rs b/src/libs/kata-sys-util/src/protection.rs -index 74ccd5006..dba40a5d5 100644 ---- a/src/libs/kata-sys-util/src/protection.rs -+++ b/src/libs/kata-sys-util/src/protection.rs -@@ -14,7 +14,7 @@ use std::path::Path; - use std::path::PathBuf; - use thiserror::Error; - --#[cfg(any(target_arch = "s390x", target_arch = "powerpc64le"))] -+#[cfg(any(target_arch = "s390x", target_arch = "powerpc64"))] - use nix::unistd::Uid; - - #[cfg(target_arch = "x86_64")] -@@ -234,7 +234,7 @@ pub fn available_guest_protection() -> Result - Ok(GuestProtection::Se) - } - --#[cfg(target_arch = "powerpc64le")] -+#[cfg(target_arch = "powerpc64")] - pub fn available_guest_protection() -> Result { - if !Uid::effective().is_root() { - return Err(check::ProtectionError::NoPerms); -diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile -index 188040864..46912d480 100644 ---- a/src/runtime-rs/Makefile -+++ b/src/runtime-rs/Makefile -@@ -18,7 +18,7 @@ CONTAINERD_RUNTIME_NAME = io.containerd.kata.v2 - include ../../utils.mk - - ifeq ($(ARCH), ppc64le) -- override ARCH = powerpc64le -+ override ARCH = powerpc64 - endif - - ARCH_DIR = arch -@@ -31,7 +31,7 @@ test: - @echo "s390x is not currently supported" - exit 0 - install: install-runtime install-configs --else ifeq ($(ARCH), powerpc64le) -+else ifeq ($(ARCH), powerpc64) - default: - @echo "PowerPC 64 LE is not currently supported" - exit 0 -diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile -index 855017db4..cf168e862 100644 ---- a/src/tools/agent-ctl/Makefile -+++ b/src/tools/agent-ctl/Makefile -@@ -6,7 +6,7 @@ - include ../../../utils.mk - - ifeq ($(ARCH), ppc64le) -- override ARCH = powerpc64le -+ override ARCH = powerpc64 - endif - - .DEFAULT_GOAL := default -diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile -index b33541467..f1b4b754a 100644 ---- a/src/tools/genpolicy/Makefile -+++ b/src/tools/genpolicy/Makefile -@@ -7,7 +7,7 @@ - include ../../../utils.mk - - ifeq ($(ARCH), ppc64le) -- override ARCH = powerpc64le -+ override ARCH = powerpc64 - endif - - COMMIT_HASH := $(shell git rev-parse HEAD 2>/dev/null || true) -diff --git a/src/tools/kata-ctl/Cross.toml b/src/tools/kata-ctl/Cross.toml -index 88f18e96e..e07b885a8 100644 ---- a/src/tools/kata-ctl/Cross.toml -+++ b/src/tools/kata-ctl/Cross.toml -@@ -8,5 +8,5 @@ pre-build = ["dpkg --add-architecture arm64 && apt-get update && apt-get install - pre-build = ["dpkg --add-architecture amd64 && apt-get update && apt-get install -y libssl-dev:amd64"] - - # Powerpc compile seems to be broken, due to `ring` crate not being supported on powerpc. --[target.powerpc64le-unknown-linux-gnu] -+[target.powerpc64-unknown-linux-gnu] - pre-build = ["dpkg --add-architecture ppc64le && apt-get update && apt-get install -y libssl-dev:ppc64le"] -diff --git a/src/tools/kata-ctl/src/arch/mod.rs b/src/tools/kata-ctl/src/arch/mod.rs -index b0010955d..aa6a527ff 100644 ---- a/src/tools/kata-ctl/src/arch/mod.rs -+++ b/src/tools/kata-ctl/src/arch/mod.rs -@@ -8,10 +8,10 @@ pub mod aarch64; - #[cfg(target_arch = "aarch64")] - pub use aarch64 as arch_specific; - --#[cfg(target_arch = "powerpc64le")] --pub mod powerpc64le; --#[cfg(target_arch = "powerpc64le")] --pub use powerpc64le as arch_specific; -+#[cfg(target_arch = "powerpc64")] -+pub mod powerpc64; -+#[cfg(target_arch = "powerpc64")] -+pub use powerpc64 as arch_specific; - - #[cfg(target_arch = "s390x")] - pub mod s390x; -@@ -25,7 +25,7 @@ pub use x86_64 as arch_specific; - - #[cfg(not(any( - target_arch = "aarch64", -- target_arch = "powerpc64le", -+ target_arch = "powerpc64", - target_arch = "s390x", - target_arch = "x86_64" - )))] -diff --git a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs b/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs -index bf5822c04..dbd09e651 100644 ---- a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs -+++ b/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs -@@ -4,7 +4,7 @@ - // - - use crate::types::*; --#[cfg(target_arch = "powerpc64le")] -+#[cfg(target_arch = "powerpc64")] - pub use arch_specific::*; - - mod arch_specific { -@@ -16,7 +16,7 @@ mod arch_specific { - pub const ARCH_CPU_MODEL_FIELD: &str = "model"; - - pub fn check() -> Result<()> { -- unimplemented!("Check not implemented in powerpc64le"); -+ unimplemented!("Check not implemented in powerpc64"); - } - - pub fn get_checks() -> Option<&'static [CheckItem<'static>]> { -diff --git a/src/tools/runk/Makefile b/src/tools/runk/Makefile -index b23cab145..af85ba6d6 100644 ---- a/src/tools/runk/Makefile -+++ b/src/tools/runk/Makefile -@@ -9,7 +9,7 @@ LIBC ?= gnu - include ../../../utils.mk - - ifeq ($(ARCH), ppc64le) -- override ARCH = powerpc64le -+ override ARCH = powerpc64 - endif - - TARGET = runk -diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Makefile -index bf6b80a54..81de556c7 100644 ---- a/src/tools/trace-forwarder/Makefile -+++ b/src/tools/trace-forwarder/Makefile -@@ -6,7 +6,7 @@ - include ../../../utils.mk - - ifeq ($(ARCH), ppc64le) -- override ARCH = powerpc64le -+ override ARCH = powerpc64 - endif - - .DEFAULT_GOAL := default -diff --git a/tests/common.bash b/tests/common.bash -index ca8b59bbf..78f894287 100644 ---- a/tests/common.bash -+++ b/tests/common.bash -@@ -601,7 +601,7 @@ function clone_cri_containerd() { - # version: the version of the tarball that will be downloaded - # tarball-name: the name of the tarball that will be downloaded - function download_github_project_tarball() { -- project="${1}" -+ project="${1}" - version="${2}" - tarball_name="${3}" - -@@ -752,7 +752,7 @@ function arch_to_rust() { - - case "${arch}" in - aarch64) echo "${arch}";; -- ppc64le) echo "powerpc64le";; -+ ppc64le) echo "powerpc64";; - x86_64) echo "${arch}";; - s390x) echo "${arch}";; - *) die "unsupported architecture: ${arch}";; -diff --git a/tests/install_rust.sh b/tests/install_rust.sh -index b44b94be7..08ae157e0 100755 ---- a/tests/install_rust.sh -+++ b/tests/install_rust.sh -@@ -35,7 +35,7 @@ export PATH="${PATH}:${HOME}/.cargo/bin" - ## this command will not take too long to run. - rustup toolchain install ${version} - rustup default ${version} --if [ "${rustarch}" == "powerpc64le" ] || [ "${rustarch}" == "s390x" ] ; then -+if [ "${rustarch}" == "powerpc64" ] || [ "${rustarch}" == "s390x" ] ; then - rustup target add ${rustarch}-unknown-linux-gnu - else - rustup target add ${rustarch}-unknown-linux-musl -diff --git a/tests/kata-arch.sh b/tests/kata-arch.sh -index 38146ef72..1a6643fe0 100755 ---- a/tests/kata-arch.sh -+++ b/tests/kata-arch.sh -@@ -46,7 +46,7 @@ function arch_to_rust() { - local arch="$1" - - if [ "${arch}" == "ppc64le" ]; then -- arch="powerpc64le" -+ arch="powerpc64" - fi - - echo "${arch}" -diff --git a/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in b/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in -index d67bceb99..6ea7e3d23 100644 ---- a/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in -+++ b/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in -@@ -33,7 +33,7 @@ RUN apt-get update && \ - $(gcc_arch="@ARCH@" && [ "$(uname -m)" != "$gcc_arch" ] && ( \ - libc_arch="$gcc_arch" && \ - [ "$gcc_arch" = aarch64 ] && libc_arch=arm64; \ -- [ "$gcc_arch" = ppc64le ] && gcc_arch=powerpc64le && libc_arch=ppc64el; \ -+ [ "$gcc_arch" = ppc64le ] && gcc_arch=powerpc64 && libc_arch=ppc64el; \ - [ "$gcc_arch" = s390x ] && gcc_arch=s390x && libc_arch=s390x; \ - [ "$gcc_arch" = x86_64 ] && gcc_arch=x86-64 && libc_arch=amd64; \ - echo "gcc-$gcc_arch-linux-gnu libc6-dev-$libc_arch-cross")) \ -@@ -77,7 +77,7 @@ RUN ARCH=$(uname -m); \ - libc=""; \ - case "${ARCH}" in \ - "aarch64") rust_arch="${ARCH}"; libc="musl"; ;; \ -- "ppc64le") rust_arch="powerpc64le"; libc="gnu"; ;; \ -+ "ppc64le") rust_arch="powerpc64"; libc="gnu"; ;; \ - "x86_64") rust_arch="${ARCH}"; libc="musl"; ;; \ - "s390x") rust_arch="${ARCH}"; libc="gnu"; ;; \ - *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ -diff --git a/tools/osbuilder/rootfs-builder/ubuntu/config.sh b/tools/osbuilder/rootfs-builder/ubuntu/config.sh -index 356505527..e9ff5c105 100644 ---- a/tools/osbuilder/rootfs-builder/ubuntu/config.sh -+++ b/tools/osbuilder/rootfs-builder/ubuntu/config.sh -@@ -22,7 +22,7 @@ esac - - if [ "$(uname -m)" != "$ARCH" ]; then - case "$ARCH" in -- ppc64le) cc_arch=powerpc64le;; -+ ppc64le) cc_arch=powerpc64;; - x86_64) cc_arch=x86-64;; - *) cc_arch="$ARCH" - esac -diff --git a/tools/osbuilder/scripts/lib.sh b/tools/osbuilder/scripts/lib.sh -index 5e3687595..670e58c24 100644 ---- a/tools/osbuilder/scripts/lib.sh -+++ b/tools/osbuilder/scripts/lib.sh -@@ -221,7 +221,7 @@ generate_dockerfile() - [ -d "${dir}" ] || die "${dir}: not a directory" - - local rustarch="$ARCH" -- [ "$ARCH" = ppc64le ] && rustarch=powerpc64le -+ [ "$ARCH" = ppc64le ] && rustarch=powerpc64 - - [ -n "${http_proxy:-}" ] && readonly set_proxy="RUN sed -i '$ a proxy="${http_proxy:-}"' /etc/dnf/dnf.conf /etc/yum.conf; true" - -diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh -index 73f51817b..6e948d183 100755 ---- a/tools/packaging/scripts/configure-hypervisor.sh -+++ b/tools/packaging/scripts/configure-hypervisor.sh -@@ -213,7 +213,7 @@ generate_qemu_options() { - if [ $arch != $host ];then - case $arch in - aarch64) qemu_options+=(size:--cross-prefix=aarch64-linux-gnu-);; -- ppc64le) qemu_options+=(size:--cross-prefix=powerpc64le-linux-gnu-);; -+ ppc64le) qemu_options+=(size:--cross-prefix=powerpc64-linux-gnu-);; - s390x) exit;; - x86_64);; - *) exit;; -diff --git a/tools/packaging/static-build/agent/Dockerfile b/tools/packaging/static-build/agent/Dockerfile -index fed801d94..5fc9f1201 100644 ---- a/tools/packaging/static-build/agent/Dockerfile -+++ b/tools/packaging/static-build/agent/Dockerfile -@@ -45,7 +45,7 @@ RUN ARCH=$(uname -m); \ - libc=""; \ - case "${ARCH}" in \ - "aarch64") rust_arch="${ARCH}"; libc="musl" ;; \ -- "ppc64le") rust_arch="powerpc64le"; libc="gnu" ;; \ -+ "ppc64le") rust_arch="powerpc64"; libc="gnu" ;; \ - "x86_64") rust_arch="${ARCH}"; libc="musl" ;; \ - "s390x") rust_arch="${ARCH}"; libc="gnu" ;; \ - *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ -diff --git a/tools/packaging/static-build/coco-guest-components/Dockerfile b/tools/packaging/static-build/coco-guest-components/Dockerfile -index d5fcedb05..1b7054f31 100644 ---- a/tools/packaging/static-build/coco-guest-components/Dockerfile -+++ b/tools/packaging/static-build/coco-guest-components/Dockerfile -@@ -48,7 +48,7 @@ RUN ARCH=$(uname -m); \ - rust_arch=""; \ - case "${ARCH}" in \ - "aarch64") rust_arch="${ARCH}" ;; \ -- "ppc64le") rust_arch="powerpc64le" ;; \ -+ "ppc64le") rust_arch="powerpc64" ;; \ - "x86_64") rust_arch="${ARCH}" ;; \ - "s390x") rust_arch="${ARCH}" ;; \ - *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ -diff --git a/tools/packaging/static-build/qemu/Dockerfile b/tools/packaging/static-build/qemu/Dockerfile -index 7a910958f..2560fc7da 100644 ---- a/tools/packaging/static-build/qemu/Dockerfile -+++ b/tools/packaging/static-build/qemu/Dockerfile -@@ -67,7 +67,6 @@ RUN apt-get update && apt-get upgrade -y && \ - rsync \ - zlib1g-dev${DPKG_ARCH} && \ - if [ "${ARCH}" != s390x ]; then apt-get install -y --no-install-recommends libpmem-dev${DPKG_ARCH}; fi && \ -- GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64le"; fi && \ -+ GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64"; fi && \ - if [ "${ARCH}" != "$(uname -m)" ]; then apt-get install --no-install-recommends -y gcc-"${GCC_ARCH}"-linux-gnu; fi && \ - apt-get clean && rm -rf /var/lib/apt/lists/ -- -diff --git a/tools/packaging/static-build/shim-v2/Dockerfile b/tools/packaging/static-build/shim-v2/Dockerfile -index 808f24346..cc3930e1f 100644 ---- a/tools/packaging/static-build/shim-v2/Dockerfile -+++ b/tools/packaging/static-build/shim-v2/Dockerfile -@@ -6,7 +6,7 @@ FROM ubuntu:20.04 - ENV DEBIAN_FRONTEND=noninteractive - - ENV GO_HOME="/opt" --ENV GOCACHE="${GO_HOME}/.cache" -+ENV GOCACHE="${GO_HOME}/.cache" - ENV RUSTUP_HOME="/opt/rustup" - ENV CARGO_HOME="/opt/cargo" - ENV PATH="/opt/cargo/bin/:/opt/go/bin:${PATH}" -@@ -32,19 +32,19 @@ RUN apt-get update && \ - sudo && \ - apt-get clean && rm -rf /var/lib/apt/lists/&& \ - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${RUST_VERSION} -- -+ - RUN ARCH=$(uname -m); \ - rust_arch=""; \ - libc=""; \ - case "${ARCH}" in \ - "aarch64") rust_arch="${ARCH}"; libc="musl"; ;; \ -- "ppc64le") rust_arch="powerpc64le"; libc="gnu"; ;; \ -+ "ppc64le") rust_arch="powerpc64"; libc="gnu"; ;; \ - "x86_64") rust_arch="${ARCH}"; libc="musl"; ;; \ - "s390x") rust_arch="${ARCH}"; libc="gnu"; ;; \ - *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ - esac; \ -- rustup target add "${rust_arch}-unknown-linux-${libc}" -- -+ rustup target add "${rust_arch}-unknown-linux-${libc}" -+ - RUN ARCH=$(uname -m); \ - goarch=""; \ - kernelname=$(uname -s | tr '[:upper:]' '[:lower:]'); \ -@@ -58,6 +58,6 @@ RUN ARCH=$(uname -m); \ - curl -OL "https://storage.googleapis.com/golang/go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" && \ - tar -C "${GO_HOME}" -xzf "go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" && \ - rm "go${GO_VERSION}.${kernelname}-${goarch}.tar.gz" -- -+ - # aarch64 requires this name -- link for all - RUN ln -s /usr/bin/musl-gcc "/usr/bin/$(uname -m)-linux-musl-gcc" -diff --git a/tools/packaging/static-build/shim-v2/build.sh b/tools/packaging/static-build/shim-v2/build.sh -index 3944b0928..8fa9013d8 100755 ---- a/tools/packaging/static-build/shim-v2/build.sh -+++ b/tools/packaging/static-build/shim-v2/build.sh -@@ -49,7 +49,7 @@ docker pull ${container_image} || \ - arch=${ARCH:-$(uname -m)} - GCC_ARCH=${arch} - if [ ${arch} = "ppc64le" ]; then -- GCC_ARCH="powerpc64le" -+ GCC_ARCH="powerpc64" - arch="ppc64" - fi - -diff --git a/tools/packaging/static-build/virtiofsd/gnu/Dockerfile b/tools/packaging/static-build/virtiofsd/gnu/Dockerfile -index b0cd97584..9f155e8fc 100644 ---- a/tools/packaging/static-build/virtiofsd/gnu/Dockerfile -+++ b/tools/packaging/static-build/virtiofsd/gnu/Dockerfile -@@ -33,7 +33,7 @@ RUN ARCH=$(uname -m); \ - extra_rust_flags=" -C link-self-contained=yes"; \ - case "${ARCH}" in \ - "aarch64") rust_arch="${ARCH}"; libc="musl"; arch_libc="" ;; \ -- "ppc64le") rust_arch="powerpc64le"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ -+ "ppc64le") rust_arch="powerpc64"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ - "x86_64") rust_arch="${ARCH}"; libc="musl"; arch_libc="" ;; \ - "s390x") rust_arch="${ARCH}"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ - *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ -diff --git a/tools/packaging/static-build/virtiofsd/musl/Dockerfile b/tools/packaging/static-build/virtiofsd/musl/Dockerfile -index 270aadf52..85e3db10f 100644 ---- a/tools/packaging/static-build/virtiofsd/musl/Dockerfile -+++ b/tools/packaging/static-build/virtiofsd/musl/Dockerfile -@@ -30,7 +30,7 @@ RUN ARCH=$(uname -m); \ - extra_rust_flags=" -C link-self-contained=yes"; \ - case "${ARCH}" in \ - "aarch64") rust_arch="${ARCH}"; libc="musl"; arch_libc="" ;; \ -- "ppc64le") rust_arch="powerpc64le"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ -+ "ppc64le") rust_arch="powerpc64"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ - "x86_64") rust_arch="${ARCH}"; libc="musl"; arch_libc="" ;; \ - "s390x") rust_arch="${ARCH}"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ - *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \ -diff --git a/utils.mk b/utils.mk -index 4edba5524..23b73fc8d 100644 ---- a/utils.mk -+++ b/utils.mk -@@ -147,7 +147,7 @@ endif - - ifeq ($(ARCH), ppc64le) - override LIBC = gnu -- $(warning "WARNING: powerpc64le-unknown-linux-musl target is unavailable") -+ $(warning "WARNING: powerpc64-unknown-linux-musl target is unavailable") - endif - - ifeq ($(ARCH), s390x) --- -2.47.1 - diff --git a/kata-containers.spec b/kata-containers.spec index ee58cf2..afa5658 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.13.0 +Version: 3.14.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -66,10 +66,7 @@ Source5: 50-kata # Keep this patch downstream as it'd be hard to justify such change upstream Patch0999: 0999-osbuilder-Adjust-agent_version-for-our-builds.patch -Patch1000: 1000-Remove-shebang-in-non-executable-completion-script.patch Patch1001: 1001-Remove-warnings-as-compilation-errors.patch -Patch1002: 1002-Bump-time-dependency-for-Kata.patch -Patch1003: 1003-Fix-arch-name-compilation-failure.patch %if 0%{?have_go_rpm_macros} BuildRequires: go-rpm-macros @@ -390,6 +387,9 @@ fi %changelog +* Tue Jul 08 2025 Christophe de Dinechin - 3.14.0-1 +- kata-containers 3.14.0, update to latest release + * Mon Jul 07 2025 Christophe de Dinechin - 3.13.0-1 - kata-containers 3.13.0, required vendor source correction diff --git a/sources b/sources index 4d56c0a..f929c33 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.13.0.tar.gz) = a1a56e0b8bf9a27c54144bbf2a03b3ee600079d780836946cfe6ceb32d9bec606639bb038dc73d489c36e9c0c7da6c4c7ef708b9abec821b789f1973b98f7641 -SHA512 (kata-containers-3.13.0-vendor.tar.gz) = a15257dfd09c460d4c5661e5c0523533df83e2d48a5779096a02d27463de6a1c1a28cdfe967896e6cc1d96a8074e0e88572d9c4ab92ee2cb6da5adec298e0459 +SHA512 (kata-containers-3.14.0.tar.gz) = 3aae1c357cd6bafbdbf28f27d3894214ae032a6cb7fca1ac0cc55d905642eeb51ff8266f831afec21a3ff1945bd905a594edb3e176785173e850dc7fb3a85f3c +SHA512 (kata-containers-3.14.0-vendor.tar.gz) = 75e1215b9aad7c69045a1538e2cdbb7abd5ebf9a9c6b42b28e3bd84bd9261bb52fbb0d23513344c5aa0f3c36c7addefeca515f111ebb3a7e8d4e4e6544f41c17 diff --git a/vendor-tarball.sh b/vendor-tarball.sh index 14aa396..fb6a23c 100755 --- a/vendor-tarball.sh +++ b/vendor-tarball.sh @@ -2,7 +2,7 @@ set -xeuo pipefail # Kata version -KATA_VERSION=3.13.0 +KATA_VERSION=3.14.0 RUST_SOURCES_TO_FIX="src/agent src/tools/kata-ctl" # Original vendor tarball downloaded from upstream From f96442ccb6f8d9c04bd76c439db06f00a0dd34f5 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Wed, 23 Jul 2025 16:18:32 +0200 Subject: [PATCH 47/65] Pick up the correct systemd unit when starting the OS With the current configuration, we get: [ 1.209181] systemd[1]: Failed to isolate default target: Unit rescue.service not found. [!!!!!!] Failed to isolate default target. [ 1.210339] systemd[1]: Freezing execution. Also added a very basic script, test_kata_rpm.sh, to check using `ctr` that we can run a basic Alpine container with the installed runtime. Signed-off-by: Christophe de Dinechin Suggested-by: Greg Kurz --- kata-containers.spec | 5 ++- kata-osbuilder.sh | 5 +++ test_kata_rpm.sh | 80 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100755 test_kata_rpm.sh diff --git a/kata-containers.spec b/kata-containers.spec index afa5658..a9bfc5b 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist} +Release: 1%{?rcrel}%{?dist}.1 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -387,6 +387,9 @@ fi %changelog +* Wed Jul 23 2025 Christophe de Dinechin - 3.14.1-1 +- kata-containers 3.14.1, add fix for systemd configuration and rpm sanity test + * Tue Jul 08 2025 Christophe de Dinechin - 3.14.0-1 - kata-containers 3.14.0, update to latest release diff --git a/kata-osbuilder.sh b/kata-osbuilder.sh index 15c7842..c523d05 100755 --- a/kata-osbuilder.sh +++ b/kata-osbuilder.sh @@ -210,6 +210,11 @@ generate_rootfs() # Generate modules-load.d file generate_modules_load_conf + + # Mask initrd.target and default to multi-user.target + # Temporary workaround for KATA-3944 + systemctl mask --root=${DRACUT_ROOTFS} initrd.target + systemctl set-default --root=${DRACUT_ROOTFS} multi-user.target } diff --git a/test_kata_rpm.sh b/test_kata_rpm.sh new file mode 100755 index 0000000..76c6ac3 --- /dev/null +++ b/test_kata_rpm.sh @@ -0,0 +1,80 @@ +#!/bin/bash +set -euo pipefail + +# Usage: ./test_kata_rpm.sh /path/to/kata-containers-3.15*.rpm + +RPM_PATH=${1:-} + +if [[ -z "$RPM_PATH" ]]; then + echo "Usage: $0 /path/to/kata-containers-3.15*.rpm" + exit 1 +fi + +# 1. Install the RPM +echo "[1/6] Installing Kata Containers RPM: $RPM_PATH" +sudo dnf install -y "$RPM_PATH" + +echo "[2/6] Checking installed binaries and versions..." +# kata-agent is not expected on the host; it runs inside the Kata VM image. +if command -v kata-runtime >/dev/null 2>&1; then + kata-runtime --version +else + echo "kata-runtime not found in PATH!"; exit 1 +fi +if command -v kata-ctl >/dev/null 2>&1; then + kata-ctl version +else + echo "kata-ctl not found in PATH!"; exit 1 +fi + +echo "[3/6] Checking QEMU version..." +if command -v qemu-system-x86_64 >/dev/null 2>&1; then + qemu-system-x86_64 --version +else + echo "qemu-system-x86_64 not found in PATH!"; exit 1 +fi + +echo "[4/6] Loading vhost_net kernel module (required for Kata networking)..." +sudo modprobe vhost_net + +# 5. Run kata-runtime check (system compatibility) +echo "[5/6] Running kata-runtime check (system compatibility)..." +if ! kata-runtime check; then + echo "[ERROR] System is not capable of running Kata Containers." + exit 1 +fi + +# 6. Run a simple Kata container using containerd (if available) +echo "[6/6] Attempting to run a test container with Kata runtime (containerd)..." +if command -v ctr >/dev/null 2>&1; then + sudo ctr images pull docker.io/library/alpine:latest + # Start a container in the background (do not use --rm so we can exec into it) + sudo ctr run -d --runtime io.containerd.kata.v2 docker.io/library/alpine:latest kata-test-bg sleep 300 + # Wait a moment for the container to be up + sleep 2 + echo "[Test] Exec into the running container and run 'ls -lR /'..." + sudo ctr task exec -t --exec-id kata-ls kata-test-bg ls -lR / + echo "[Test] Show /etc/os-release inside the container..." + sudo ctr task exec -t --exec-id kata-osrel kata-test-bg cat /etc/os-release + # Clean up: kill the task and delete the container + echo "[Cleanup] Deleting test container..." + sudo ctr task kill kata-test-bg || true + sudo ctr task rm kata-test-bg || true + sudo ctr container rm kata-test-bg || true + # Also run the original test (run+rm) + sudo ctr run --runtime io.containerd.kata.v2 --rm docker.io/library/alpine:latest kata-test uname -a || { + echo "Failed to run container with Kata runtime."; exit 1; + } +else + echo "containerd (ctr) not found, skipping container test." +fi + +# Check logs for errors +echo "[Post-test] Checking Kata logs for errors..." +if journalctl --version >/dev/null 2>&1; then + sudo journalctl -xe | grep kata || echo "No kata logs found." +else + echo "journalctl not found, skipping log check." +fi + +echo "All tests completed. If no errors above, the RPM is likely working." \ No newline at end of file From cc66eb9f6b2c07d7e063bcb9017e5c850a587e22 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Thu, 24 Jul 2025 13:29:08 +0200 Subject: [PATCH 48/65] Bump to Kata 3.15 Signed-off-by: Christophe de Dinechin --- .gitignore | 2 ++ kata-containers.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6cae878..0a25426 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,5 @@ /kata-containers-3.13.0.tar.gz /kata-containers-3.14.0-vendor.tar.gz /kata-containers-3.14.0.tar.gz +/kata-containers-3.15.0.tar.gz +/kata-containers-3.15.0-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index a9bfc5b..e6f761c 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.14.0 +Version: 3.15.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -53,7 +53,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} src/agent/README.md Name: %{repo} -Release: 1%{?rcrel}%{?dist}.1 +Release: 1%{?rcrel}%{?dist} Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -387,6 +387,9 @@ fi %changelog +* Thu Jul 24 2025 Christophe de Dinechin - 3.15.0-1 +- kata-containers 3.15.0 + * Wed Jul 23 2025 Christophe de Dinechin - 3.14.1-1 - kata-containers 3.14.1, add fix for systemd configuration and rpm sanity test diff --git a/sources b/sources index f929c33..ec33a68 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.14.0.tar.gz) = 3aae1c357cd6bafbdbf28f27d3894214ae032a6cb7fca1ac0cc55d905642eeb51ff8266f831afec21a3ff1945bd905a594edb3e176785173e850dc7fb3a85f3c -SHA512 (kata-containers-3.14.0-vendor.tar.gz) = 75e1215b9aad7c69045a1538e2cdbb7abd5ebf9a9c6b42b28e3bd84bd9261bb52fbb0d23513344c5aa0f3c36c7addefeca515f111ebb3a7e8d4e4e6544f41c17 +SHA512 (kata-containers-3.15.0.tar.gz) = 01449303f2d9545dcaac9cab48b38a69c7d1656bb9da628eb6ce3daa038eed95048992fa065e313be33f74e20c721ff1af21e78e2563d636199730b33541e53e +SHA512 (kata-containers-3.15.0-vendor.tar.gz) = 29aad11822b9e85d92fe6f784c3fbed5e0d5477b2797aa9b7425edc2a453224fc7e1aaa558385adbb5ad16ae761610422dcde8599786a8777fcba0f8f9869f91 From c424516c70e3890f12224ef735e4f324ee9a9bb3 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Thu, 24 Jul 2025 17:50:07 +0200 Subject: [PATCH 49/65] Bump to Kata Containers 3.16 Some changes required to the 1001 patch file for src/genpolicy/Makefile Signed-off-by: Christophe de Dinechin --- .gitignore | 3 +++ ...emove-warnings-as-compilation-errors.patch | 24 +++++++++---------- kata-containers.spec | 9 ++++++- sources | 4 ++-- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 0a25426..e4cc1d3 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,6 @@ /kata-containers-3.14.0.tar.gz /kata-containers-3.15.0.tar.gz /kata-containers-3.15.0-vendor.tar.gz +/kata-containers-3.16.0.tar.gz +/kata-containers-3.16.0-vendor.tar.gz +/kata-containers-3.16.0-fedora-vendor.tar.gz diff --git a/1001-Remove-warnings-as-compilation-errors.patch b/1001-Remove-warnings-as-compilation-errors.patch index 47ab17c..140375f 100644 --- a/1001-Remove-warnings-as-compilation-errors.patch +++ b/1001-Remove-warnings-as-compilation-errors.patch @@ -21,7 +21,7 @@ diff --git a/src/agent/Makefile b/src/agent/Makefile index e62a894aa..39d351213 100644 --- a/src/agent/Makefile +++ b/src/agent/Makefile -@@ -134,14 +134,14 @@ static-checks-build: $(GENERATED_CODE) +@@ -130,14 +130,14 @@ static-checks-build: $(GENERATED_CODE) $(TARGET): $(GENERATED_CODE) $(TARGET_PATH) $(TARGET_PATH): show-summary @@ -69,7 +69,7 @@ diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index 0bb0617ff..188040864 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile -@@ -580,7 +580,7 @@ static-checks-build: $(GENERATED_FILES) +@@ -600,7 +600,7 @@ static-checks-build: $(GENERATED_FILES) $(TARGET): $(GENERATED_FILES) $(TARGET_PATH) $(TARGET_PATH): $(SOURCES) | show-summary @@ -78,7 +78,7 @@ index 0bb0617ff..188040864 100644 $(GENERATED_FILES): %: %.in @sed \ -@@ -590,7 +590,7 @@ $(GENERATED_FILES): %: %.in +@@ -610,7 +610,7 @@ $(GENERATED_FILES): %: %.in ##TARGET optimize: optimized build optimize: $(SOURCES) | show-summary show-header @@ -91,7 +91,7 @@ diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile index a49f88e6b..855017db4 100644 --- a/src/tools/agent-ctl/Makefile +++ b/src/tools/agent-ctl/Makefile -@@ -13,7 +13,7 @@ endif +@@ -9,7 +9,7 @@ endif default: build build: @@ -100,7 +100,7 @@ index a49f88e6b..855017db4 100644 static-checks-build: @echo "INFO: static-checks-build do nothing.." -@@ -27,7 +27,7 @@ vendor: +@@ -23,7 +23,7 @@ vendor: test: install: @@ -113,16 +113,16 @@ diff --git a/src/tools/genpolicy/Makefile b/src/tools/genpolicy/Makefile index 7410e20ed..b33541467 100644 --- a/src/tools/genpolicy/Makefile +++ b/src/tools/genpolicy/Makefile -@@ -28,7 +28,7 @@ $(GENERATED_FILES): %: %.in +@@ -24,7 +24,7 @@ $(GENERATED_FILES): %: %.in default: build build: $(GENERATED_FILES) -- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) -+ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) --$(BUILD_TYPE) +- @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) ++ @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) static-checks-build: @echo "INFO: static-checks-build do nothing.." -@@ -41,10 +41,10 @@ vendor: +@@ -37,10 +37,10 @@ vendor: cargo vendor test: $(GENERATED_FILES) @@ -165,7 +165,7 @@ diff --git a/src/tools/runk/Makefile b/src/tools/runk/Makefile index 186955679..b23cab145 100644 --- a/src/tools/runk/Makefile +++ b/src/tools/runk/Makefile -@@ -36,7 +36,7 @@ endif +@@ -32,7 +32,7 @@ endif default: build build: @@ -178,7 +178,7 @@ diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Make index 5d9f71856..bf6b80a54 100644 --- a/src/tools/trace-forwarder/Makefile +++ b/src/tools/trace-forwarder/Makefile -@@ -13,7 +13,7 @@ endif +@@ -9,7 +9,7 @@ endif default: build build: @@ -191,7 +191,7 @@ diff --git a/utils.mk b/utils.mk index 1a153e26c..4edba5524 100644 --- a/utils.mk +++ b/utils.mk -@@ -177,7 +177,7 @@ standard_rust_check: +@@ -183,7 +183,7 @@ standard_rust_check: cargo fmt -- --check cargo clippy --all-targets --all-features --release \ -- \ diff --git a/kata-containers.spec b/kata-containers.spec index e6f761c..e658b88 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.15.0 +Version: 3.16.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -52,6 +52,10 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} CONTRIBUTING.md\\\ src/agent/README.md +# Note: the original vendor tarball is big (918M for 3.16) +# It can be stripped down to only keep the src/agent vendor changes with: +# VERSION=3.16.0; bsdtar -cz --include 'src/agent' -f kata-containers-$VERSION-fedora-vendor.tar.gz @kata-containers-$VERSION-vendor.tar.gz +# This produces a vendor tarball that is "only" 105M in size. Name: %{repo} Release: 1%{?rcrel}%{?dist} Summary: Kata Containers version 3.x repository @@ -387,6 +391,9 @@ fi %changelog +* Thu Jul 24 2025 Christophe de Dinechin - 3.16.0-1 +- kata-containers 3.165.0 + * Thu Jul 24 2025 Christophe de Dinechin - 3.15.0-1 - kata-containers 3.15.0 diff --git a/sources b/sources index ec33a68..39a6409 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.15.0.tar.gz) = 01449303f2d9545dcaac9cab48b38a69c7d1656bb9da628eb6ce3daa038eed95048992fa065e313be33f74e20c721ff1af21e78e2563d636199730b33541e53e -SHA512 (kata-containers-3.15.0-vendor.tar.gz) = 29aad11822b9e85d92fe6f784c3fbed5e0d5477b2797aa9b7425edc2a453224fc7e1aaa558385adbb5ad16ae761610422dcde8599786a8777fcba0f8f9869f91 +SHA512 (kata-containers-3.16.0.tar.gz) = 17aca02195fa1ed55efcb5f31b50a7efe61c9f870ca0404ce3eb1b5494a9a71bd07509c840e90ae62798648c9ce96d7fb4ce770f0bf54ac9daad7e0f140cbecd +SHA512 (kata-containers-3.16.0-fedora-vendor.tar.gz) = fdd671e6b99510a81c59a4c6583ea45bd69c579e48436f4c32d6fb920656dca8694b8fd07381a48375e57f781993ae0e689738df4d81a5765bbfb4f6bc0cb077 From 8fdc6ee100c2e9341a770f3d9d5904d751f5ca68 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Thu, 24 Jul 2025 17:50:07 +0200 Subject: [PATCH 50/65] Changes to use the reduced `fedora` vendor tarball The procedure to reduce the vendor tarball means that the name of the sources changes. Signed-off-by: Christophe de Dinechin --- kata-containers.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index e658b88..a12585e 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -62,7 +62,7 @@ Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} Source0: https://%{download}/archive/%{version}%{?rcstr}/%{repo}-%{version}%{?rcstr}.tar.gz -Source1: https://%{download}/releases/download/%{version}/%{repo}-%{version}%{?rcstr}-vendor.tar.gz +Source1: %{repo}-%{version}%{?rcstr}-fedora-vendor.tar.gz Source2: kata-osbuilder.sh Source3: kata-osbuilder-generate.service Source4: 15-dracut.conf From 837f56b76efc1f3e1d7e34e93f9d07347dabbf67 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Fri, 25 Jul 2025 14:47:08 +0200 Subject: [PATCH 51/65] Revert "Changes to use the reduced `fedora` vendor tarball" In the Fedora case, we need to build tools like `kata-ctl`, so we need the corresponding vendoring code. Without it, the build fails with messages like: Updating git repository `https://github.com/firecracker-microvm/micro-http` error: failed to get `micro_http` as a dependency of package `kata-ctl v0.0.1 (/builddir/build/BUILD/kata-containers-3.16.0-build/kata-containers-3.16.0/src/tools/kata-ctl)` --- kata-containers.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kata-containers.spec b/kata-containers.spec index a12585e..e658b88 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -62,7 +62,7 @@ Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} Source0: https://%{download}/archive/%{version}%{?rcstr}/%{repo}-%{version}%{?rcstr}.tar.gz -Source1: %{repo}-%{version}%{?rcstr}-fedora-vendor.tar.gz +Source1: https://%{download}/releases/download/%{version}/%{repo}-%{version}%{?rcstr}-vendor.tar.gz Source2: kata-osbuilder.sh Source3: kata-osbuilder-generate.service Source4: 15-dracut.conf diff --git a/sources b/sources index 39a6409..0a3e329 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (kata-containers-3.16.0.tar.gz) = 17aca02195fa1ed55efcb5f31b50a7efe61c9f870ca0404ce3eb1b5494a9a71bd07509c840e90ae62798648c9ce96d7fb4ce770f0bf54ac9daad7e0f140cbecd -SHA512 (kata-containers-3.16.0-fedora-vendor.tar.gz) = fdd671e6b99510a81c59a4c6583ea45bd69c579e48436f4c32d6fb920656dca8694b8fd07381a48375e57f781993ae0e689738df4d81a5765bbfb4f6bc0cb077 +SHA512 (kata-containers-3.16.0-vendor.tar.gz) = f67e6fa7c79d07a8a9196331948f87f25fbbf2f23eec3e41bfeaf8170ff85cf2d0071cd392f4e35e1a5829a262699bd5429e814d673ab5d302860c5445a79c98 From 870d0893049bc2c2f3669ce86d01056522fbfa9a Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Fri, 25 Jul 2025 21:27:01 +0200 Subject: [PATCH 52/65] Bump to Kata Containers 3.17.0 Version bump, also rename test_kata_rpm.sh to test-kata-rpm.sh Signed-off-by: Christophe de Dinechin --- .gitignore | 2 ++ kata-containers.spec | 14 ++++++++------ sources | 4 ++-- test_kata_rpm.sh => test-kata-rpm.sh | 0 4 files changed, 12 insertions(+), 8 deletions(-) rename test_kata_rpm.sh => test-kata-rpm.sh (100%) diff --git a/.gitignore b/.gitignore index e4cc1d3..742f4c0 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,5 @@ /kata-containers-3.16.0.tar.gz /kata-containers-3.16.0-vendor.tar.gz /kata-containers-3.16.0-fedora-vendor.tar.gz +/kata-containers-3.17.0.tar.gz +/kata-containers-3.17.0-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index e658b88..0b6808d 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.16.0 +Version: 3.17.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -52,10 +52,9 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} CONTRIBUTING.md\\\ src/agent/README.md -# Note: the original vendor tarball is big (918M for 3.16) -# It can be stripped down to only keep the src/agent vendor changes with: -# VERSION=3.16.0; bsdtar -cz --include 'src/agent' -f kata-containers-$VERSION-fedora-vendor.tar.gz @kata-containers-$VERSION-vendor.tar.gz -# This produces a vendor tarball that is "only" 105M in size. +# Note: the original vendor tarball is quite big (918M for 3.16) +# Unlike for RHEL, we cannot strip it down because we build all components +# (RHEL builds only build kata-agent) Name: %{repo} Release: 1%{?rcrel}%{?dist} Summary: Kata Containers version 3.x repository @@ -391,8 +390,11 @@ fi %changelog +* Fri Jul 25 2025 Christophe de Dinechin - 3.17.0-1 +- kata-containers 3.17.0 + * Thu Jul 24 2025 Christophe de Dinechin - 3.16.0-1 -- kata-containers 3.165.0 +- kata-containers 3.16.0 * Thu Jul 24 2025 Christophe de Dinechin - 3.15.0-1 - kata-containers 3.15.0 diff --git a/sources b/sources index 0a3e329..d916519 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.16.0.tar.gz) = 17aca02195fa1ed55efcb5f31b50a7efe61c9f870ca0404ce3eb1b5494a9a71bd07509c840e90ae62798648c9ce96d7fb4ce770f0bf54ac9daad7e0f140cbecd -SHA512 (kata-containers-3.16.0-vendor.tar.gz) = f67e6fa7c79d07a8a9196331948f87f25fbbf2f23eec3e41bfeaf8170ff85cf2d0071cd392f4e35e1a5829a262699bd5429e814d673ab5d302860c5445a79c98 +SHA512 (kata-containers-3.17.0.tar.gz) = 1be0192abe148878877048b2e26ba4ede722d7d3bcd4925d8591fbd5a3530a8f1f7573d190906077b08dc759f5da18f50e3181ee7e8d3a9cb8bc674419af9053 +SHA512 (kata-containers-3.17.0-vendor.tar.gz) = 32d780038ed44f90f9fc6eced7c1b915bf2450868067fb010932ff922590f44fc67b94187bf0f422ae9a74cf2fd7abbb046a1912fdf66b837a61f8f7abe7f27a diff --git a/test_kata_rpm.sh b/test-kata-rpm.sh similarity index 100% rename from test_kata_rpm.sh rename to test-kata-rpm.sh From 0a3ee4381df3211212360f7f9e16e7a970af42f2 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Mon, 28 Jul 2025 13:58:41 +0200 Subject: [PATCH 53/65] Bump to Kata Container 3.18 Signed-off-by: Christophe de Dinechin --- .gitignore | 2 ++ kata-containers.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 742f4c0..2c5f60a 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,5 @@ /kata-containers-3.16.0-fedora-vendor.tar.gz /kata-containers-3.17.0.tar.gz /kata-containers-3.17.0-vendor.tar.gz +/kata-containers-3.18.0.tar.gz +/kata-containers-3.18.0-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index 0b6808d..66ab980 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.17.0 +Version: 3.18.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -390,6 +390,9 @@ fi %changelog +* Mon Jul 28 2025 Christophe de Dinechin - 3.18.0-1 +- kata-containers 3.18.0 + * Fri Jul 25 2025 Christophe de Dinechin - 3.17.0-1 - kata-containers 3.17.0 diff --git a/sources b/sources index d916519..944f8df 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.17.0.tar.gz) = 1be0192abe148878877048b2e26ba4ede722d7d3bcd4925d8591fbd5a3530a8f1f7573d190906077b08dc759f5da18f50e3181ee7e8d3a9cb8bc674419af9053 -SHA512 (kata-containers-3.17.0-vendor.tar.gz) = 32d780038ed44f90f9fc6eced7c1b915bf2450868067fb010932ff922590f44fc67b94187bf0f422ae9a74cf2fd7abbb046a1912fdf66b837a61f8f7abe7f27a +SHA512 (kata-containers-3.18.0.tar.gz) = d87274446eaa1e02b40c2805ad89245d15c0ddbc044a68ff976d9449c6e254b50ee7d194b4e8a6a347f5a269c6e45de84c0ff1f6a7528cbac78a8275166b8f53 +SHA512 (kata-containers-3.18.0-vendor.tar.gz) = aa8676aec2d4c893d01698954f94466ab26f4653e19fc5e3996b70d9d5f28bda94690a1fa602d85944c98096692fd850cbc619878311e6adb6c0a2dfe27e9999 From 7a5a0f3ba2b11542183e773aa76430b27a1e7046 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Tue, 29 Jul 2025 14:12:17 +0200 Subject: [PATCH 54/65] Bump to Kata 3.19.1 Latest release - Skipping short-lived 3.19.0 Signed-off-by: Christophe de Dinechin --- .gitignore | 2 ++ kata-containers.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2c5f60a..cf34e1f 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,5 @@ /kata-containers-3.17.0-vendor.tar.gz /kata-containers-3.18.0.tar.gz /kata-containers-3.18.0-vendor.tar.gz +/kata-containers-3.19.1.tar.gz +/kata-containers-3.19.1-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index 66ab980..4b46cd7 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.18.0 +Version: 3.19.1 %global tag %{version}%{?rcstr} %global domain github.com @@ -390,6 +390,9 @@ fi %changelog +* Mon Jul 28 2025 Christophe de Dinechin - 3.19.1-1 +- kata-containers 3.19.0 + * Mon Jul 28 2025 Christophe de Dinechin - 3.18.0-1 - kata-containers 3.18.0 diff --git a/sources b/sources index 944f8df..a58f5cf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.18.0.tar.gz) = d87274446eaa1e02b40c2805ad89245d15c0ddbc044a68ff976d9449c6e254b50ee7d194b4e8a6a347f5a269c6e45de84c0ff1f6a7528cbac78a8275166b8f53 -SHA512 (kata-containers-3.18.0-vendor.tar.gz) = aa8676aec2d4c893d01698954f94466ab26f4653e19fc5e3996b70d9d5f28bda94690a1fa602d85944c98096692fd850cbc619878311e6adb6c0a2dfe27e9999 +SHA512 (kata-containers-3.19.1.tar.gz) = 4a8c70fead695693fc9b9978944e3131fea8e85cb01814de72920088dba8c9707da3c7df592444e32a170a18e13dc1a7a6806069f4821d7f30b0db8b221016a7 +SHA512 (kata-containers-3.19.1-vendor.tar.gz) = f4650f056999cce79bb58b37bba8e38c18fee8e98610e185d5cccf844045f38ec62503368497c84d209e788c4e47c72afaf3392f619b6f3a1f5e3779bf6139f6 From 881c99d754ce485e54ede730ece0661184931880 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 18:01:56 -0500 Subject: [PATCH 55/65] Rebuild for golang-1.25.0 --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index 4b46cd7..cdb4a9a 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -56,7 +56,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} # Unlike for RHEL, we cannot strip it down because we build all components # (RHEL builds only build kata-agent) Name: %{repo} -Release: 1%{?rcrel}%{?dist} +Release: 1%{?rcrel}%{?dist}.1 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -390,6 +390,9 @@ fi %changelog +* Fri Aug 15 2025 Maxwell G - 3.19.1-1.1 +- Rebuild for golang-1.25.0 + * Mon Jul 28 2025 Christophe de Dinechin - 3.19.1-1 - kata-containers 3.19.0 From 49770fe26b5fe213e8380a3bddd41fcb7dd0e0a7 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Wed, 10 Sep 2025 16:31:17 +0200 Subject: [PATCH 56/65] Bump to Kata Containers 3.20 Signed-off-by: Christophe de Dinechin --- .gitignore | 2 ++ kata-containers.spec | 7 +++++-- test-kata-rpm.sh | 4 ++-- vendor-tarball.sh | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cf34e1f..a94ec42 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,5 @@ /kata-containers-3.18.0-vendor.tar.gz /kata-containers-3.19.1.tar.gz /kata-containers-3.19.1-vendor.tar.gz +/kata-containers-3.20.0.tar.gz +/kata-containers-3.20.0-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index cdb4a9a..de639ee 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.19.1 +Version: 3.20.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -56,7 +56,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} # Unlike for RHEL, we cannot strip it down because we build all components # (RHEL builds only build kata-agent) Name: %{repo} -Release: 1%{?rcrel}%{?dist}.1 +Release: 1%{?rcrel}%{?dist} Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -390,6 +390,9 @@ fi %changelog +* Wed Sep 10 2025 Christophe de Dinechin - 3.20.0-1 +- kata-containers 3.20.0 + * Fri Aug 15 2025 Maxwell G - 3.19.1-1.1 - Rebuild for golang-1.25.0 diff --git a/test-kata-rpm.sh b/test-kata-rpm.sh index 76c6ac3..f9e893c 100755 --- a/test-kata-rpm.sh +++ b/test-kata-rpm.sh @@ -1,12 +1,12 @@ #!/bin/bash set -euo pipefail -# Usage: ./test_kata_rpm.sh /path/to/kata-containers-3.15*.rpm +# Usage: ./test_kata_rpm.sh /path/to/kata-containers-3.20*.rpm RPM_PATH=${1:-} if [[ -z "$RPM_PATH" ]]; then - echo "Usage: $0 /path/to/kata-containers-3.15*.rpm" + echo "Usage: $0 /path/to/kata-containers-3.20*.rpm" exit 1 fi diff --git a/vendor-tarball.sh b/vendor-tarball.sh index fb6a23c..6676c88 100755 --- a/vendor-tarball.sh +++ b/vendor-tarball.sh @@ -2,7 +2,7 @@ set -xeuo pipefail # Kata version -KATA_VERSION=3.14.0 +KATA_VERSION=3.20.0 RUST_SOURCES_TO_FIX="src/agent src/tools/kata-ctl" # Original vendor tarball downloaded from upstream From 82c9c9ca9a0f71972d2dfbde0362edf19abd339e Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Thu, 11 Sep 2025 14:44:16 +0200 Subject: [PATCH 57/65] Commit missing sources Doing some experiments with Cursor, and apparently that messed up the sources file, which was not committed correctly. Signed-off-by: Christophe de Dinechin --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a58f5cf..1d2d3f2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.19.1.tar.gz) = 4a8c70fead695693fc9b9978944e3131fea8e85cb01814de72920088dba8c9707da3c7df592444e32a170a18e13dc1a7a6806069f4821d7f30b0db8b221016a7 -SHA512 (kata-containers-3.19.1-vendor.tar.gz) = f4650f056999cce79bb58b37bba8e38c18fee8e98610e185d5cccf844045f38ec62503368497c84d209e788c4e47c72afaf3392f619b6f3a1f5e3779bf6139f6 +SHA512 (kata-containers-3.20.0.tar.gz) = 8864bda669fac2ae6983b940d61961c05d6d25497bb98120f0c2fd62adbaf8fbbe2473682e4d9b694c01a451ffcbdd0c9d407da8bcc82936a61912d2487db639 +SHA512 (kata-containers-3.20.0-vendor.tar.gz) = 48ed8fb337cbccb229f6b4b1beb019a92ec577a4b0ac9e3517c9b4fd1105b8bf7ad5e7424045005134afb2e5791bd6a80a8965067acc4066e5fe70346a652bf7 From ceb50da3cd6c9dda3ef75f1c86868e4675fe7154 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Thu, 25 Sep 2025 16:21:42 +0200 Subject: [PATCH 58/65] Bump to Kata 3.21.0 This matches Kata release 3.21.0 https://github.com/kata-containers/kata-containers/releases/tag/3.21.0 Signed-off-by: Christophe de Dinechin --- .gitignore | 2 ++ kata-containers.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a94ec42..1264cb2 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,5 @@ /kata-containers-3.19.1-vendor.tar.gz /kata-containers-3.20.0.tar.gz /kata-containers-3.20.0-vendor.tar.gz +/kata-containers-3.21.0.tar.gz +/kata-containers-3.21.0-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index de639ee..2262221 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.20.0 +Version: 3.21.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -390,6 +390,9 @@ fi %changelog +* Thu Sep 25 2025 Christophe de Dinechin - 3.21.0-1 +- kata-containers 3.21.0 + * Wed Sep 10 2025 Christophe de Dinechin - 3.20.0-1 - kata-containers 3.20.0 diff --git a/sources b/sources index 1d2d3f2..dafeef3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.20.0.tar.gz) = 8864bda669fac2ae6983b940d61961c05d6d25497bb98120f0c2fd62adbaf8fbbe2473682e4d9b694c01a451ffcbdd0c9d407da8bcc82936a61912d2487db639 -SHA512 (kata-containers-3.20.0-vendor.tar.gz) = 48ed8fb337cbccb229f6b4b1beb019a92ec577a4b0ac9e3517c9b4fd1105b8bf7ad5e7424045005134afb2e5791bd6a80a8965067acc4066e5fe70346a652bf7 +SHA512 (kata-containers-3.21.0.tar.gz) = 703cf7ea73a306d190955c04041fdcecffc7de20b05c231aca3ccfae0e53ebdd7221b9a04d0f02e129c88e9084bdcca2ec8f6f440b1e5b450fd4fc5768f46615 +SHA512 (kata-containers-3.21.0-vendor.tar.gz) = d695f2c6e03402f2543daadf1506da614a032180d22855c3fa973380072166b157d19990ca9429f48379fca61801f85caff25e38b5ae27e483eda1d2692bcfec From 625c6453e11af9ab23290a0fdf99aa2ea9ae3a0b Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Tue, 30 Sep 2025 16:57:51 +0200 Subject: [PATCH 59/65] Add tests for CRIO and make test for containerd more explicit Add an rpm test that specifically uses crio, and make the containerd test more specifically mention containerd both in the name and in the description of the test. Also, the tests now first erase any old kata-containers package so that make sure we test a "from scratch" installation. Signed-off-by: Christophe de Dinechin --- ...kata-rpm.sh => test-kata-rpm-containerd.sh | 43 ++-- test-kata-rpm-crio.sh | 190 ++++++++++++++++++ 2 files changed, 217 insertions(+), 16 deletions(-) rename test-kata-rpm.sh => test-kata-rpm-containerd.sh (57%) create mode 100755 test-kata-rpm-crio.sh diff --git a/test-kata-rpm.sh b/test-kata-rpm-containerd.sh similarity index 57% rename from test-kata-rpm.sh rename to test-kata-rpm-containerd.sh index f9e893c..95f7d54 100755 --- a/test-kata-rpm.sh +++ b/test-kata-rpm-containerd.sh @@ -1,20 +1,23 @@ #!/bin/bash set -euo pipefail -# Usage: ./test_kata_rpm.sh /path/to/kata-containers-3.20*.rpm +# Usage: ./test_kata_rpm_containerd.sh /path/to/kata-containers-*.rpm RPM_PATH=${1:-} if [[ -z "$RPM_PATH" ]]; then - echo "Usage: $0 /path/to/kata-containers-3.20*.rpm" + echo "Usage: $0 /path/to/kata-containers-*.rpm" exit 1 fi -# 1. Install the RPM -echo "[1/6] Installing Kata Containers RPM: $RPM_PATH" -sudo dnf install -y "$RPM_PATH" +# 1. Remove existing kata-containers packages and install the RPM +echo "[1/7] Removing existing kata-containers packages..." +sudo rpm -e --allmatches kata-containers 2>/dev/null || echo "No existing kata-containers packages to remove" -echo "[2/6] Checking installed binaries and versions..." +echo "[2/7] Installing Kata Containers RPM: $RPM_PATH" +sudo rpm -i "$RPM_PATH" + +echo "[3/7] Checking installed binaries and versions..." # kata-agent is not expected on the host; it runs inside the Kata VM image. if command -v kata-runtime >/dev/null 2>&1; then kata-runtime --version @@ -27,35 +30,43 @@ else echo "kata-ctl not found in PATH!"; exit 1 fi -echo "[3/6] Checking QEMU version..." +echo "[4/7] Checking QEMU version..." if command -v qemu-system-x86_64 >/dev/null 2>&1; then qemu-system-x86_64 --version else echo "qemu-system-x86_64 not found in PATH!"; exit 1 fi -echo "[4/6] Loading vhost_net kernel module (required for Kata networking)..." +echo "[5/7] Loading vhost_net kernel module (required for Kata networking)..." sudo modprobe vhost_net -# 5. Run kata-runtime check (system compatibility) -echo "[5/6] Running kata-runtime check (system compatibility)..." +# 6. Run kata-runtime check (system compatibility) +echo "[6/7] Running kata-runtime check (system compatibility)..." if ! kata-runtime check; then echo "[ERROR] System is not capable of running Kata Containers." exit 1 fi -# 6. Run a simple Kata container using containerd (if available) -echo "[6/6] Attempting to run a test container with Kata runtime (containerd)..." +# 7. Run a simple Kata container using containerd (if available) +echo "[7/7] Attempting to run a test container with Kata runtime (containerd)..." if command -v ctr >/dev/null 2>&1; then + # Clean up any existing test containers + echo "[Test] Cleaning up any existing test containers..." + sudo ctr task kill kata-test-bg 2>/dev/null || true + sudo ctr task rm kata-test-bg 2>/dev/null || true + sudo ctr container rm kata-test-bg 2>/dev/null || true + sudo ctr images pull docker.io/library/alpine:latest # Start a container in the background (do not use --rm so we can exec into it) sudo ctr run -d --runtime io.containerd.kata.v2 docker.io/library/alpine:latest kata-test-bg sleep 300 # Wait a moment for the container to be up sleep 2 - echo "[Test] Exec into the running container and run 'ls -lR /'..." - sudo ctr task exec -t --exec-id kata-ls kata-test-bg ls -lR / + echo "[Test] Exec into the running container and run 'uname -a'..." + sudo ctr task exec --exec-id kata-uname kata-test-bg uname -a echo "[Test] Show /etc/os-release inside the container..." - sudo ctr task exec -t --exec-id kata-osrel kata-test-bg cat /etc/os-release + sudo ctr task exec --exec-id kata-osrel kata-test-bg cat /etc/os-release + echo "[Test] Show ls -lR /usr inside the container..." + sudo ctr task exec --exec-id kata-ls kata-test-bg ls -lR /usr # Clean up: kill the task and delete the container echo "[Cleanup] Deleting test container..." sudo ctr task kill kata-test-bg || true @@ -77,4 +88,4 @@ else echo "journalctl not found, skipping log check." fi -echo "All tests completed. If no errors above, the RPM is likely working." \ No newline at end of file +echo "All tests completed. If no errors above, the RPM is likely working with containerd." \ No newline at end of file diff --git a/test-kata-rpm-crio.sh b/test-kata-rpm-crio.sh new file mode 100755 index 0000000..d02d2d8 --- /dev/null +++ b/test-kata-rpm-crio.sh @@ -0,0 +1,190 @@ +#!/bin/bash +set -euo pipefail + +# Usage: ./test_kata_rpm_crio.sh /path/to/kata-containers-3.20*.rpm + +RPM_PATH=${1:-} + +if [[ -z "$RPM_PATH" ]]; then + echo "Usage: $0 /path/to/kata-containers-*.rpm" + exit 1 +fi + +# 1. Remove existing kata-containers packages and install the RPM +echo "[1/7] Removing existing kata-containers packages..." +sudo rpm -e --allmatches kata-containers 2>/dev/null || echo "No existing kata-containers packages to remove" + +echo "[2/7] Installing Kata Containers RPM: $RPM_PATH" +sudo rpm -i "$RPM_PATH" + +echo "[3/7] Checking installed binaries and versions..." +# kata-agent is not expected on the host; it runs inside the Kata VM image. +if command -v kata-runtime >/dev/null 2>&1; then + kata-runtime --version +else + echo "kata-runtime not found in PATH!"; exit 1 +fi +if command -v kata-ctl >/dev/null 2>&1; then + kata-ctl version +else + echo "kata-ctl not found in PATH!"; exit 1 +fi + +echo "[4/7] Checking QEMU version..." +if command -v qemu-system-x86_64 >/dev/null 2>&1; then + qemu-system-x86_64 --version +else + echo "qemu-system-x86_64 not found in PATH!"; exit 1 +fi + +echo "[5/7] Loading vhost_net kernel module (required for Kata networking)..." +sudo modprobe vhost_net + +# 6. Run kata-runtime check (system compatibility) +echo "[6/7] Running kata-runtime check (system compatibility)..." +if ! kata-runtime check; then + echo "[ERROR] System is not capable of running Kata Containers." + exit 1 +fi + +# 7. Run a simple Kata container using CRI-O (if available) +echo "[7/7] Attempting to run a test container with Kata runtime (CRI-O)..." +if command -v crictl >/dev/null 2>&1; then + # Check if CRI-O is running, if not try to start it + if ! systemctl is-active --quiet crio; then + echo "[Test] CRI-O is not running, attempting to start it..." + sudo systemctl start crio || { + echo "[WARNING] Failed to start CRI-O, falling back to containerd test..." + echo "[Test] Running containerd test instead..." + if command -v ctr >/dev/null 2>&1; then + sudo ctr images pull docker.io/library/alpine:latest + sudo ctr run --runtime io.containerd.kata.v2 --rm docker.io/library/alpine:latest kata-test-crio-fallback uname -a || { + echo "Failed to run container with containerd fallback."; exit 1; + } + echo "[Test] Containerd fallback test completed." + else + echo "Neither CRI-O nor containerd available for testing." + fi + exit 0 + } + fi + + # Configure crictl to use CRI-O instead of containerd + echo "[Test] Configuring crictl to use CRI-O..." + sudo crictl config --set runtime-endpoint=unix:///var/run/crio/crio.sock + sudo crictl config --set image-endpoint=unix:///var/run/crio/crio.sock + # Pull the image + echo "[Test] Pulling alpine image..." + sudo crictl pull docker.io/library/alpine:latest + + # Create temporary pod and container config files + echo "[Test] Creating pod and container configurations..." + + # Create pod config + cat > /tmp/pod-config.json << 'EOF' +{ + "metadata": { + "name": "kata-test-pod", + "namespace": "default", + "uid": "kata-test-pod-uid" + }, + "log_directory": "/tmp", + "linux": {} +} +EOF + + # Create container config + cat > /tmp/container-config.json << 'EOF' +{ + "metadata": { + "name": "kata-test-container" + }, + "image": { + "image": "docker.io/library/alpine:latest" + }, + "command": ["sleep", "300"], + "linux": {} +} +EOF + + # Create pod sandbox + echo "[Test] Creating pod sandbox with kata runtime..." + POD_ID=$(sudo crictl runp --runtime kata /tmp/pod-config.json 2>/dev/null || echo "") + if [[ -z "$POD_ID" ]]; then + echo "[Test] Creating pod sandbox with default runtime..." + POD_ID=$(sudo crictl runp /tmp/pod-config.json 2>/dev/null || echo "") + fi + + if [[ -n "$POD_ID" ]]; then + echo "[Test] Pod created with ID: $POD_ID, waiting for it to be ready..." + # Wait for pod to be ready (up to 30 seconds) + for i in {1..30}; do + if sudo crictl inspectp $POD_ID >/dev/null 2>&1; then + echo "[Test] Pod is ready!" + break + fi + echo "[Test] Waiting for pod to be ready... ($i/30)" + sleep 1 + done + + # Create container + echo "[Test] Creating container..." + CONTAINER_ID=$(sudo crictl create $POD_ID /tmp/container-config.json /tmp/pod-config.json 2>/dev/null || echo "") + if [[ -z "$CONTAINER_ID" ]]; then + echo "[Test] Creating container with default runtime..." + CONTAINER_ID=$(sudo crictl create $POD_ID /tmp/container-config.json /tmp/pod-config.json 2>/dev/null || echo "") + fi + + if [[ -n "$CONTAINER_ID" ]]; then + echo "[Test] Container created with ID: $CONTAINER_ID" + + # Start container + echo "[Test] Starting container..." + sudo crictl start $CONTAINER_ID + + # Wait a moment for the container to be up + sleep 2 + + # Execute commands in the container + echo "[Test] Exec into the running container and run 'uname -a'..." + sudo crictl exec $CONTAINER_ID uname -a || echo "uname command failed" + + echo "[Test] Show /etc/os-release inside the container..." + sudo crictl exec $CONTAINER_ID cat /etc/os-release || echo "cat /etc/os-release failed" + + echo "[Test] Show ls -lR /usr inside the container..." + sudo crictl exec $CONTAINER_ID ls -lR /usr || echo "ls -lR /usr command failed" + + # Clean up + echo "[Cleanup] Stopping and removing container..." + sudo crictl stop $CONTAINER_ID || true + sudo crictl rm $CONTAINER_ID || true + else + echo "[ERROR] Failed to create container" + fi + + # Clean up pod + echo "[Cleanup] Removing pod sandbox..." + sudo crictl stopp $POD_ID || true + sudo crictl rmp $POD_ID || true + else + echo "[ERROR] Failed to create pod sandbox" + fi + + # Clean up temp files + rm -f /tmp/pod-config.json /tmp/container-config.json + + echo "[Test] CRI-O container test completed." +else + echo "CRI-O (crictl) not found, skipping container test." +fi + +# Check logs for errors +echo "[Post-test] Checking Kata logs for errors..." +if journalctl --version >/dev/null 2>&1; then + sudo journalctl -xe | grep kata || echo "No kata logs found." +else + echo "journalctl not found, skipping log check." +fi + +echo "All tests completed. If no errors above, the RPM is likely working with CRI-O." From 7b79010e72ba9bc602c3ef93edb9f768767c5639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 14:42:09 +0200 Subject: [PATCH 60/65] rebuild --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index 2262221..f6c333a 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -56,7 +56,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} # Unlike for RHEL, we cannot strip it down because we build all components # (RHEL builds only build kata-agent) Name: %{repo} -Release: 1%{?rcrel}%{?dist} +Release: 1%{?rcrel}%{?dist}.1 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -390,6 +390,9 @@ fi %changelog +* Fri Oct 10 2025 Alejandro Sáez - 3.21.0-1.1 +- rebuild + * Thu Sep 25 2025 Christophe de Dinechin - 3.21.0-1 - kata-containers 3.21.0 From a016dd8f899af48b3ad41608603e21f6817d0e91 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 11 Oct 2025 21:13:42 -0500 Subject: [PATCH 61/65] Rebuild for golang 1.25.2 --- kata-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kata-containers.spec b/kata-containers.spec index f6c333a..3ac104f 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -56,7 +56,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} # Unlike for RHEL, we cannot strip it down because we build all components # (RHEL builds only build kata-agent) Name: %{repo} -Release: 1%{?rcrel}%{?dist}.1 +Release: 1%{?rcrel}%{?dist}.2 Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -390,6 +390,9 @@ fi %changelog +* Sun Oct 12 2025 Maxwell G - 3.21.0-1.2 +- Rebuild for golang 1.25.2 + * Fri Oct 10 2025 Alejandro Sáez - 3.21.0-1.1 - rebuild From 04e99cd11445251fb9b96a8c169b40684090ff48 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Tue, 30 Sep 2025 18:04:50 +0200 Subject: [PATCH 62/65] Check that we are indeed running in a VM When running in kata containers, we should be running in a VM. One manifestation is that the boot command line is different. Check that and report it. Signed-off-by: Christophe de Dinechin --- test-kata-rpm-containerd.sh | 26 +++++++------- test-kata-rpm-crio.sh | 67 +++++++++++++++++++++++-------------- 2 files changed, 55 insertions(+), 38 deletions(-) diff --git a/test-kata-rpm-containerd.sh b/test-kata-rpm-containerd.sh index 95f7d54..f34c27a 100755 --- a/test-kata-rpm-containerd.sh +++ b/test-kata-rpm-containerd.sh @@ -55,7 +55,7 @@ if command -v ctr >/dev/null 2>&1; then sudo ctr task kill kata-test-bg 2>/dev/null || true sudo ctr task rm kata-test-bg 2>/dev/null || true sudo ctr container rm kata-test-bg 2>/dev/null || true - + sudo ctr images pull docker.io/library/alpine:latest # Start a container in the background (do not use --rm so we can exec into it) sudo ctr run -d --runtime io.containerd.kata.v2 docker.io/library/alpine:latest kata-test-bg sleep 300 @@ -65,8 +65,18 @@ if command -v ctr >/dev/null 2>&1; then sudo ctr task exec --exec-id kata-uname kata-test-bg uname -a echo "[Test] Show /etc/os-release inside the container..." sudo ctr task exec --exec-id kata-osrel kata-test-bg cat /etc/os-release - echo "[Test] Show ls -lR /usr inside the container..." - sudo ctr task exec --exec-id kata-ls kata-test-bg ls -lR /usr + + echo "[Test] Verify we're running in a Kata VM by checking /proc/cmdline..." + HOST_CMDLINE=$(cat /proc/cmdline) + GUEST_CMDLINE=$(sudo ctr task exec --exec-id kata-cmdline kata-test-bg cat /proc/cmdline) + echo "[Test] Host cmdline: ${HOST_CMDLINE}" + echo "[Test] Container cmdline: ${GUEST_CMDLINE}" + if [[ "${HOST_CMDLINE}" == "${GUEST_CMDLINE}" ]]; then + echo "[ERROR] VM verification: Container cmdline is the same as host - this indicates the container is NOT running in a Kata VM!" + exit 1 + else + echo "[SUCCESS] Kata VM isolation is working correctly!" + fi # Clean up: kill the task and delete the container echo "[Cleanup] Deleting test container..." sudo ctr task kill kata-test-bg || true @@ -80,12 +90,4 @@ else echo "containerd (ctr) not found, skipping container test." fi -# Check logs for errors -echo "[Post-test] Checking Kata logs for errors..." -if journalctl --version >/dev/null 2>&1; then - sudo journalctl -xe | grep kata || echo "No kata logs found." -else - echo "journalctl not found, skipping log check." -fi - -echo "All tests completed. If no errors above, the RPM is likely working with containerd." \ No newline at end of file +echo "All tests completed. If no errors above, the RPM is likely working with containerd." diff --git a/test-kata-rpm-crio.sh b/test-kata-rpm-crio.sh index d02d2d8..357d26c 100755 --- a/test-kata-rpm-crio.sh +++ b/test-kata-rpm-crio.sh @@ -68,7 +68,7 @@ if command -v crictl >/dev/null 2>&1; then exit 0 } fi - + # Configure crictl to use CRI-O instead of containerd echo "[Test] Configuring crictl to use CRI-O..." sudo crictl config --set runtime-endpoint=unix:///var/run/crio/crio.sock @@ -76,10 +76,10 @@ if command -v crictl >/dev/null 2>&1; then # Pull the image echo "[Test] Pulling alpine image..." sudo crictl pull docker.io/library/alpine:latest - + # Create temporary pod and container config files echo "[Test] Creating pod and container configurations..." - + # Create pod config cat > /tmp/pod-config.json << 'EOF' { @@ -114,7 +114,7 @@ EOF echo "[Test] Creating pod sandbox with default runtime..." POD_ID=$(sudo crictl runp /tmp/pod-config.json 2>/dev/null || echo "") fi - + if [[ -n "$POD_ID" ]]; then echo "[Test] Pod created with ID: $POD_ID, waiting for it to be ready..." # Wait for pod to be ready (up to 30 seconds) @@ -126,7 +126,7 @@ EOF echo "[Test] Waiting for pod to be ready... ($i/30)" sleep 1 done - + # Create container echo "[Test] Creating container..." CONTAINER_ID=$(sudo crictl create $POD_ID /tmp/container-config.json /tmp/pod-config.json 2>/dev/null || echo "") @@ -134,35 +134,58 @@ EOF echo "[Test] Creating container with default runtime..." CONTAINER_ID=$(sudo crictl create $POD_ID /tmp/container-config.json /tmp/pod-config.json 2>/dev/null || echo "") fi - + if [[ -n "$CONTAINER_ID" ]]; then echo "[Test] Container created with ID: $CONTAINER_ID" - + # Start container echo "[Test] Starting container..." - sudo crictl start $CONTAINER_ID - + if ! sudo crictl start $CONTAINER_ID 2>/dev/null; then + # Clean up and retry + echo "[Test] Container start failed, cleaning up and retrying..." + sudo crictl stop $CONTAINER_ID 2>/dev/null || true + sudo crictl rm $CONTAINER_ID 2>/dev/null || true + CONTAINER_ID=$(sudo crictl create $POD_ID /tmp/container-config.json /tmp/pod-config.json 2>/dev/null || echo "") + if [[ -z "$CONTAINER_ID" ]] || ! sudo crictl start $CONTAINER_ID; then + echo "[ERROR] Failed to start container after cleanup" + exit 1 + fi + fi + # Wait a moment for the container to be up sleep 2 - + # Execute commands in the container echo "[Test] Exec into the running container and run 'uname -a'..." sudo crictl exec $CONTAINER_ID uname -a || echo "uname command failed" - + echo "[Test] Show /etc/os-release inside the container..." sudo crictl exec $CONTAINER_ID cat /etc/os-release || echo "cat /etc/os-release failed" - - echo "[Test] Show ls -lR /usr inside the container..." - sudo crictl exec $CONTAINER_ID ls -lR /usr || echo "ls -lR /usr command failed" - + + echo "[Test] Verify we're running in a Kata VM by checking /proc/cmdline..." + HOST_CMDLINE=$(cat /proc/cmdline) + GUEST_CMDLINE=$(sudo crictl exec $CONTAINER_ID cat /proc/cmdline || echo "cat /proc/cmdline command failed") + echo "[Test] Host cmdline: ${HOST_CMDLINE}" + echo "[Test] Container cmdline: ${GUEST_CMDLINE}" + if [[ "${HOST_CMDLINE}" == "${GUEST_CMDLINE}" ]]; then + echo "[ERROR] The container is NOT running in a Kata VM!" + else + echo "[SUCCESS] Kata VM isolation is working correctly!" + fi + # Clean up echo "[Cleanup] Stopping and removing container..." sudo crictl stop $CONTAINER_ID || true sudo crictl rm $CONTAINER_ID || true + + if [[ "${HOST_CMDLINE}" == "${GUEST_CMDLINE}" ]]; then + echo "[ERROR] Container was running but not with Kata runtime" + exit 1 + fi else echo "[ERROR] Failed to create container" fi - + # Clean up pod echo "[Cleanup] Removing pod sandbox..." sudo crictl stopp $POD_ID || true @@ -170,21 +193,13 @@ EOF else echo "[ERROR] Failed to create pod sandbox" fi - + # Clean up temp files rm -f /tmp/pod-config.json /tmp/container-config.json - + echo "[Test] CRI-O container test completed." else echo "CRI-O (crictl) not found, skipping container test." fi -# Check logs for errors -echo "[Post-test] Checking Kata logs for errors..." -if journalctl --version >/dev/null 2>&1; then - sudo journalctl -xe | grep kata || echo "No kata logs found." -else - echo "journalctl not found, skipping log check." -fi - echo "All tests completed. If no errors above, the RPM is likely working with CRI-O." From 845a5f76e32e68e94fca768e7fdfc5ebc6eb65fd Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Mon, 3 Nov 2025 15:29:02 +0100 Subject: [PATCH 63/65] tests: Remove steps that retry with containerd The CRIO test is specifically designed to test CRIO, so avoid falling back to containerd if things don't work with CRIO. Signed-off-by: Christophe de Dinechin --- test-kata-rpm-crio.sh | 49 +++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/test-kata-rpm-crio.sh b/test-kata-rpm-crio.sh index 357d26c..fc5365b 100755 --- a/test-kata-rpm-crio.sh +++ b/test-kata-rpm-crio.sh @@ -54,18 +54,8 @@ if command -v crictl >/dev/null 2>&1; then if ! systemctl is-active --quiet crio; then echo "[Test] CRI-O is not running, attempting to start it..." sudo systemctl start crio || { - echo "[WARNING] Failed to start CRI-O, falling back to containerd test..." - echo "[Test] Running containerd test instead..." - if command -v ctr >/dev/null 2>&1; then - sudo ctr images pull docker.io/library/alpine:latest - sudo ctr run --runtime io.containerd.kata.v2 --rm docker.io/library/alpine:latest kata-test-crio-fallback uname -a || { - echo "Failed to run container with containerd fallback."; exit 1; - } - echo "[Test] Containerd fallback test completed." - else - echo "Neither CRI-O nor containerd available for testing." - fi - exit 0 + echo "[WARNING] Failed to start CRI-O..." + exit 1 } fi @@ -80,16 +70,27 @@ if command -v crictl >/dev/null 2>&1; then # Create temporary pod and container config files echo "[Test] Creating pod and container configurations..." - # Create pod config + # Create pod config (minimal Kata documentation config) cat > /tmp/pod-config.json << 'EOF' { - "metadata": { - "name": "kata-test-pod", - "namespace": "default", - "uid": "kata-test-pod-uid" - }, - "log_directory": "/tmp", - "linux": {} + "metadata": { + "name": "busybox-pod", + "uid": "busybox-pod", + "namespace": "test.kata" + }, + "hostname": "busybox_host", + "log_directory": "", + "dns_config": { + }, + "port_mappings": [], + "resources": { + }, + "labels": { + }, + "annotations": { + }, + "linux": { + } } EOF @@ -97,7 +98,7 @@ EOF cat > /tmp/container-config.json << 'EOF' { "metadata": { - "name": "kata-test-container" + "name": "busybox-container" }, "image": { "image": "docker.io/library/alpine:latest" @@ -111,8 +112,10 @@ EOF echo "[Test] Creating pod sandbox with kata runtime..." POD_ID=$(sudo crictl runp --runtime kata /tmp/pod-config.json 2>/dev/null || echo "") if [[ -z "$POD_ID" ]]; then - echo "[Test] Creating pod sandbox with default runtime..." - POD_ID=$(sudo crictl runp /tmp/pod-config.json 2>/dev/null || echo "") + echo "[Test] Failed to create pod sandbox with Kata runtime" + journalctl -g kata + echo "[Test] Failed to create pod sandbox with Kata runtime, exiting" + exit 1 fi if [[ -n "$POD_ID" ]]; then From 60b7e16b8b8cadea74bf83fa724536f4efe5a609 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Mon, 3 Nov 2025 17:10:47 +0100 Subject: [PATCH 64/65] Bump to Kata Containers 3.22 Signed-off-by: Christophe de Dinechin --- .gitignore | 2 ++ kata-containers.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1264cb2..ad07063 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,5 @@ /kata-containers-3.20.0-vendor.tar.gz /kata-containers-3.21.0.tar.gz /kata-containers-3.21.0-vendor.tar.gz +/kata-containers-3.22.0.tar.gz +/kata-containers-3.22.0-vendor.tar.gz diff --git a/kata-containers.spec b/kata-containers.spec index 3ac104f..69bdb99 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.21.0 +Version: 3.22.0 %global tag %{version}%{?rcstr} %global domain github.com @@ -56,7 +56,7 @@ workload isolation and security advantages of VMs. https://katacontainers.io/.} # Unlike for RHEL, we cannot strip it down because we build all components # (RHEL builds only build kata-agent) Name: %{repo} -Release: 1%{?rcrel}%{?dist}.2 +Release: 1%{?rcrel}%{?dist} Summary: Kata Containers version 3.x repository License: Apache-2.0 Url: https://%{download} @@ -390,6 +390,9 @@ fi %changelog +* Mon Nov 03 2025 Christophe de Dinechin - 3.22.0-1 +- kata-containers 3.22.0 + * Sun Oct 12 2025 Maxwell G - 3.21.0-1.2 - Rebuild for golang 1.25.2 diff --git a/sources b/sources index dafeef3..c82bc85 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.21.0.tar.gz) = 703cf7ea73a306d190955c04041fdcecffc7de20b05c231aca3ccfae0e53ebdd7221b9a04d0f02e129c88e9084bdcca2ec8f6f440b1e5b450fd4fc5768f46615 -SHA512 (kata-containers-3.21.0-vendor.tar.gz) = d695f2c6e03402f2543daadf1506da614a032180d22855c3fa973380072166b157d19990ca9429f48379fca61801f85caff25e38b5ae27e483eda1d2692bcfec +SHA512 (kata-containers-3.22.0.tar.gz) = 142bc70b6455f545d534371a845980ed00985d7225b5f672f3fef046a6f0a31871bd69ee2c931ab94c10089086123fe5987ec6615d7a7308027531269c4dae48 +SHA512 (kata-containers-3.22.0-vendor.tar.gz) = 10b28d746d5176acce4abcb902213edcfb43b0b390a5d20f114b7dc4e11bc8de26098f180bdf75bcff3e6d03f2b3a31908f4386d7ca24119f9e001cd99c52060 From 92c293dcd189083a0b49fa9157420b4cbad8a92b Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Mon, 15 Dec 2025 17:26:07 +0100 Subject: [PATCH 65/65] Release 3.23 Upstream release 3.23 Signed-off-by: Christophe de Dinechin --- .gitignore | 2 ++ 1001-Remove-warnings-as-compilation-errors.patch | 12 ++++++------ kata-containers.spec | 2 +- sources | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ad07063..4678ac9 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,5 @@ /kata-containers-3.21.0-vendor.tar.gz /kata-containers-3.22.0.tar.gz /kata-containers-3.22.0-vendor.tar.gz +/kata-containers-3.23.0.tar.gz +/kata-containers-3.23.0-vendor.tar.gz diff --git a/1001-Remove-warnings-as-compilation-errors.patch b/1001-Remove-warnings-as-compilation-errors.patch index 140375f..19fffda 100644 --- a/1001-Remove-warnings-as-compilation-errors.patch +++ b/1001-Remove-warnings-as-compilation-errors.patch @@ -18,18 +18,18 @@ Signed-off-by: Emanuel Lima 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/agent/Makefile b/src/agent/Makefile -index e62a894aa..39d351213 100644 --- a/src/agent/Makefile +++ b/src/agent/Makefile -@@ -130,14 +130,14 @@ static-checks-build: $(GENERATED_CODE) +@@ -120,7 +120,7 @@ static-checks-build: $(GENERATED_CODE) $(TARGET): $(GENERATED_CODE) $(TARGET_PATH) $(TARGET_PATH): show-summary - @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) + @RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES) - $(GENERATED_FILES): %: %.in + $(GENERATED_FILES): %: %.in $(VERSION_FILE) @sed $(foreach r,$(GENERATED_REPLACEMENTS),-e 's|@$r@|$($r)|g') "$<" > "$@" +@@ -127,7 +127,7 @@ $(GENERATED_FILES): %: %.in $(VERSION_FILE) ##TARGET optimize: optimized build optimize: show-summary show-header @@ -38,6 +38,7 @@ index e62a894aa..39d351213 100644 ##TARGET install: install agent install: install-services + diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile index 40bb7f915..5eb2c1016 100644 --- a/src/dragonball/Makefile @@ -66,10 +67,9 @@ index aabaa3391..1fb6b20c3 100644 format: @echo "INFO: cargo fmt..." diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile -index 0bb0617ff..188040864 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile -@@ -600,7 +600,7 @@ static-checks-build: $(GENERATED_FILES) +@@ -658,7 +658,7 @@ static-checks-build: $(GENERATED_FILES) $(TARGET): $(GENERATED_FILES) $(TARGET_PATH) $(TARGET_PATH): $(SOURCES) | show-summary @@ -78,7 +78,7 @@ index 0bb0617ff..188040864 100644 $(GENERATED_FILES): %: %.in @sed \ -@@ -610,7 +610,7 @@ $(GENERATED_FILES): %: %.in +@@ -668,7 +668,7 @@ $(GENERATED_FILES): %: %.in ##TARGET optimize: optimized build optimize: $(SOURCES) | show-summary show-header diff --git a/kata-containers.spec b/kata-containers.spec index 69bdb99..2ed9f3c 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -28,7 +28,7 @@ %endif # https://github.com/kata-containers/kata-containers -Version: 3.22.0 +Version: 3.23.0 %global tag %{version}%{?rcstr} %global domain github.com diff --git a/sources b/sources index c82bc85..0c1fe9f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kata-containers-3.22.0.tar.gz) = 142bc70b6455f545d534371a845980ed00985d7225b5f672f3fef046a6f0a31871bd69ee2c931ab94c10089086123fe5987ec6615d7a7308027531269c4dae48 -SHA512 (kata-containers-3.22.0-vendor.tar.gz) = 10b28d746d5176acce4abcb902213edcfb43b0b390a5d20f114b7dc4e11bc8de26098f180bdf75bcff3e6d03f2b3a31908f4386d7ca24119f9e001cd99c52060 +SHA512 (kata-containers-3.23.0.tar.gz) = d921dace40545fab47647c68357d88bf2807b74d5b3546ed0d91416b98fbad4ecaabf449abcc20e34cee8fbcacffe4a66a6012b63815e6b2c60c0319f982cc6e +SHA512 (kata-containers-3.23.0-vendor.tar.gz) = 484c2dececc31a4fa9d4662f0a0051d52a916728e673396fbb70ab8ef02eb3ac225b815a03e2799aa7bcfe6478dd3ad785c628879914b0b113123f3952795c7b