From d9de836c5f53af232dc1bc120999b8a8c555491d Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Thu, 7 Mar 2019 09:24:39 +0200 Subject: crda: Remove alternative option to build with the obsolete OpenSSL 1.0 Note that crda is mainly a legacy package for older kernels, wireless-regdb-static is recommended instead for kernels >= 4.15. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/crda/crda_3.18.bb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb index d5d2ab68c6..c93905ea7c 100644 --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -4,10 +4,7 @@ SECTION = "net" LICENSE = "copyleft-next-0.3.0" LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe" -DEPENDS = "python-m2crypto-native python-typing-native python-native libnl \ - ${@oe.utils.conditional("DEFAULT_CRYPT", "gcrypt", "libgcrypt", "", d)} \ - ${@oe.utils.conditional("DEFAULT_CRYPT", "openssl", "openssl10", "", d)} \ - " +DEPENDS = "python-m2crypto-native python-typing-native python-native libnl libgcrypt" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ file://do-not-run-ldconfig-if-destdir-is-set.patch \ @@ -23,13 +20,9 @@ SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e inherit python-dir pythonnative siteinfo -# "gcrypt" or "openssl" -DEFAULT_CRYPT ??= "gcrypt" - # Recursive make problem EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg' \ UDEV_RULE_DIR=${nonarch_libdir}/udev/rules.d/" -EXTRA_OEMAKE_append = " ${@oe.utils.conditional("DEFAULT_CRYPT", "openssl", "USE_OPENSSL=1", "", d)}" TARGET_BITS = "${SITEINFO_BITS}" export TARGET_BITS -- cgit 1.2.3-korg