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:10:45 +0000 |
| commit | 8b79aa89470204383b81127cdb3e0670718c30fb (patch) | |
| tree | 45652c44b73cc3433c73c38b1ace0cef7cb79a0b /meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc | |
| parent | 0343ccd64ae03245ae8ab36e7f2da95d4ee28c18 (diff) | |
| download | openembedded-core-8b79aa89470204383b81127cdb3e0670718c30fb.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]
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
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 \ DEPENDS = "gnutls dbus libnl" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" +# Check if GPLv3 build and select the correct file in configure +require defconfig.inc + SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://defconfig-gnutls \ + file://defconfig-gnutls${@get_defconfig(bb, d)} \ file://defaults-sane \ file://wpa-supplicant.sh \ file://wpa_supplicant.conf \ @@ -25,7 +28,7 @@ FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" FILES_${PN} += " ${datadir}/dbus-1/system-services/* do_configure () { - install -m 0755 ${WORKDIR}/defconfig-gnutls .config + install -m 0755 ${WORKDIR}/defconfig-gnutls${@get_defconfig(bb, d)} .config } export EXTRA_CFLAGS = "${CFLAGS}" |