Patchwork [103/131] wpa-supplicant: Fix DEPENDS/RDEPENDS for all packages

login
register
mail settings
Submitter christian.braunersorensen@prevas.dk
Date Jan. 14, 2014, 12:34 p.m.
Message ID <fb53f8ddb6aa6d5b07dd645ae58bfdc86584e215.1389702652.git.christian.braunersorensen@prevas.dk>
Download mbox | patch
Permalink /patch/310713/
State Superseded
Delegated to: Esben Haabendal
Headers show

Comments

christian.braunersorensen@prevas.dk - Jan. 14, 2014, 12:34 p.m.
From: Christian Sørensen <christian.braunersorensen@prevas.dk>

Signed-off-by: Christian Sørensen <christian.braunersorensen@prevas.dk>
---
 recipes/wpa-supplicant/wpa-supplicant.inc | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Patch

diff --git a/recipes/wpa-supplicant/wpa-supplicant.inc b/recipes/wpa-supplicant/wpa-supplicant.inc
index bd93068..ee0c4b5 100644
--- a/recipes/wpa-supplicant/wpa-supplicant.inc
+++ b/recipes/wpa-supplicant/wpa-supplicant.inc
@@ -7,7 +7,9 @@  inherit make c++ pkgconfig
 
 DEPENDS_LIBC = "libdl"
 DEPENDS_LIBC:HOST_LIBC_mingw = ""
-DEPENDS += "libdbus libgnutls libgnutls-extra libnl-3 libnl-genl-3 libnl-genl-3 ${DEPENDS_LIBC}"
+DEPENDS += "libdbus-1 libgnutls dbus-dev gnutls-dev libnl-3 libnl-genl-3 \
+		libnl-genl-3 ${DEPENDS_LIBC} libnl-dev libgpg-error-dev \
+		libgcrypt-dev libgcrypt"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
            file://defconfig-gnutls \
@@ -18,10 +20,6 @@  SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 
 S = "${SRCDIR}/wpa_supplicant-${PV}/wpa_supplicant"
 
-RDEPENDS_${PN}-wpa-passphrase += "libgcrypt"
-RDEPENDS_${PN}-wpa-supplicant += "libgnutls libgnutls-extra libgcrypt libgpg-error libdbus libnl-3 libnl-genl-3"
-RDEPENDS_${PN} = "util/wpa-passphrase util/wpa-cli util/wpa-supplicant"
-
 RECIPE_FLAGS += "readline"
 WPA_SUPPLICANT_FLAGS:>USE_readline += " CONFIG_READLINE"
 DEPENDS:>USE_readline += " libreadline libncurses"
@@ -77,6 +75,14 @@  FILES_${PN} += "${datadir}/dbus-1/system-services/*"
 
 inherit auto-package-utils
 AUTO_PACKAGE_UTILS = "wpa_passphrase wpa_cli wpa_supplicant"
+AUTO_PACKAGE_UTILS_DEPENDS += "libc"
+AUTO_PACKAGE_UTILS_RDEPENDS += "libc"
+DEPENDS_${PN}-wpa-passphrase += "libgcrypt"
+RDEPENDS_${PN}-wpa-passphrase += "libgcrypt"
+DEPENDS_${PN}-wpa-supplicant += "libdbus-1 libdl libgcrypt libgnutls \
+		libgpg-error libnl-3 libnl-genl-3"
+RDEPENDS_${PN}-wpa-supplicant += "libdbus-1 libdl libgcrypt libgnutls \
+		libgpg-error libnl-3 libnl-genl-3"
 
 PACKAGES =+  "${PN}-conf"
 FILES_${PN}-conf = "${sysconfdir}/wpa_supplicant.conf"