diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-18 10:23:53 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-19 07:33:03 +0100 |
| commit | 911566c53ed02482a67a66f1fde5a33ae1f5b322 (patch) | |
| tree | 073d0f7b12cadcc9dd8a23a7a7fcd3d9c120825a | |
| parent | 9e26eb6077c08bd9b6190203b349a3a08ec278bb (diff) | |
| download | ptxdist-911566c53ed02482a67a66f1fde5a33ae1f5b322.tar.gz ptxdist-911566c53ed02482a67a66f1fde5a33ae1f5b322.tar.xz | |
ca-certificates: use world/execute
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/ca-certificates.make | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/rules/ca-certificates.make b/rules/ca-certificates.make index d2c798d48..ee1d339fd 100644 --- a/rules/ca-certificates.make +++ b/rules/ca-certificates.make @@ -54,7 +54,7 @@ CA_CERTIFICATES_CONF_TOOL := NO $(STATEDIR)/ca-certificates.compile: @$(call targetinfo) - @cd $(CA_CERTIFICATES_DIR) && $(CA_CERTIFICATES_CERTDATA2PEM) + @$(call world/execute, CA_CERTIFICATES, $(CA_CERTIFICATES_CERTDATA2PEM)) @$(call touch) # ---------------------------------------------------------------------------- @@ -63,8 +63,8 @@ $(STATEDIR)/ca-certificates.compile: $(STATEDIR)/ca-certificates.install: @$(call targetinfo) - @rm -rf $(CA_CERTIFICATES_PKGDIR) - @install -d -m 0755 $(CA_CERTIFICATES_PKGDIR)/etc/ssl/certs/ + @$(call world/execute, CA_CERTIFICATES, \ + install -d -m 0755 $(CA_CERTIFICATES_PKGDIR)/etc/ssl/certs/) ifdef PTXCONF_CA_CERTIFICATES_BUNDLE @for crt in $(CA_CERTIFICATES_DIR)/*.crt; do \ sed -e '$$a\\' "$${crt}" >> \ @@ -74,8 +74,9 @@ endif ifdef PTXCONF_CA_CERTIFICATES_CERTS @install -m 0644 $(CA_CERTIFICATES_DIR)/*.crt \ $(CA_CERTIFICATES_PKGDIR)/etc/ssl/certs/ - @OPENSSL_CONF=$(SYSROOT)/usr/lib/ssl/openssl.cnf SSL_CERT_FILE="" \ - c_rehash $(CA_CERTIFICATES_PKGDIR)/etc/ssl/certs/ + @$(call execute, CA_CERTIFICATES, \ + OPENSSL_CONF=$(SYSROOT)/usr/lib/ssl/openssl.cnf SSL_CERT_FILE="" \ + c_rehash $(CA_CERTIFICATES_PKGDIR)/etc/ssl/certs/) endif @$(call touch) |