summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-11-11 19:20:43 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-03-01 12:30:38 +0100
commit43b3386cc51e11d645e21fec7d59b4dd070b57bd (patch)
treef778b1fb2cf5822e789839d8b6454e4d158d2bdb /rules
parent7266f21cf47a3caa16637d140d99c0df9acd763d (diff)
downloadptxdist-43b3386cc51e11d645e21fec7d59b4dd070b57bd.tar.gz
ptxdist-43b3386cc51e11d645e21fec7d59b4dd070b57bd.tar.xz
openssl: version bump 1.0.2o -> 1.1.1b
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r--rules/host-openssl.make4
-rw-r--r--rules/openssl.make18
2 files changed, 14 insertions, 8 deletions
diff --git a/rules/host-openssl.make b/rules/host-openssl.make
index fbb2e55d7..74d6b2e5b 100644
--- a/rules/host-openssl.make
+++ b/rules/host-openssl.make
@@ -33,12 +33,12 @@ HOST_OPENSSL_CONF_ENV := $(HOST_ENV)
# no ':=' here
HOST_OPENSSL_CONF_OPT = \
--prefix=/ \
- --install_prefix=$(HOST_OPENSSL_PKGDIR) \
--libdir=/lib \
shared
HOST_OPENSSL_INSTALL_OPT := \
- install_sw
+ install_sw \
+ install_ssldirs
#
# Follow the directions in INSTALL section 1a.
diff --git a/rules/openssl.make b/rules/openssl.make
index d51407778..a6962baed 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -18,10 +18,10 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
#
# Paths and names
#
-OPENSSL_BASE := 1.0.2
-OPENSSL_BUGFIX := q
+OPENSSL_BASE := 1.1.1
+OPENSSL_BUGFIX := b
OPENSSL_VERSION := $(OPENSSL_BASE)$(OPENSSL_BUGFIX)
-OPENSSL_MD5 := 7563e1ce046cb21948eeb6ba1a0eb71c
+OPENSSL_MD5 := 4532712e7bcc9414f5bce995e4e13930
OPENSSL := openssl-$(OPENSSL_VERSION)
OPENSSL_SUFFIX := tar.gz
OPENSSL_URL := \
@@ -74,11 +74,17 @@ endif
OPENSSL_CONF_OPT := \
--prefix=/usr \
--openssldir=/usr/lib/ssl \
- --install_prefix=$(OPENSSL_PKGDIR) \
- shared
+ shared \
+ no-idea \
+ no-mdc2 \
+ no-rc5 \
+ no-zlib \
+ no-ssl3 \
+ no-ssl3-method
OPENSSL_INSTALL_OPT := \
- install_sw
+ install_sw \
+ install_ssldirs
$(STATEDIR)/openssl.prepare:
@$(call targetinfo)