linux-integrity.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Petr Vorel <pvorel@suse.cz>
To: linux-integrity@vger.kernel.org
Cc: Petr Vorel <pvorel@suse.cz>, Mimi Zohar <zohar@linux.vnet.ibm.com>
Subject: [PATCH 2/3] CI/openSUSE: Fix tpm_server symlink creation
Date: Tue, 22 Jun 2021 16:12:23 +0200	[thread overview]
Message-ID: <20210622141224.25006-3-pvorel@suse.cz> (raw)
In-Reply-To: <20210622141224.25006-1-pvorel@suse.cz>

This symlink is missing only on openSUSE Tumbleweed,
it exists on openSUSE Leap, thus build failed.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 ci/tumbleweed.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/tumbleweed.sh b/ci/tumbleweed.sh
index ecd2372..dfc478b 100755
--- a/ci/tumbleweed.sh
+++ b/ci/tumbleweed.sh
@@ -42,6 +42,6 @@ zypper --non-interactive install --force-resolution --no-recommends \
 	which \
 	xsltproc
 
-if [ -f /usr/lib/ibmtss/tpm_server ]; then
+if [ -f /usr/lib/ibmtss/tpm_server -a ! -e /usr/local/bin/tpm_server ]; then
 	ln -s /usr/lib/ibmtss/tpm_server /usr/local/bin
 fi
-- 
2.32.0


  parent reply	other threads:[~2021-06-22 14:12 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-22 14:12 [PATCH 0/3] Add GitHub Actions support Petr Vorel
2021-06-22 14:12 ` [PATCH 1/3] CI: Rename travis script directory Petr Vorel
2021-06-22 14:12 ` Petr Vorel [this message]
2021-06-22 14:12 ` [PATCH 3/3] CI: Introduce GitHub Actions setup Petr Vorel
2021-06-22 14:13 ` [PATCH 0/3] Add GitHub Actions support Petr Vorel
2021-06-24 19:28   ` Mimi Zohar
2021-06-24 19:19 ` Mimi Zohar
2021-06-25  6:12   ` Petr Vorel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210622141224.25006-3-pvorel@suse.cz \
    --to=pvorel@suse.cz \
    --cc=linux-integrity@vger.kernel.org \
    --cc=zohar@linux.vnet.ibm.com \
    --subject='Re: [PATCH 2/3] CI/openSUSE: Fix tpm_server symlink creation' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).