diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-16 17:42:10 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-17 19:00:12 +0100 |
| commit | 19475258209dd537a9f123ab935c41fa7747c54f (patch) | |
| tree | 1f7801ee7d48a71a3a21420d0318fb174fa74627 /rules/crda.make | |
| parent | 98ea4609fd2baad35f6a6984713451c6818a5ddf (diff) | |
| download | ptxdist-19475258209dd537a9f123ab935c41fa7747c54f.tar.gz ptxdist-19475258209dd537a9f123ab935c41fa7747c54f.tar.xz | |
crda: don't use builtin keys
This is one step torwards updating OpenSSL to version 1.1.x: The data
structures needed for builtin keys are no longer accessable in that
version.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/crda.make')
| -rw-r--r-- | rules/crda.make | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/rules/crda.make b/rules/crda.make index 88de459d7..6fffb3d3d 100644 --- a/rules/crda.make +++ b/rules/crda.make @@ -54,28 +54,16 @@ $(STATEDIR)/crda.extract: @$(call touch) # ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -$(STATEDIR)/crda.prepare: - @$(call targetinfo) -ifdef PTXCONF_ARCH_LP64 - @cp $(CRDA_DIR)/keys-ssl.c.64 $(CRDA_DIR)/keys-ssl.c -else - @cp $(CRDA_DIR)/keys-ssl.c.32 $(CRDA_DIR)/keys-ssl.c -endif - @$(call touch) - -# ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- CRDA_MAKE_ENV := \ $(CROSS_ENV) \ - LIBDIR=/usr/lib \ SBINDIR=/usr/sbin/ \ UDEV_RULE_DIR=/usr/lib/udev/rules.d/ \ - USE_OPENSSL=1 + USE_OPENSSL=1 \ + RUNTIME_PUBKEY_DIR=/usr/lib/crda/pubkeys \ + RUNTIME_PUBKEY_ONLY=1 CRDA_MAKE_OPT := all_noverify @@ -88,6 +76,10 @@ $(STATEDIR)/crda.install: @$(call world/install, CRDA) @install -vD -m 644 $(CRDA_REGDB_DIR)/$(CRDA_REGDB)/regulatory.bin \ $(CRDA_PKGDIR)/usr/lib/crda/regulatory.bin + @install -vD -m 644 $(CRDA_REGDB_DIR)/pubkeys/linville.key.pub.pem \ + $(CRDA_PKGDIR)/usr/lib/crda/pubkeys/linville.key.pub.pem + @install -vD -m 644 $(CRDA_REGDB_DIR)/pubkeys/sforshee.key.pub.pem \ + $(CRDA_PKGDIR)/usr/lib/crda/pubkeys/sforshee.key.pub.pem @$(call touch) # ---------------------------------------------------------------------------- @@ -109,6 +101,8 @@ $(STATEDIR)/crda.targetinstall: /usr/lib/udev/rules.d/85-regulatory.rules) @$(call install_lib, crda, 0, 0, 0644, libreg) + @$(call install_alternative_tree, crda, 0, 0, \ + /usr/lib/crda/pubkeys) @$(call install_alternative, crda, 0, 0, 0644, \ /usr/lib/crda/regulatory.bin) |