diff options
| author |   Yasir-Khan <yasir_khan@mentor.com> | 2014-08-06 17:52:36 +0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-11 10:46:58 +0100 |
| commit | 0be9be4055e5b7f649d523a38344d3964dc9fdc4 (patch) | |
| tree | 575ae406f3de522c3ef32a706f964137a0b82735 /meta/recipes-connectivity | |
| parent | 0554d4121f05c449f37b6ebde96dd1d02e71eb0c (diff) | |
| download | openembedded-core-contrib-0be9be4055e5b7f649d523a38344d3964dc9fdc4.tar.gz | |
wpa-supplicant: use PACKAGECONFIG for ssl selection
Select between openssl or gnutls as ssl implementation via
PACKAGECONFIG instead of explicitly adding both via DEPENDS.
Signed-off-by: Yasir-Khan <yasir_khan@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc | 20 | ||||
| -rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig (renamed from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls) | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc index d9c6532b5a..3a1cce0657 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc @@ -6,16 +6,20 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \ file://README;beginline=1;endline=56;md5=a07250b28e857455336bb59fc31cb845 \ file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=e8e021e30f3a6ab7c341b66b86626a5a" -DEPENDS = "gnutls dbus libnl openssl libgcrypt" +DEPENDS = "dbus libnl libgcrypt" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" +PACKAGECONFIG ??= "gnutls" +PACKAGECONFIG[gnutls] = ",,gnutls" +PACKAGECONFIG[openssl] = ",,openssl" + inherit systemd SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service" SYSTEMD_AUTO_ENABLE = "disable" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://defconfig-gnutls \ + file://defconfig \ file://wpa-supplicant.sh \ file://wpa_supplicant.conf \ file://wpa_supplicant.conf-sane \ @@ -34,8 +38,18 @@ FILES_${PN} += "${datadir}/dbus-1/system-services/*" CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf" do_configure () { - install -m 0755 ${WORKDIR}/defconfig-gnutls wpa_supplicant/.config + install -m 0755 ${WORKDIR}/defconfig wpa_supplicant/.config echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config + + if echo "${PACKAGECONFIG}" | grep -qw "openssl"; then + ssl=openssl + elif echo "${PACKAGECONFIG}" | grep -qw "gnutls"; then + ssl=gnutls + fi + if [ -n "$ssl" ]; then + sed -i "s/%ssl%/$ssl/" wpa_supplicant/.config + fi + } export EXTRA_CFLAGS = "${CFLAGS}" diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig index 92ef8231d5..f04e398fdb 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig @@ -453,7 +453,7 @@ CONFIG_CTRL_IFACE_DBUS_NEW=y #LIBS_p += -lbfd -liberty -lz #LIBS_c += -lbfd -liberty -lz -CONFIG_TLS = gnutls +CONFIG_TLS = %ssl% CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y |