From 3fdcc4da4f5f4d34572916aae8582d63f0d5d1c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Mon, 12 Feb 2024 22:00:49 +0000 Subject: [PATCH] specs: upgrade both packages to v3.2.0azl0 --- .../kata-containers-cc.signatures.json | 6 +++--- SPECS/kata-containers-cc/kata-containers-cc.spec | 16 +++++++++------- .../kata-containers.signatures.json | 4 ++-- SPECS/kata-containers/kata-containers.spec | 13 ++++++++----- cgmanifest.json | 8 ++++---- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/SPECS/kata-containers-cc/kata-containers-cc.signatures.json b/SPECS/kata-containers-cc/kata-containers-cc.signatures.json index 0b0941d854b..da5151428da 100644 --- a/SPECS/kata-containers-cc/kata-containers-cc.signatures.json +++ b/SPECS/kata-containers-cc/kata-containers-cc.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "mariner-coco-build-uvm.sh": "594c1e3764b65372a4fda2ab35fecaa2aa41937f37e0e3ccdf4778cc98f9b793", - "kata-containers-cc-0.6.3-cargo.tar.gz": "7ff6c5f7f7aa31a99ea5d837876291d886b16c32f21b6d65d044fd398abff1e6", - "kata-containers-cc-0.6.3.tar.gz": "1f366ce70bf83a239a7ec99334506adb28c3199157b4370840c3685378a34268" + "kata-containers-cc-3.2.0.azl0-cargo.tar.gz": "7ff6c5f7f7aa31a99ea5d837876291d886b16c32f21b6d65d044fd398abff1e6", + "kata-containers-cc-3.2.0.azl0.tar.gz": "e1915c761655a396928f841f8656d5810fe1e3f35275a0e47fd27bdadee36a40" } -} \ No newline at end of file +} diff --git a/SPECS/kata-containers-cc/kata-containers-cc.spec b/SPECS/kata-containers-cc/kata-containers-cc.spec index 08fe69a9d7b..8f83dd90e15 100644 --- a/SPECS/kata-containers-cc/kata-containers-cc.spec +++ b/SPECS/kata-containers-cc/kata-containers-cc.spec @@ -9,16 +9,15 @@ %global debug_package %{nil} Name: kata-containers-cc -Version: 0.6.3 +Version: 3.2.0.azl0 Release: 1%{?dist} Summary: Kata Confidential Containers package developed for Confidential Containers on AKS License: ASL 2.0 Vendor: Microsoft Corporation URL: https://github.com/microsoft/kata-containers -Source0: https://github.com/microsoft/kata-containers/archive/refs/tags/cc-%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: https://github.com/microsoft/kata-containers/archive/refs/tags/%{name}-%{version}.tar.gz -Source2: %{name}-%{version}-cargo.tar.gz -Source3: mariner-coco-build-uvm.sh +Source0: https://github.com/microsoft/kata-containers/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: %{name}-%{version}-cargo.tar.gz +Source2: mariner-coco-build-uvm.sh ExclusiveArch: x86_64 @@ -73,7 +72,7 @@ This package contains the the tooling and files required to build the UVM %prep %autosetup -p1 -n %{name}-%{version} pushd %{_builddir}/%{name}-%{version} -tar -xf %{SOURCE2} +tar -xf %{SOURCE1} popd %build @@ -158,7 +157,7 @@ pushd %{_builddir}/%{name}-%{version} rm tools/osbuilder/.gitignore rm tools/osbuilder/rootfs-builder/.gitignore -install -D -m 0755 %{SOURCE3} %{buildroot}%{osbuilder}/mariner-coco-build-uvm.sh +install -D -m 0755 %{SOURCE2} %{buildroot}%{osbuilder}/mariner-coco-build-uvm.sh install -D -m 0644 VERSION %{buildroot}%{osbuilder}/VERSION install -D -m 0644 ci/install_yq.sh %{buildroot}%{osbuilder}/ci/install_yq.sh install -D -m 0644 versions.yaml %{buildroot}%{osbuilder}/versions.yaml @@ -306,6 +305,9 @@ install -D -m 0755 %{_builddir}/%{name}-%{version}/tools/osbuilder/image-builder %exclude %{osbuilder}/tools/osbuilder/rootfs-builder/ubuntu %changelog +* Thu Feb 01 2024 Aurelien Bombo - 3.2.0.azl0-1 +- Use Microsoft sources based on upstream Kata version 3.2.0. + * Mon Jan 08 2024 Dallas Delaney - 0.6.3-1 - Upgrade to version 0.6.3 diff --git a/SPECS/kata-containers/kata-containers.signatures.json b/SPECS/kata-containers/kata-containers.signatures.json index 9c1da048474..f98517e78e6 100644 --- a/SPECS/kata-containers/kata-containers.signatures.json +++ b/SPECS/kata-containers/kata-containers.signatures.json @@ -1,8 +1,8 @@ { "Signatures": { "50-kata": "fb108c6337b3d3bf80b43ab04f2bf9a3bdecd29075ebd16320aefe8f81c502a7", - "kata-containers-3.1.0-vendor.tar.gz": "d14032fc30e0f8e1bd9afc57264ed703df6cdf48ad2b1845b02e046763ac3352", - "kata-containers-3.1.0.tar.gz": "9785078a2250a784c30692f156de4a1a2cfa754a38b48b755ece7517902ffed3", + "kata-containers-3.2.0.azl0-cargo.tar.gz": "7ff6c5f7f7aa31a99ea5d837876291d886b16c32f21b6d65d044fd398abff1e6", + "kata-containers-3.2.0.azl0.tar.gz": "e1915c761655a396928f841f8656d5810fe1e3f35275a0e47fd27bdadee36a40", "mariner-build-uvm.sh": "a0fbee4def82ee492eab64a8b5a948c2fef125fa1ca5686aafa0a80c64144068" } } diff --git a/SPECS/kata-containers/kata-containers.spec b/SPECS/kata-containers/kata-containers.spec index 2efa37b15af..70f30108763 100644 --- a/SPECS/kata-containers/kata-containers.spec +++ b/SPECS/kata-containers/kata-containers.spec @@ -38,13 +38,13 @@ Summary: Kata Containers version 2.x repository Name: kata-containers -Version: 3.1.0 -Release: 10%{?dist} +Version: 3.2.0.azl0 +Release: 1%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation -URL: https://github.com/%{name}/%{name} -Source0: https://github.com/%{name}/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}-vendor.tar.gz +URL: https://github.com/microsoft/kata-containers +Source0: https://github.com/microsoft/kata-containers/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: %{name}-%{version}-cargo.tar.gz Source2: 50-kata Source3: mariner-build-uvm.sh @@ -220,6 +220,9 @@ ln -sf %{_bindir}/kata-runtime %{buildroot}%{_prefix}/local/bin/kata-runtime %exclude %{kataosbuilderdir}/rootfs-builder/ubuntu %changelog +* Thu Feb 01 2024 Aurelien Bombo - 3.2.0.azl0-1 +- Use Microsoft sources based on upstream version 3.2.0. + * Tue Dec 05 2023 Archana Choudhary - 3.1.0-10 - Drop qemu-kvm-core dependency - Define explicit dependency on qemu-virtiofsd diff --git a/cgmanifest.json b/cgmanifest.json index e1be2c1adec..0d5880ab96f 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -8041,8 +8041,8 @@ "type": "other", "other": { "name": "kata-containers", - "version": "3.1.0", - "downloadUrl": "https://github.com/kata-containers/kata-containers/archive/refs/tags/3.1.0.tar.gz" + "version": "3.2.0.azl0", + "downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/3.2.0.azl0.tar.gz" } } }, @@ -8051,8 +8051,8 @@ "type": "other", "other": { "name": "kata-containers-cc", - "version": "0.6.3", - "downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/cc-0.6.3.tar.gz" + "version": "3.2.0.azl0", + "downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/3.2.0.azl0.tar.gz" } } },