diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/downgrade-dialoguer.patch b/downgrade-dialoguer.patch new file mode 100644 index 0000000..4ddf420 --- /dev/null +++ b/downgrade-dialoguer.patch @@ -0,0 +1,13 @@ +diff --git a/efi-tools/Cargo.toml b/efi-tools/Cargo.toml +index 383ea77..68b8356 100644 +--- a/efi-tools/Cargo.toml ++++ b/efi-tools/Cargo.toml +@@ -33,7 +33,7 @@ log.workspace = true + stderrlog.workspace = true + uguid.workspace = true + +-dialoguer = "0.12" ++dialoguer = "0.11" + glob = "0.3" + + virtfw-libefi = { workspace = true, features = [ "std", "sbdata", "x509" ] } diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..b1ef231 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_stable] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..e37d567 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,6 @@ +summary: run tests from distgit tarball +discover: + how: fmf + dist-git-source: true +execute: + how: tmt diff --git a/sources b/sources index f47aef2..a0ec5cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (virt-firmware-rs-v25.7.1.tar.gz) = da653a3e1e3e17a11d5568def33456961f29e36a4a3c8bfbc72e5a0887deeda26130a532f66d46a4dfdc53a3e7b4a4e6cdb6e5d3555499b30eb8f56f0ea3d75f +SHA512 (virt-firmware-rs-v26.1.tar.gz) = ed096f21dee8f642ab85b9eb4d9c5b5e81af7a48ce0abca77dd4db4ffe142e4cd01eae3d3a5dde48ab226cb0e0e73af269570da078983682c6eac687ef46cf2c diff --git a/virt-firmware-rs.spec b/virt-firmware-rs.spec index e9904da..aa0e71b 100644 --- a/virt-firmware-rs.spec +++ b/virt-firmware-rs.spec @@ -18,7 +18,7 @@ BuildRequires: rust-std-static-x86_64-unknown-uefi %endif Name: virt-firmware-rs -Version: 25.7.1 +Version: 26.1 Release: %autorelease Summary: Tools for EFI and virtual machine firmware @@ -38,6 +38,9 @@ License: %{shrink: URL: https://gitlab.com/kraxel/virt-firmware-rs Source: https://gitlab.com/kraxel/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz +Patch1: downgrade-dialoguer.patch + +ExclusiveArch: x86_64 aarch64 riscv64 BuildRequires: cargo-rpm-macros >= 24 BuildRequires: pkgconfig(libudev) @@ -59,20 +62,21 @@ firmware. This package has EFI applications for %{efiarch}. %prep %autosetup -n %{name}-v%{version} -p1 -%cargo_prep # drop unused packages from workspace to reduce dependencies. -sed -i Cargo.toml -e '/varstore/d' +sed -i Cargo.toml -e '/mefisto/d' %if %{without efi_apps} sed -i Cargo.toml -e '/efi-apps/d' %endif %generate_buildrequires -%cargo_generate_buildrequires +%cargo_generate_buildrequires -f std,json,pem,udev %build +%cargo_prep %cargo_build -- --package virtfw-efi-tools --features udev %cargo_build -- --package virtfw-efi-tools %cargo_build -- --package virtfw-igvm-tools +%cargo_build -- --package virtfw-varstore --features std,json,pem %if %{with efi_apps} %cargo_build -- --package virtfw-efi-apps --target $(uname -m)-unknown-uefi %endif @@ -85,9 +89,11 @@ install -d %{buildroot}%{_bindir} install -v -m 755 target/rpm/generate-boot-csv %{buildroot}%{_bindir} install -v -m 755 target/rpm/list-sb-vars %{buildroot}%{_bindir} install -v -m 755 target/rpm/mini-bootcfg %{buildroot}%{_bindir} +install -v -m 755 target/rpm/virt-fw-vars-setup %{buildroot}%{_bindir} install -v -m 755 target/rpm/uefi-boot-menu %{buildroot}%{_bindir}/uefi-boot-menu-rs install -v -m 755 target/rpm/igvm-inspect %{buildroot}%{_bindir} install -v -m 755 target/rpm/igvm-wrap %{buildroot}%{_bindir} +install -v -m 755 target/rpm/igvm-update %{buildroot}%{_bindir} %if %{with efi_apps} # efi-apps install -d %{buildroot}%{_datadir}/%{name}/%{efiarch} @@ -97,14 +103,18 @@ install -v -m 644 target/*-unknown-uefi/rpm/*.efi %{buildroot}%{_datadir}/%{name for dir in efi-apps efi-tools igvm-tools; do cp -v ${dir}/README.md README.${dir}.md done +# man pages +mkdir -p %{buildroot}%{_mandir}/man1 +for app in virt-fw-vars-setup igvm-inspect igvm-wrap igvm-update; do + %{buildroot}%{_bindir}/${app} --manpage > %{buildroot}%{_mandir}/man1/${app}.1 +done +%if %{with check} %check -%ifarch s390x -echo "skip tests on bigendian" -%else %cargo_test -- --package virtfw-libefi %cargo_test -- --package virtfw-efi-tools --features udev %cargo_test -- --package virtfw-igvm-tools +%cargo_test -- --package virtfw-varstore %endif %files @@ -115,9 +125,12 @@ echo "skip tests on bigendian" %{_bindir}/generate-boot-csv %{_bindir}/list-sb-vars %{_bindir}/mini-bootcfg +%{_bindir}/virt-fw-vars-setup %{_bindir}/uefi-boot-menu-rs %{_bindir}/igvm-inspect %{_bindir}/igvm-wrap +%{_bindir}/igvm-update +%{_mandir}/man1/* %if %{with efi_apps} %files -n %{name}-%{efiarch}