mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: [ptxdist] [PATCH 1/2] libp11: update engines directroy for openssl 1.1
Date: Wed, 17 Apr 2019 11:49:33 +0200	[thread overview]
Message-ID: <20190417094934.12723-1-r.czerwinski@pengutronix.de> (raw)

Openssl 1.1 changes the default engines search directory to
/usr/lib/engines-1.1, change libp11 accordingly.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 rules/libp11.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/libp11.make b/rules/libp11.make
index 6a7c39e69..37eb8b60b 100644
--- a/rules/libp11.make
+++ b/rules/libp11.make
@@ -34,7 +34,7 @@ LIBP11_CONF_OPT		:= \
 	--disable-strict \
 	--disable-pedantic \
 	--disable-api-doc \
-	--with-enginesdir=/usr/lib/engines \
+	--with-enginesdir=/usr/lib/engines-1.1 \
 	--with-pkcs11-module=$(call ptx/ifdef,PTXCONF_LIBP11_PROXY_MODULE,p11-kit-proxy.so)
 
 $(STATEDIR)/libp11.targetinstall:
@@ -48,10 +48,10 @@ $(STATEDIR)/libp11.targetinstall:
 
 	@$(call install_lib,  libp11, 0, 0, 0644, libp11)
 	@$(call install_copy, libp11, 0, 0, 0644, -, \
-		/usr/lib/engines/pkcs11.so)
+		/usr/lib/engines-1.1/pkcs11.so)
 
 	@$(call install_link, libp11, pkcs11.so, \
-		/usr/lib/engines/libpkcs11.so)
+		/usr/lib/engines-1.1/libpkcs11.so)
 
 	@$(call install_finish, libp11)
 
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2019-04-17  9:49 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-17  9:49 Rouven Czerwinski [this message]
2019-04-17  9:49 ` [ptxdist] [PATCH 2/2] libp11: version bump 0.4.9 → 0.4.10 Rouven Czerwinski

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=20190417094934.12723-1-r.czerwinski@pengutronix.de \
    --to=r.czerwinski@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox