Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/674'
Browse files Browse the repository at this point in the history
* origin/pr/674:
  Do not wait for session in qvm-run calls
  • Loading branch information
marmarek committed Nov 15, 2022
2 parents d053782 + 1abb140 commit de683dc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ linux-keyring.gpg: $(sort $(wildcard kernel.org-*.asc))
.INTERMEDIATE: $(SRC_TARFILE)$(UNTRUSTED_SUFF) $(SPI_SRC_TARFILE)$(UNTRUSTED_SUFF)
%.tar$(UNTRUSTED_SUFF): %.tar.xz$(UNTRUSTED_SUFF)
if [ -f /usr/bin/qvm-run-vm ]; \
then qvm-run-vm --dispvm 2>/dev/null xzcat <$< > $@; \
then qvm-run-vm --no-gui --dispvm 2>/dev/null xzcat <$< > $@; \
else xzcat <$< > $@; fi

%.tar$(UNTRUSTED_SUFF): %.tar.gz$(UNTRUSTED_SUFF)
if [ -f /usr/bin/qvm-run-vm ]; \
then qvm-run-vm --dispvm 2>/dev/null zcat <$< > $@; \
then qvm-run-vm --no-gui --dispvm 2>/dev/null zcat <$< > $@; \
else zcat <$< > $@; fi

ifeq ($(VERIFICATION),signature)
Expand Down

0 comments on commit de683dc

Please sign in to comment.