trustee/0007-replace-git-dependencies-with-path-registry-deps-for.patch
Cropi 012874b70a Initial commit on c10s
Resolves: RHEL-143742
2026-02-10 08:50:00 +01:00

62 lines
2.2 KiB
Diff

From f9e01d49a90cadffa9f07851ff25bdf949e9ee77 Mon Sep 17 00:00:00 2001
From: Cropi <alakatos@redhat.com>
Date: Wed, 21 Jan 2026 14:13:55 +0100
Subject: [PATCH] replace git dependencies with path/registry deps for offline
builds
Replace git dependencies with local path or registry dependencies to
support --offline build environments (like Fedora's build system).
Dependency changes:
- kbs_protocol: Switch from git to local path
'guest-components-0.15.0/attestation-agent/kbs_protocol'
- kms: Switch from git to local path
'guest-components-0.15.0/confidential-data-hub/kms'
- kbs-types: Switch from git to registry version '0.14.0'
---
Cargo.toml | 6 ++----
kbs/Cargo.toml | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index fdd0e78..66e8172 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,10 +26,8 @@ config = "0.15.13"
ear = "0.3.0"
env_logger = "0.10.0"
hex = "0.4.3"
-kbs_protocol = { git = "https://github.com/confidential-containers/guest-components.git", rev = "c35306f", default-features = false }
-# TODO: Change this to kbs-types release
-kbs-types = { "git" = "https://github.com/virtee/kbs-types.git", rev = "e3cc706" }
-kms = { git = "https://github.com/confidential-containers/guest-components.git", rev = "c35306f", default-features = false }
+kbs_protocol = { path = "guest-components-0.15.0/attestation-agent/kbs_protocol", default-features = false }
+kbs-types = { version = "0.14.0" }
jsonwebtoken = { version = "9", default-features = false }
lazy_static = "1.4.0"
log = "0.4.28"
diff --git a/kbs/Cargo.toml b/kbs/Cargo.toml
index 653c759..427aa87 100644
--- a/kbs/Cargo.toml
+++ b/kbs/Cargo.toml
@@ -28,7 +28,7 @@ coco-as-grpc = ["coco-as", "mobc", "tonic", "tonic-build", "prost"]
intel-trust-authority-as = ["as", "az-cvm-vtpm"]
# Use aliyun KMS as KBS backend
-aliyun = ["kms/aliyun"]
+aliyun = []
# Use pkcs11 plugin
pkcs11 = ["cryptoki"]
@@ -58,7 +58,6 @@ hex.workspace = true
jsonwebtoken = { workspace = true, default-features = false }
kbs-types.workspace = true
-kms = { workspace = true, default-features = false }
lazy_static.workspace = true
log.workspace = true
mobc = { version = "0.9.0", optional = true }
--
2.52.0