summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorYasir-Khan <yasir_khan@mentor.com>2014-08-06 12:52:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-11 09:53:05 (GMT)
commitb32b819ec9be8e0cdd6a345a417bf7023d40412f (patch)
tree0d3e98e493d14aa4e36d99a47e54b313ab0dd751 /meta/recipes-connectivity
parentb6cdfeceef3266d507d23e8e166056368d1d32d5 (diff)
downloadpoky-b32b819ec9be8e0cdd6a345a417bf7023d40412f.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. (From OE-Core rev: 0be9be4055e5b7f649d523a38344d3964dc9fdc4) Signed-off-by: Yasir-Khan <yasir_khan@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc20
-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 d9c6532..3a1cce0 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"
6LIC_FILES_CHKSUM = "file://COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \
7 file://README;beginline=1;endline=56;md5=a07250b28e857455336bb59fc31cb845 \ 7 file://README;beginline=1;endline=56;md5=a07250b28e857455336bb59fc31cb845 \
8 file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=e8e021e30f3a6ab7c341b66b86626a5a" 8 file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=e8e021e30f3a6ab7c341b66b86626a5a"
9DEPENDS = "gnutls dbus libnl openssl libgcrypt" 9DEPENDS = "dbus libnl libgcrypt"
10RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" 10RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
11 11
12PACKAGECONFIG ??= "gnutls"
13PACKAGECONFIG[gnutls] = ",,gnutls"
14PACKAGECONFIG[openssl] = ",,openssl"
15
12inherit systemd 16inherit systemd
13 17
14SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service" 18SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service"
15SYSTEMD_AUTO_ENABLE = "disable" 19SYSTEMD_AUTO_ENABLE = "disable"
16 20
17SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ 21SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
18 file://defconfig-gnutls \ 22 file://defconfig \
19 file://wpa-supplicant.sh \ 23 file://wpa-supplicant.sh \
20 file://wpa_supplicant.conf \ 24 file://wpa_supplicant.conf \
21 file://wpa_supplicant.conf-sane \ 25 file://wpa_supplicant.conf-sane \
@@ -34,8 +38,18 @@ FILES_${PN} += "${datadir}/dbus-1/system-services/*"
34CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf" 38CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
35 39
36do_configure () { 40do_configure () {
37 install -m 0755 ${WORKDIR}/defconfig-gnutls wpa_supplicant/.config 41 install -m 0755 ${WORKDIR}/defconfig wpa_supplicant/.config
38 echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config 42 echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config
43
44 if echo "${PACKAGECONFIG}" | grep -qw "openssl"; then
45 ssl=openssl
46 elif echo "${PACKAGECONFIG}" | grep -qw "gnutls"; then
47 ssl=gnutls
48 fi
49 if [ -n "$ssl" ]; then
50 sed -i "s/%ssl%/$ssl/" wpa_supplicant/.config
51 fi
52
39} 53}
40 54
41export EXTRA_CFLAGS = "${CFLAGS}" 55export 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 92ef823..f04e398 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
453#LIBS_p += -lbfd -liberty -lz 453#LIBS_p += -lbfd -liberty -lz
454#LIBS_c += -lbfd -liberty -lz 454#LIBS_c += -lbfd -liberty -lz
455 455
456CONFIG_TLS = gnutls 456CONFIG_TLS = %ssl%
457CONFIG_CTRL_IFACE_DBUS=y 457CONFIG_CTRL_IFACE_DBUS=y
458CONFIG_CTRL_IFACE_DBUS_NEW=y 458CONFIG_CTRL_IFACE_DBUS_NEW=y
459 459