diff --git a/.gitignore b/.gitignore index e189748..944839f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/snphost-0.5.0.tar.gz -/snphost-0.5.0-vendor.tar.gz -/snphost-0.5.0-vendor-FEDORA.tar.gz +SOURCES/snphost-0.5.0-vendor.tar.gz +SOURCES/snphost-0.5.0.tar.gz diff --git a/.snphost.metadata b/.snphost.metadata new file mode 100644 index 0000000..db80a09 --- /dev/null +++ b/.snphost.metadata @@ -0,0 +1,2 @@ +38c4c4351fb988e6e24a2c19dc205eebc9429786 SOURCES/snphost-0.5.0-vendor.tar.gz +46a1e65ca40a5066f26c01a66e20be0cdd303812 SOURCES/snphost-0.5.0.tar.gz diff --git a/snphost.spec b/SPECS/snphost.spec similarity index 61% rename from snphost.spec rename to SPECS/snphost.spec index b95cb78..4055836 100644 --- a/snphost.spec +++ b/SPECS/snphost.spec @@ -6,21 +6,12 @@ Name: snphost Version: %{version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Administrative utility for AMD SEV-SNP URL: https://github.com/virtee/%{crate} Source: https://github.com/virtee/%{crate}/archive/refs/tags/snphost-%{version}.tar.gz - -# Creating vendor tar (on latest Fedora under a snphost dir): -# dnf install -# Edit create_vendor_source.sh to reflect proper version number being updated. -# bash create_vendor_source.sh -# mv snphost-{VERSION}-vendor.tar.xz ../vendor/ -Source1: vendor/snphost-%{version}-vendor-FEDORA.tar.gz - -# To build vendored dependencies on Fedora, update the env_logger dependency to match Fedora's present version. -Patch: update-envlogger-dependency.diff +Source1: https://github.com/virtee/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz # snphost is a tool using features specific to AMD EPYC processors (x86_64). ExclusiveArch: x86_64 @@ -38,7 +29,6 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AN BuildRequires: rust-toolset BuildRequires: /usr/bin/pkg-config BuildRequires: openssl-devel -BuildRequires: libcurl-devel %global _description %{expand: Administrative utility for AMD SEV-SNP.} @@ -53,7 +43,6 @@ Administrative utility for AMD SEV-SNP.} %prep %autosetup -n %{crate}-%{version} -p1 -a1 -rm -f Cargo.lock %cargo_prep -v vendor %build @@ -70,11 +59,6 @@ rm -f Cargo.lock %endif %changelog -* Wed Feb 19 2025 Tyler Fanelli - 0.5.0-2 -- Update env_logger dependency to build vendored dependencies on Fedora -- Use cargo vendor-filterer to create vendor Source1 -- Resolves: RHEL-68139 - * Tue Feb 11 2025 Tyler Fanelli - 0.5.0-1 -- Initial commit on c10s - Resolves: RHEL-171502 +- Initial commit on c9s + Resolves: RHELPLAN-171499 diff --git a/create_vendor_source.sh b/create_vendor_source.sh deleted file mode 100644 index 4800de8..0000000 --- a/create_vendor_source.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# fail upon error -set -e - -# Run on Fedora -# make sure all dependencies are yum installed - -# cd - -# create a .cargo/config.toml -if [ ! -f .cargo/config.toml ]; then - rpm -E '%{cargo_prep}' > cargo_prep.sh - bash cargo_prep.sh -fi - -# run cargo vendor-filtered --offline -cargo vendor-filterer --respect-source-config --offline --platform x86_64-unknown-linux-gnu --keep-dep-kinds all --all-features --exclude-crate-path "idna#tests" --exclude-crate-path "idna-0.4.0#tests" - -# run tar -tar -czf snphost-0.5.0-vendor-FEDORA.tar.gz vendor/ - -echo snphost-0.5.0-vendor-FEDORA.tar.gz created diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 9156309..0000000 --- a/gating.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- !Policy -product_versions: - - rhel-10 -decision_context: osci_compose_gate -rules: [] diff --git a/sources b/sources deleted file mode 100644 index d3f8780..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (snphost-0.5.0.tar.gz) = 9292e17505c0e33874342b38ea2b8b87fa06ca59147db93a9f83e46fafee443a9804a2efac82defdfcb6fe6c9dcc8519b2a4b6f61fd55a0de08a0296dfef11af -SHA512 (snphost-0.5.0-vendor-FEDORA.tar.gz) = 435604e05efb3a20f40979644427de2ef2a0dfc27086d391909d750b7f386185478caef0c2c2f81b5934eca43c5c85534adccf1e713c4d2effdc0b015afc6773 diff --git a/update-envlogger-dependency.diff b/update-envlogger-dependency.diff deleted file mode 100644 index 202e5ee..0000000 --- a/update-envlogger-dependency.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index f09f99c..dc448e7 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -26,7 +26,7 @@ is-it-maintained-open-issues = { repository = "virtee/snphost" } - [dependencies] - anyhow = "1.0.83" - sev = { version = "4.0.0", features = ['openssl']} --env_logger = "0.10.1" -+env_logger = "0.11.6" - clap = { version = "4.5", features = [ "derive" ] } - colorful = "0.2.2" - libc = "0.2.154" diff --git a/vendor/snphost-0.5.0-vendor-FEDORA.tar.gz b/vendor/snphost-0.5.0-vendor-FEDORA.tar.gz deleted file mode 100644 index 94a3958..0000000 Binary files a/vendor/snphost-0.5.0-vendor-FEDORA.tar.gz and /dev/null differ