rpm: Introduce SWTPM_VERSION

We want to be able to pin the version for this component, just like we already do for all other virtualization packages. Signed-off-by: Andrea Bolognani <[email protected]>
macduff23 · Feb 7, 2023 · cdea0c5 · cdea0c5
1 parent e2fb841
commit cdea0c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -122,7 +122,7 @@ deps-sync:
 	SYNC_VENDOR=true hack/dockerized " ./hack/dep-update.sh --sync-only && ./hack/dep-prune.sh && ./hack/bazel-generate.sh"
 
 rpm-deps:
-	SYNC_VENDOR=true hack/dockerized "CUSTOM_REPO=${CUSTOM_REPO} SINGLE_ARCH=${SINGLE_ARCH} LIBVIRT_VERSION=${LIBVIRT_VERSION} QEMU_VERSION=${QEMU_VERSION} SEABIOS_VERSION=${SEABIOS_VERSION} EDK2_VERSION=${EDK2_VERSION} LIBGUESTFS_VERSION=${LIBGUESTFS_VERSION} PASST_VERSION=${PASST_VERSION} VIRTIOFSD_VERSION=${VIRTIOFSD_VERSION} ./hack/rpm-deps.sh"
+	SYNC_VENDOR=true hack/dockerized "CUSTOM_REPO=${CUSTOM_REPO} SINGLE_ARCH=${SINGLE_ARCH} LIBVIRT_VERSION=${LIBVIRT_VERSION} QEMU_VERSION=${QEMU_VERSION} SEABIOS_VERSION=${SEABIOS_VERSION} EDK2_VERSION=${EDK2_VERSION} LIBGUESTFS_VERSION=${LIBGUESTFS_VERSION} PASST_VERSION=${PASST_VERSION} VIRTIOFSD_VERSION=${VIRTIOFSD_VERSION} SWTPM_VERSION=${SWTPM_VERSION} ./hack/rpm-deps.sh"
 
 bump-images:
 	hack/dockerized "./hack/rpm-deps.sh && ./hack/bump-distroless.sh"

diff --git a/hack/rpm-deps.sh b/hack/rpm-deps.sh
@@ -14,6 +14,7 @@ LIBGUESTFS_VERSION=${LIBGUESTFS_VERSION:-1:1.48.4-2.el9}
 GUESTFSTOOLS_VERSION=${GUESTFSTOOLS_VERSION:-0:1.48.2-7.el9}
 PASST_VERSION=${PASST_VERSION:-0:0^20221026.gf212044-1.el9}
 VIRTIOFSD_VERSION=${VIRTIOFSD_VERSION:-0:1.4.0-1.el9}
+SWTPM_VERSION=${SWTPM_VERSION:-0:0.7.0-2.20211109gitb79fd91.el9}
 SINGLE_ARCH=${SINGLE_ARCH:-""}
 
 bazeldnf_repos="--repofile rpm/repo.yaml"
@@ -87,6 +88,7 @@ launcherbase_main="
   libvirt-daemon-driver-qemu-${LIBVIRT_VERSION}
   passt-${PASST_VERSION}
   qemu-kvm-core-${QEMU_VERSION}
+  swtpm-tools-${SWTPM_VERSION}
 "
 launcherbase_x86_64="
   edk2-ovmf-${EDK2_VERSION}