From 0e0571dc762464fc5e91047359262b45d91cc504 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Mar 2011 14:30:52 +0100 Subject: wpa-supplicant-0.7: depend only on libnl(-2.0) not libnl2(-2.0) Acked-by: Koen Kooi Signed-off-by: Martin Jansa --- recipes/wpa-supplicant/wpa-supplicant-0.7.inc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc index 764903894d..0cf3b700fe 100644 --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc @@ -6,9 +6,9 @@ LICENSE = "GPLv2 | BSD" LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \ file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e" -DEPENDS = "gnutls dbus libnl2 openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" +DEPENDS = "gnutls dbus libnl openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" -INC_PR = "r6" +INC_PR = "r7" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig \ @@ -20,11 +20,6 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant" -# We stage libnl2 header files not directly as they clash with libnl files. Once -# we only use libnl2 and stage the headers at the normal place we can remove -# this. -CFLAGS += "-I${STAGING_INCDIR}/libnl2/" - PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli" -- cgit 1.2.3-korg