From ee35c0f9c3247087504ab2e18faaf36a0499a81d Mon Sep 17 00:00:00 2001 From: David Michael Date: Dec 05 2023 13:26:05 +0000 Subject: Update to version 1.5.1 I added the 1.3.0 changelog entry to remove a difference from the Copr package. Version 1.3.1 was the first version added to Fedora, but it was branched off the Copr build, so 1.3.0 is the actual initial version of this RPM's development anyway. --- diff --git a/.gitignore b/.gitignore index b395193..5a2f0a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/firecracker-1.5.0.tar.gz +/firecracker-1.5.1.tar.gz /kvm-bindings-b158595.tar.gz /micro_http-a4d632f.tar.gz diff --git a/firecracker-1.5.0-remove-criterion.patch b/firecracker-1.5.0-remove-criterion.patch deleted file mode 100644 index 474e3ac..0000000 --- a/firecracker-1.5.0-remove-criterion.patch +++ /dev/null @@ -1,24 +0,0 @@ -The package build does not run benches. - ---- a/src/snapshot/Cargo.toml -+++ b/src/snapshot/Cargo.toml -@@ -16,9 +16,6 @@ - thiserror = "1.0.32" - displaydoc = "0.2.4" - --[dev-dependencies] --criterion = { version = "0.5.0", default-features = false } -- - [[bench]] - name = "version_map" - harness = false ---- a/src/vmm/Cargo.toml -+++ b/src/vmm/Cargo.toml -@@ -42,7 +42,6 @@ - virtio_gen = { path = "../virtio_gen" } - - [dev-dependencies] --criterion = { version = "0.5.0", default-features = false } - device_tree = "1.1.0" - proptest = { version = "1.0.0", default-features = false, features = ["std"] } - diff --git a/firecracker-1.5.0-remove-device_tree.patch b/firecracker-1.5.0-remove-device_tree.patch deleted file mode 100644 index 878d4f1..0000000 --- a/firecracker-1.5.0-remove-device_tree.patch +++ /dev/null @@ -1,31 +0,0 @@ -This crate is unmaintained for many years with license issues and deprecation -warnings, and it is only used for two aarch64 tests. - ---- a/src/vmm/Cargo.toml -+++ b/src/vmm/Cargo.toml -@@ -42,7 +42,6 @@ - virtio_gen = { path = "../virtio_gen" } - - [dev-dependencies] --device_tree = "1.1.0" - proptest = { version = "1.0.0", default-features = false, features = ["std"] } - - [[bench]] ---- a/src/vmm/src/arch/aarch64/fdt.rs -+++ b/src/vmm/src/arch/aarch64/fdt.rs -@@ -494,6 +494,7 @@ - } - - #[test] -+ #[cfg(not(test))] - fn test_create_fdt() { - let regions = arch_memory_regions(layout::FDT_MAX_SIZE + 0x1000); - let mem = utils::vm_memory::test_utils::create_anon_guest_memory(®ions, false) -@@ -552,6 +553,7 @@ - } - - #[test] -+ #[cfg(not(test))] - fn test_create_fdt_with_initrd() { - let regions = arch_memory_regions(layout::FDT_MAX_SIZE + 0x1000); - let mem = utils::vm_memory::test_utils::create_anon_guest_memory(®ions, false) diff --git a/firecracker-1.5.1-remove-criterion.patch b/firecracker-1.5.1-remove-criterion.patch new file mode 100644 index 0000000..81ca180 --- /dev/null +++ b/firecracker-1.5.1-remove-criterion.patch @@ -0,0 +1,24 @@ +The package build does not run benches. + +--- a/src/snapshot/Cargo.toml ++++ b/src/snapshot/Cargo.toml +@@ -16,9 +16,6 @@ + thiserror = "1.0.32" + displaydoc = "0.2.4" + +-[dev-dependencies] +-criterion = { version = "0.5.0", default-features = false } +- + [[bench]] + name = "version_map" + harness = false +--- a/src/vmm/Cargo.toml ++++ b/src/vmm/Cargo.toml +@@ -43,7 +43,6 @@ + virtio_gen = { path = "../virtio_gen" } + + [dev-dependencies] +-criterion = { version = "0.5.0", default-features = false } + device_tree = "1.1.0" + proptest = { version = "1.0.0", default-features = false, features = ["std"] } + itertools = "0.12.0" diff --git a/firecracker-1.5.1-remove-device_tree.patch b/firecracker-1.5.1-remove-device_tree.patch new file mode 100644 index 0000000..8f9971f --- /dev/null +++ b/firecracker-1.5.1-remove-device_tree.patch @@ -0,0 +1,31 @@ +This crate is unmaintained for many years with license issues and deprecation +warnings, and it is only used for two aarch64 tests. + +--- a/src/vmm/Cargo.toml ++++ b/src/vmm/Cargo.toml +@@ -43,7 +43,6 @@ + virtio_gen = { path = "../virtio_gen" } + + [dev-dependencies] +-device_tree = "1.1.0" + proptest = { version = "1.0.0", default-features = false, features = ["std"] } + itertools = "0.12.0" + +--- a/src/vmm/src/arch/aarch64/fdt.rs ++++ b/src/vmm/src/arch/aarch64/fdt.rs +@@ -494,6 +494,7 @@ + } + + #[test] ++ #[cfg(not(test))] + fn test_create_fdt() { + let regions = arch_memory_regions(layout::FDT_MAX_SIZE + 0x1000); + let mem = utils::vm_memory::test_utils::create_anon_guest_memory(®ions, false) +@@ -552,6 +553,7 @@ + } + + #[test] ++ #[cfg(not(test))] + fn test_create_fdt_with_initrd() { + let regions = arch_memory_regions(layout::FDT_MAX_SIZE + 0x1000); + let mem = utils::vm_memory::test_utils::create_anon_guest_memory(®ions, false) diff --git a/firecracker.spec b/firecracker.spec index a179cfa..a00b773 100644 --- a/firecracker.spec +++ b/firecracker.spec @@ -8,7 +8,7 @@ %bcond jailer %{lua:print(rpm.expand("%{cargo_target}"):find("musl") or 0)} Name: firecracker -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: Secure and fast microVMs for serverless computing @@ -26,11 +26,11 @@ Provides: bundled(crate(micro_http)) = 0.1.0^gita4d632f # Edit crate dependencies to track what is packaged in Fedora. Patch: %{name}-1.5.0-remove-aws-lc-rs.patch Patch: %{name}-1.5.0-remove-cargo_toml.patch -Patch: %{name}-1.5.0-remove-criterion.patch -Patch: %{name}-1.5.0-remove-device_tree.patch +Patch: %{name}-1.5.1-remove-criterion.patch +Patch: %{name}-1.5.1-remove-device_tree.patch BuildRequires: cargo-rpm-macros >= 24 -%if %defined cargo_target +%if %{defined cargo_target} BuildRequires: rust-std-static-%{cargo_target} %endif @@ -69,7 +69,7 @@ sed -i -e 's,../../forks,forks,' Cargo.toml %{cargo_license} > LICENSE.dependencies %install -install -pm 0755 -Dt %{buildroot}%{_bindir} target/%{?cargo_target}/release/{cpu-template-helper,firecracker,%{?with_jailer:jailer,}rebase-snap,seccompiler-bin} +install -pm 0755 -Dt %{buildroot}%{_bindir} target/%{?cargo_target}/rpm/{cpu-template-helper,firecracker,%{?with_jailer:jailer,}rebase-snap,seccompiler-bin} # Ship the built-in seccomp JSON as an example that can be edited and compiled. ln -fn resources/seccomp/%{cargo_target}.json seccomp-filter.json || @@ -99,6 +99,9 @@ done %changelog +* Tue Dec 05 2023 David Michael - 1.5.1-1 +- Update to the 1.5.1 release. + * Thu Oct 12 2023 David Michael - 1.5.0-1 - Update to the 1.5.0 release. @@ -125,4 +128,7 @@ done - Update to the 1.3.2 release. * Mon Mar 06 2023 David Michael - 1.3.1-1 +- Update to the 1.3.1 release. + +* Thu Mar 02 2023 David Michael - 1.3.0-1 - Initial package. diff --git a/sources b/sources index b230c85..dd706c4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (firecracker-1.5.0.tar.gz) = 6a76c81cab04ac2999efa946f76e499f019a3afc300396c60fe4b8972e35fcb053114ddca63520b63776265ac551a62f4d8146cc9f331d986aeac2eb3d84e17c +SHA512 (firecracker-1.5.1.tar.gz) = d7ab4d0eeed9279f48274811e0a9549d4b273fbaed4b4024cbac5ba8438c176b5976601d63e3976a070dd7f50c4f1c14992f0ad4a16f34f0a2e4a4bbf6b4d943 SHA512 (kvm-bindings-b158595.tar.gz) = 5e5a8f76858dcc1bc1d17243b5ca55b2e9cdd346d20e8a517d8f9e6b3273c146c76906909a2dca96a449f6dfecf8aaeb295024767848537bd2fc81a4055412a6 SHA512 (micro_http-a4d632f.tar.gz) = 6d0cd910a2e790f8b4e12353641da9aeba4cf283f8aa519395c6add1e7a040cd9a1f0b95430d5545401309b888e4a7f947a5115cbd3ce612c7c1cee6317804a4