Skip to content

Commit

Permalink
targets/qemu.mk: Fix skip-if-exist in swtpm_setup
Browse files Browse the repository at this point in the history
Commit 46cad54 ("WiP flake.nix: make docker image usable for...")
added 'root' to the swtpm_setup call, but broke skip-if-exist because
the flags are supposed to be comma-separated.  swtpm_setup was ignoring
skip-if-exist and would fail if the config files exist.

Put a comma there so it works again.

Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
  • Loading branch information
JonathonHall-Purism committed Aug 6, 2024
1 parent de0bc75 commit e32a417
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions targets/qemu.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif

ifeq "$(CONFIG_TPM2_TSS)" "y"
SWTPM_TPMVER := --tpm2
SWTPM_PRESETUP := swtpm_setup --create-config-files root skip-if-exist
SWTPM_PRESETUP := swtpm_setup --create-config-files root,skip-if-exist
else
# TPM1 is the default
SWTPM_TPMVER :=
Expand Down Expand Up @@ -111,4 +111,4 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
$(QEMU_USB_TOKEN_DEV) \

stty sane
@echo
@echo

0 comments on commit e32a417

Please sign in to comment.