diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-09-25 21:24:12 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-09-25 22:24:15 -0700 |
commit | 238c1e3bee78ea18b66778569c3bf2521556be64 (patch) | |
tree | f09c664ee345b4a0d774b732950aa072774f1546 /meta-networking/recipes-connectivity | |
parent | bec44085eff3276e06d915597032fcc9ea18c86f (diff) | |
download | meta-openembedded-238c1e3bee78ea18b66778569c3bf2521556be64.tar.gz |
crda: use gcrypt as default crypt
As Makefile told us, if `USE_OPENSSL=1', only openssl10 works,
even though the recipe depends libgcrypt.
[Makefile snip]
|ifeq ($(USE_OPENSSL),1)
|CFLAGS += -DUSE_OPENSSL
[snip]
|else
|CFLAGS += -DUSE_GCRYPT
[Makefile snip]
The crda dpends openssl 1.0.x which there is a build failure with
openssl 1.1.x. So use gcrypt instead of openssl by default.
The idea refers:
https://bugs.chromium.org/p/chromium/issues/detail?id=735782
https://gitweb.gentoo.org/repo/gentoo.git/tree/net-wireless/crda/crda-3.18-r1.ebuild#n36
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
-rw-r--r-- | meta-networking/recipes-connectivity/crda/crda_3.18.bb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb index c596dedd4..853a52346 100644 --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb | |||
@@ -4,8 +4,10 @@ SECTION = "net" | |||
4 | LICENSE = "copyleft-next-0.3.0" | 4 | LICENSE = "copyleft-next-0.3.0" |
5 | LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe" | 5 | LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe" |
6 | 6 | ||
7 | DEPENDS = "python-m2crypto-native python-typing-native python-native \ | 7 | DEPENDS = "python-m2crypto-native python-typing-native python-native libnl \ |
8 | libgcrypt libnl openssl10" | 8 | ${@oe.utils.conditional("DEFAULT_CRYPT", "gcrypt", "libgcrypt", "", d)} \ |
9 | ${@oe.utils.conditional("DEFAULT_CRYPT", "openssl", "openssl10", "", d)} \ | ||
10 | " | ||
9 | 11 | ||
10 | SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ | 12 | SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ |
11 | file://do-not-run-ldconfig-if-destdir-is-set.patch \ | 13 | file://do-not-run-ldconfig-if-destdir-is-set.patch \ |
@@ -21,9 +23,12 @@ SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e | |||
21 | 23 | ||
22 | inherit python-dir pythonnative siteinfo | 24 | inherit python-dir pythonnative siteinfo |
23 | 25 | ||
26 | # "gcrypt" or "openssl" | ||
27 | DEFAULT_CRYPT ??= "gcrypt" | ||
28 | |||
24 | # Recursive make problem | 29 | # Recursive make problem |
25 | EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg'" | 30 | EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg'" |
26 | EXTRA_OEMAKE_append = " USE_OPENSSL=1" | 31 | EXTRA_OEMAKE_append = " ${@oe.utils.conditional("DEFAULT_CRYPT", "openssl", "USE_OPENSSL=1", "", d)}" |
27 | TARGET_BITS = "${SITEINFO_BITS}" | 32 | TARGET_BITS = "${SITEINFO_BITS}" |
28 | export TARGET_BITS | 33 | export TARGET_BITS |
29 | 34 | ||