diff --git a/.gitignore b/.gitignore index f10390e..5c0994c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/guest-components-0061d03.tar.gz -/trustee-guest-components-0.10.0_124.git0061d03-vendor.tar.xz +SOURCES/guest-components-0061d03.tar.gz +SOURCES/trustee-guest-components-0.10.0_124.git0061d03-vendor.tar.xz diff --git a/.trustee-guest-components.metadata b/.trustee-guest-components.metadata new file mode 100644 index 0000000..107edde --- /dev/null +++ b/.trustee-guest-components.metadata @@ -0,0 +1,2 @@ +3e7d88ba89b66bcefd3e8bcdf3e6d62eb33c183c SOURCES/guest-components-0061d03.tar.gz +6c71d816ffb7173e2528aab6ad3a27a22ac9160a SOURCES/trustee-guest-components-0.10.0_124.git0061d03-vendor.tar.xz diff --git a/0001-Fedora-Remove-workspace-members-which-are-not-built.patch b/SOURCES/0001-Fedora-Remove-workspace-members-which-are-not-built.patch similarity index 100% rename from 0001-Fedora-Remove-workspace-members-which-are-not-built.patch rename to SOURCES/0001-Fedora-Remove-workspace-members-which-are-not-built.patch diff --git a/0002-Fedora-AA-deps-crypto-default-to-openssl.patch b/SOURCES/0002-Fedora-AA-deps-crypto-default-to-openssl.patch similarity index 100% rename from 0002-Fedora-AA-deps-crypto-default-to-openssl.patch rename to SOURCES/0002-Fedora-AA-deps-crypto-default-to-openssl.patch diff --git a/0003-Fedora-kbs_protocol-Cargo.toml-reqwest-use-native-TL.patch b/SOURCES/0003-Fedora-kbs_protocol-Cargo.toml-reqwest-use-native-TL.patch similarity index 100% rename from 0003-Fedora-kbs_protocol-Cargo.toml-reqwest-use-native-TL.patch rename to SOURCES/0003-Fedora-kbs_protocol-Cargo.toml-reqwest-use-native-TL.patch diff --git a/0004-Fedora-remove-jwt-simple-dependency.patch b/SOURCES/0004-Fedora-remove-jwt-simple-dependency.patch similarity index 100% rename from 0004-Fedora-remove-jwt-simple-dependency.patch rename to SOURCES/0004-Fedora-remove-jwt-simple-dependency.patch diff --git a/0005-Fedora-remove-ttrpc-dependency.patch b/SOURCES/0005-Fedora-remove-ttrpc-dependency.patch similarity index 100% rename from 0005-Fedora-remove-ttrpc-dependency.patch rename to SOURCES/0005-Fedora-remove-ttrpc-dependency.patch diff --git a/0006-Fedora-attester-pick-attesters-in-all-attesters.patch b/SOURCES/0006-Fedora-attester-pick-attesters-in-all-attesters.patch similarity index 100% rename from 0006-Fedora-attester-pick-attesters-in-all-attesters.patch rename to SOURCES/0006-Fedora-attester-pick-attesters-in-all-attesters.patch diff --git a/0007-Fedora-remove-testcontainers-dependency.patch b/SOURCES/0007-Fedora-remove-testcontainers-dependency.patch similarity index 100% rename from 0007-Fedora-remove-testcontainers-dependency.patch rename to SOURCES/0007-Fedora-remove-testcontainers-dependency.patch diff --git a/0008-Fedora-kbs_protocol-default-to-openssl.patch b/SOURCES/0008-Fedora-kbs_protocol-default-to-openssl.patch similarity index 100% rename from 0008-Fedora-kbs_protocol-default-to-openssl.patch rename to SOURCES/0008-Fedora-kbs_protocol-default-to-openssl.patch diff --git a/0009-Fedora-rstest-0.23.patch b/SOURCES/0009-Fedora-rstest-0.23.patch similarity index 100% rename from 0009-Fedora-rstest-0.23.patch rename to SOURCES/0009-Fedora-rstest-0.23.patch diff --git a/0010-Fedora-use-clap-4.2.7.patch b/SOURCES/0010-Fedora-use-clap-4.2.7.patch similarity index 100% rename from 0010-Fedora-use-clap-4.2.7.patch rename to SOURCES/0010-Fedora-use-clap-4.2.7.patch diff --git a/0011-Fedora-kbs-types-0.8.0.patch b/SOURCES/0011-Fedora-kbs-types-0.8.0.patch similarity index 100% rename from 0011-Fedora-kbs-types-0.8.0.patch rename to SOURCES/0011-Fedora-kbs-types-0.8.0.patch diff --git a/0012-Fedora-kbs_protocol-Cargo.toml-add-package.license.patch b/SOURCES/0012-Fedora-kbs_protocol-Cargo.toml-add-package.license.patch similarity index 100% rename from 0012-Fedora-kbs_protocol-Cargo.toml-add-package.license.patch rename to SOURCES/0012-Fedora-kbs_protocol-Cargo.toml-add-package.license.patch diff --git a/0013-Fedora-url-version-is-2.5.2.patch b/SOURCES/0013-Fedora-url-version-is-2.5.2.patch similarity index 100% rename from 0013-Fedora-url-version-is-2.5.2.patch rename to SOURCES/0013-Fedora-url-version-is-2.5.2.patch diff --git a/0014-Fedora-protobuf-is-2.28.patch b/SOURCES/0014-Fedora-protobuf-is-2.28.patch similarity index 100% rename from 0014-Fedora-protobuf-is-2.28.patch rename to SOURCES/0014-Fedora-protobuf-is-2.28.patch diff --git a/trustee-guest-components.spec b/SPECS/trustee-guest-components.spec similarity index 98% rename from trustee-guest-components.spec rename to SPECS/trustee-guest-components.spec index 761fb0c..fd58d4b 100644 --- a/trustee-guest-components.spec +++ b/SPECS/trustee-guest-components.spec @@ -144,12 +144,12 @@ cd attestation-agent/kbs_protocol %changelog * Sun Feb 09 2025 Uri Lublin - 0.10.0^124.git0061d03-3 - Use cargo vendor-filterer to create vendor Source1, make rpminspect happy - Resolves: RHEL-73770 + Resolves: RHEL-68141 * Thu Feb 06 2025 Uri Lublin - 0.10.0^124.git0061d03-2 - A smaller vendor Source1 - Resolves: RHEL-73770 + Resolves: RHEL-68141 * Tue Jan 21 2025 Uri Lublin 0.10.0^124.git0061d03-1 -- Initial commit on c10s - Resolves: RHEL-73770 +- Initial commit on c9s + Resolves: RHEL-68141 diff --git a/create_vendor_source.sh b/create_vendor_source.sh deleted file mode 100644 index b20c8e4..0000000 --- a/create_vendor_source.sh +++ /dev/null @@ -1,24 +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 and xz -tar cf vendor.tar vendor/ -xz --best --verbose vendor.tar - -echo vendor.tar.xz 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 eb93017..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (trustee-guest-components-0.10.0_124.git0061d03-vendor.tar.xz) = a7da3ab8a6da819a34df81695e7cbf108aec82ff6dab43b1dc4bdd7bdcdd12498278b0c255151475ccfcf02d4f1b60d483b3b2318ad860fb1ecdf0d7b243dfa2 -SHA512 (guest-components-0061d03.tar.gz) = 1003767c3ca23de625f02f883373ccc3d23a950c2fa9c02a38bc22293be04d298cd6b18ad64d8506eb5060de10e6fa00f6d7197d314d2b75cadea8223202a954