diff options
author | Andrei Gherzan <andrei.gherzan@windriver.com> | 2011-12-29 12:22:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 12:14:29 +0000 |
commit | 199a9094c99bf0eb5bcc54c3c42e013ce074bc03 (patch) | |
tree | caa72beb859bda1577461b8a83b40e29f47ee1c8 /meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc | |
parent | 2d8a747801412db1d11e46cd26338d0545f468f2 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc')
-rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc | 7 |
1 files changed, 5 insertions, 2 deletions
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 \ | |||
9 | DEPENDS = "gnutls dbus libnl" | 9 | DEPENDS = "gnutls dbus libnl" |
10 | RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" | 10 | RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" |
11 | 11 | ||
12 | # Check if GPLv3 build and select the correct file in configure | ||
13 | require defconfig.inc | ||
14 | |||
12 | SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ | 15 | SRC_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" | |||
25 | FILES_${PN} += " ${datadir}/dbus-1/system-services/* | 28 | FILES_${PN} += " ${datadir}/dbus-1/system-services/* |
26 | 29 | ||
27 | do_configure () { | 30 | do_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 | ||
31 | export EXTRA_CFLAGS = "${CFLAGS}" | 34 | export EXTRA_CFLAGS = "${CFLAGS}" |