summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei.gherzan@windriver.com>2011-12-29 12:22:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:29 +0000
commit199a9094c99bf0eb5bcc54c3c42e013ce074bc03 (patch)
treecaa72beb859bda1577461b8a83b40e29f47ee1c8
parent2d8a747801412db1d11e46cd26338d0545f468f2 (diff)
downloadpoky-199a9094c99bf0eb5bcc54c3c42e013ce074bc03.tar.gz
wpa-supplicant - pulls GPLv3 license rpm in a non-GPLv3 build (libgnutls-extra)
Two different defconfigs are chosen, one for "with GPLv3 build" and one for "without". In this way, libgnutls-extra is not pulled in a non-GPLv3 build. [YOCTO #1845] (From OE-Core rev: 8b79aa89470204383b81127cdb3e0670718c30fb) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/defconfig.inc4
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls-nogplv3409
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc7
3 files changed, 418 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/defconfig.inc b/meta/recipes-connectivity/wpa-supplicant/defconfig.inc
new file mode 100644
index 0000000000..fdcbb43945
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/defconfig.inc
@@ -0,0 +1,4 @@
1def get_defconfig(bb, d):
2 if d.getVar('INCOMPATIBLE_LICENSE', 1) in [ 'GPLv3' ]:
3 return "-nogplv3"
4 return ""
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls-nogplv3 b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls-nogplv3
new file mode 100644
index 0000000000..e03338fe09
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls-nogplv3
@@ -0,0 +1,409 @@
1# Example wpa_supplicant build time configuration
2#
3# This file lists the configuration options that are used when building the
4# hostapd binary. All lines starting with # are ignored. Configuration option
5# lines must be commented out complete, if they are not to be included, i.e.,
6# just setting VARIABLE=n is not disabling that variable.
7#
8# This file is included in Makefile, so variables like CFLAGS and LIBS can also
9# be modified from here. In most cases, these lines should use += in order not
10# to override previous values of the variables.
11
12
13# Uncomment following two lines and fix the paths if you have installed OpenSSL
14# or GnuTLS in non-default location
15#CFLAGS += -I/usr/local/openssl/include
16#LIBS += -L/usr/local/openssl/lib
17
18# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
19# the kerberos files are not in the default include path. Following line can be
20# used to fix build issues on such systems (krb5.h not found).
21#CFLAGS += -I/usr/include/kerberos
22
23# Example configuration for various cross-compilation platforms
24
25#### sveasoft (e.g., for Linksys WRT54G) ######################################
26#CC=mipsel-uclibc-gcc
27#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
28#CFLAGS += -Os
29#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
30#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
31###############################################################################
32
33#### openwrt (e.g., for Linksys WRT54G) #######################################
34#CC=mipsel-uclibc-gcc
35#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
36#CFLAGS += -Os
37#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
38# -I../WRT54GS/release/src/include
39#LIBS = -lssl
40###############################################################################
41
42
43# Driver interface for Host AP driver
44CONFIG_DRIVER_HOSTAP=y
45
46# Driver interface for Agere driver
47#CONFIG_DRIVER_HERMES=y
48# Change include directories to match with the local setup
49#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
50#CFLAGS += -I../../include/wireless
51
52# Driver interface for madwifi driver
53# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
54#CONFIG_DRIVER_MADWIFI=y
55# Set include directory to the madwifi source tree
56#CFLAGS += -I../../madwifi
57
58# Driver interface for ndiswrapper
59# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
60#CONFIG_DRIVER_NDISWRAPPER=y
61
62# Driver interface for Atmel driver
63# CONFIG_DRIVER_ATMEL=y
64
65# Driver interface for old Broadcom driver
66# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
67# Linux wireless extensions and does not need (or even work) with the old
68# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
69#CONFIG_DRIVER_BROADCOM=y
70# Example path for wlioctl.h; change to match your configuration
71#CFLAGS += -I/opt/WRT54GS/release/src/include
72
73# Driver interface for Intel ipw2100/2200 driver
74# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
75#CONFIG_DRIVER_IPW=y
76
77# Driver interface for Ralink driver
78#CONFIG_DRIVER_RALINK=y
79
80# Driver interface for generic Linux wireless extensions
81CONFIG_DRIVER_WEXT=y
82
83# Driver interface for Linux drivers using the nl80211 kernel interface
84CONFIG_LIBNL20=y
85CONFIG_DRIVER_NL80211=y
86
87# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
88#CONFIG_DRIVER_BSD=y
89#CFLAGS += -I/usr/local/include
90#LIBS += -L/usr/local/lib
91#LIBS_p += -L/usr/local/lib
92#LIBS_c += -L/usr/local/lib
93
94# Driver interface for Windows NDIS
95#CONFIG_DRIVER_NDIS=y
96#CFLAGS += -I/usr/include/w32api/ddk
97#LIBS += -L/usr/local/lib
98# For native build using mingw
99#CONFIG_NATIVE_WINDOWS=y
100# Additional directories for cross-compilation on Linux host for mingw target
101#CFLAGS += -I/opt/mingw/mingw32/include/ddk
102#LIBS += -L/opt/mingw/mingw32/lib
103#CC=mingw32-gcc
104# By default, driver_ndis uses WinPcap for low-level operations. This can be
105# replaced with the following option which replaces WinPcap calls with NDISUIO.
106# However, this requires that WZC is disabled (net stop wzcsvc) before starting
107# wpa_supplicant.
108# CONFIG_USE_NDISUIO=y
109
110# Driver interface for development testing
111#CONFIG_DRIVER_TEST=y
112
113# Include client MLME (management frame processing) for test driver
114# This can be used to test MLME operations in hostapd with the test interface.
115# space.
116#CONFIG_CLIENT_MLME=y
117
118# Driver interface for wired Ethernet drivers
119CONFIG_DRIVER_WIRED=y
120
121# Driver interface for the Broadcom RoboSwitch family
122#CONFIG_DRIVER_ROBOSWITCH=y
123
124# Driver interface for no driver (e.g., WPS ER only)
125#CONFIG_DRIVER_NONE=y
126
127# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
128# included)
129CONFIG_IEEE8021X_EAPOL=y
130
131# EAP-MD5
132CONFIG_EAP_MD5=y
133
134# EAP-MSCHAPv2
135CONFIG_EAP_MSCHAPV2=y
136
137# EAP-TLS
138CONFIG_EAP_TLS=y
139
140# EAL-PEAP
141CONFIG_EAP_PEAP=y
142
143# EAP-TTLS
144CONFIG_EAP_TTLS=y
145
146# EAP-FAST
147# Note: Default OpenSSL package does not include support for all the
148# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
149# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
150# to add the needed functions.
151#CONFIG_EAP_FAST=y
152
153# EAP-GTC
154CONFIG_EAP_GTC=y
155
156# EAP-OTP
157CONFIG_EAP_OTP=y
158
159# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
160#CONFIG_EAP_SIM=y
161
162# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
163#CONFIG_EAP_PSK=y
164
165# EAP-PAX
166#CONFIG_EAP_PAX=y
167
168# LEAP
169CONFIG_EAP_LEAP=y
170
171# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
172#CONFIG_EAP_AKA=y
173
174# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
175# This requires CONFIG_EAP_AKA to be enabled, too.
176#CONFIG_EAP_AKA_PRIME=y
177
178# Enable USIM simulator (Milenage) for EAP-AKA
179#CONFIG_USIM_SIMULATOR=y
180
181# EAP-SAKE
182#CONFIG_EAP_SAKE=y
183
184# EAP-GPSK
185#CONFIG_EAP_GPSK=y
186# Include support for optional SHA256 cipher suite in EAP-GPSK
187#CONFIG_EAP_GPSK_SHA256=y
188
189# EAP-TNC and related Trusted Network Connect support (experimental)
190#CONFIG_EAP_TNC=y
191
192# Wi-Fi Protected Setup (WPS)
193#CONFIG_WPS=y
194
195# EAP-IKEv2
196#CONFIG_EAP_IKEV2=y
197
198# PKCS#12 (PFX) support (used to read private key and certificate file from
199# a file that usually has extension .p12 or .pfx)
200CONFIG_PKCS12=y
201
202# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
203# engine.
204CONFIG_SMARTCARD=y
205
206# PC/SC interface for smartcards (USIM, GSM SIM)
207# Enable this if EAP-SIM or EAP-AKA is included
208#CONFIG_PCSC=y
209
210# Development testing
211#CONFIG_EAPOL_TEST=y
212
213# Select control interface backend for external programs, e.g, wpa_cli:
214# unix = UNIX domain sockets (default for Linux/*BSD)
215# udp = UDP sockets using localhost (127.0.0.1)
216# named_pipe = Windows Named Pipe (default for Windows)
217# y = use default (backwards compatibility)
218# If this option is commented out, control interface is not included in the
219# build.
220CONFIG_CTRL_IFACE=y
221
222# Include support for GNU Readline and History Libraries in wpa_cli.
223# When building a wpa_cli binary for distribution, please note that these
224# libraries are licensed under GPL and as such, BSD license may not apply for
225# the resulting binary.
226#CONFIG_READLINE=y
227
228# Remove debugging code that is printing out debug message to stdout.
229# This can be used to reduce the size of the wpa_supplicant considerably
230# if debugging code is not needed. The size reduction can be around 35%
231# (e.g., 90 kB).
232#CONFIG_NO_STDOUT_DEBUG=y
233
234# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
235# 35-50 kB in code size.
236#CONFIG_NO_WPA=y
237
238# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
239# save about 1 kB in code size when building only WPA-Personal (no EAP support)
240# or 6 kB if building for WPA-Enterprise.
241#CONFIG_NO_WPA2=y
242
243# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
244# This option can be used to reduce code size by removing support for
245# converting ASCII passphrases into PSK. If this functionality is removed, the
246# PSK can only be configured as the 64-octet hexstring (e.g., from
247# wpa_passphrase). This saves about 0.5 kB in code size.
248#CONFIG_NO_WPA_PASSPHRASE=y
249
250# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
251# This can be used if ap_scan=1 mode is never enabled.
252#CONFIG_NO_SCAN_PROCESSING=y
253
254# Select configuration backend:
255# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
256# path is given on command line, not here; this option is just used to
257# select the backend that allows configuration files to be used)
258# winreg = Windows registry (see win_example.reg for an example)
259CONFIG_BACKEND=file
260
261# Remove configuration write functionality (i.e., to allow the configuration
262# file to be updated based on runtime configuration changes). The runtime
263# configuration can still be changed, the changes are just not going to be
264# persistent over restarts. This option can be used to reduce code size by
265# about 3.5 kB.
266#CONFIG_NO_CONFIG_WRITE=y
267
268# Remove support for configuration blobs to reduce code size by about 1.5 kB.
269#CONFIG_NO_CONFIG_BLOBS=y
270
271# Select program entry point implementation:
272# main = UNIX/POSIX like main() function (default)
273# main_winsvc = Windows service (read parameters from registry)
274# main_none = Very basic example (development use only)
275#CONFIG_MAIN=main
276
277# Select wrapper for operatins system and C library specific functions
278# unix = UNIX/POSIX like systems (default)
279# win32 = Windows systems
280# none = Empty template
281#CONFIG_OS=unix
282
283# Select event loop implementation
284# eloop = select() loop (default)
285# eloop_win = Windows events and WaitForMultipleObject() loop
286# eloop_none = Empty template
287#CONFIG_ELOOP=eloop
288
289# Select layer 2 packet implementation
290# linux = Linux packet socket (default)
291# pcap = libpcap/libdnet/WinPcap
292# freebsd = FreeBSD libpcap
293# winpcap = WinPcap with receive thread
294# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
295# none = Empty template
296#CONFIG_L2_PACKET=linux
297
298# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
299CONFIG_PEERKEY=y
300
301# IEEE 802.11w (management frame protection)
302# This version is an experimental implementation based on IEEE 802.11w/D1.0
303# draft and is subject to change since the standard has not yet been finalized.
304# Driver support is also needed for IEEE 802.11w.
305#CONFIG_IEEE80211W=y
306
307# Select TLS implementation
308# openssl = OpenSSL (default)
309# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
310# internal = Internal TLSv1 implementation (experimental)
311# none = Empty template
312#CONFIG_TLS=openssl
313
314# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
315# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
316# even though the core GnuTLS library is released under LGPL, this extra
317# library uses GPL and as such, the terms of GPL apply to the combination
318# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
319# apply for distribution of the resulting binary.
320#CONFIG_GNUTLS_EXTRA=y
321
322# If CONFIG_TLS=internal is used, additional library and include paths are
323# needed for LibTomMath. Alternatively, an integrated, minimal version of
324# LibTomMath can be used. See beginning of libtommath.c for details on benefits
325# and drawbacks of this option.
326#CONFIG_INTERNAL_LIBTOMMATH=y
327#ifndef CONFIG_INTERNAL_LIBTOMMATH
328#LTM_PATH=/usr/src/libtommath-0.39
329#CFLAGS += -I$(LTM_PATH)
330#LIBS += -L$(LTM_PATH)
331#LIBS_p += -L$(LTM_PATH)
332#endif
333# At the cost of about 4 kB of additional binary size, the internal LibTomMath
334# can be configured to include faster routines for exptmod, sqr, and div to
335# speed up DH and RSA calculation considerably
336#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
337
338# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
339# This is only for Windows builds and requires WMI-related header files and
340# WbemUuid.Lib from Platform SDK even when building with MinGW.
341#CONFIG_NDIS_EVENTS_INTEGRATED=y
342#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
343
344# Add support for old DBus control interface
345# (fi.epitest.hostap.WPASupplicant)
346#CONFIG_CTRL_IFACE_DBUS=y
347
348# Add support for new DBus control interface
349# (fi.w1.hostap.wpa_supplicant1)
350#CONFIG_CTRL_IFACE_DBUS_NEW=y
351
352# Add introspection support for new DBus control interface
353#CONFIG_CTRL_IFACE_DBUS_INTRO=y
354
355# Add support for loading EAP methods dynamically as shared libraries.
356# When this option is enabled, each EAP method can be either included
357# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
358# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
359# be loaded in the beginning of the wpa_supplicant configuration file
360# (see load_dynamic_eap parameter in the example file) before being used in
361# the network blocks.
362#
363# Note that some shared parts of EAP methods are included in the main program
364# and in order to be able to use dynamic EAP methods using these parts, the
365# main program must have been build with the EAP method enabled (=y or =dyn).
366# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
367# unless at least one of them was included in the main build to force inclusion
368# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
369# in the main build to be able to load these methods dynamically.
370#
371# Please also note that using dynamic libraries will increase the total binary
372# size. Thus, it may not be the best option for targets that have limited
373# amount of memory/flash.
374#CONFIG_DYNAMIC_EAP_METHODS=y
375
376# IEEE Std 802.11r-2008 (Fast BSS Transition)
377#CONFIG_IEEE80211R=y
378
379# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
380#CONFIG_DEBUG_FILE=y
381
382# Enable privilege separation (see README 'Privilege separation' for details)
383#CONFIG_PRIVSEP=y
384
385# Enable mitigation against certain attacks against TKIP by delaying Michael
386# MIC error reports by a random amount of time between 0 and 60 seconds
387#CONFIG_DELAYED_MIC_ERROR_REPORT=y
388
389# Enable tracing code for developer debugging
390# This tracks use of memory allocations and other registrations and reports
391# incorrect use with a backtrace of call (or allocation) location.
392#CONFIG_WPA_TRACE=y
393# For BSD, comment out these.
394#LIBS += -lexecinfo
395#LIBS_p += -lexecinfo
396#LIBS_c += -lexecinfo
397
398# Use libbfd to get more details for developer debugging
399# This enables use of libbfd to get more detailed symbols for the backtraces
400# generated by CONFIG_WPA_TRACE=y.
401#CONFIG_WPA_TRACE_BFD=y
402# For BSD, comment out these.
403#LIBS += -lbfd -liberty -lz
404#LIBS_p += -lbfd -liberty -lz
405#LIBS_c += -lbfd -liberty -lz
406CONFIG_TLS = gnutls
407#CONFIG_GNUTLS_EXTRA=y
408CONFIG_CTRL_IFACE_DBUS=y
409CONFIG_CTRL_IFACE_DBUS_NEW=y
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index ccdc4c3e7e..c2e329411a 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -9,8 +9,11 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
9DEPENDS = "gnutls dbus libnl" 9DEPENDS = "gnutls dbus libnl"
10RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" 10RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
11 11
12# Check if GPLv3 build and select the correct file in configure
13require defconfig.inc
14
12SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ 15SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
13 file://defconfig-gnutls \ 16 file://defconfig-gnutls${@get_defconfig(bb, d)} \
14 file://defaults-sane \ 17 file://defaults-sane \
15 file://wpa-supplicant.sh \ 18 file://wpa-supplicant.sh \
16 file://wpa_supplicant.conf \ 19 file://wpa_supplicant.conf \
@@ -25,7 +28,7 @@ FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
25FILES_${PN} += " ${datadir}/dbus-1/system-services/* 28FILES_${PN} += " ${datadir}/dbus-1/system-services/*
26 29
27do_configure () { 30do_configure () {
28 install -m 0755 ${WORKDIR}/defconfig-gnutls .config 31 install -m 0755 ${WORKDIR}/defconfig-gnutls${@get_defconfig(bb, d)} .config
29} 32}
30 33
31export EXTRA_CFLAGS = "${CFLAGS}" 34export EXTRA_CFLAGS = "${CFLAGS}"