connman: conditionally enable bluetooth and wifi

Let connman depend and enable wifi and bluetooth, only when these are set in the DISTRO_FEATURES.

This reduces build-time, and make a non-x11 build succeed, as bluez4 currently depends on x11 through a dependency chain. (This could/should be fixed in a later patch).

V2: * Remove unnecessarily set variables BLUEZDEPENDS and WIFIDEPENDS.

The following changes since commit 6d424db5a0f952956a218e82a3ef0c43ebaafd5a:

xcb: add missing bbappends (2011-08-16 13:07:31 +0200)

are available in the git repository at:
git://github.com/darander/meta-oe connman
https://github.com/darander/meta-oe/tree/connman

Anders Darander (1):
connman: conditionally enable wifi and bluetooth

 meta-oe/recipes-connectivity/connman/connman.inc   |    5 ++++-
 .../recipes-connectivity/connman/connman_0.76.bb   |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

1.7.5.4

Use DISTRO_FEATURES to conditionally depend and enable wifi and bluetooth.

---
 meta-oe/recipes-connectivity/connman/connman.inc   |    5 ++++-
 .../recipes-connectivity/connman/connman_0.76.bb   |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

index 2652125..eeccf50 100644
@@ -14,7 +14,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
                     file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e"
 
 # we need to define the depends here, the dynamic stuff is too late
-DEPENDS  = "wpa-supplicant dbus glib-2.0 ppp busybox dhcp resolvconf bluez4 iptables gnutls ntp"
+DEPENDS  = "dbus glib-2.0 ppp busybox dhcp resolvconf iptables gnutls ntp \
+            ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
+            ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
+            "
 
 EXTRA_OECONF += "\
     ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \

index cb84caa..abae73a 100644
@@ -6,8 +6,8 @@ EXTRA_OECONF += "\
   --enable-threads \
   --enable-loopback \
   --enable-ethernet \
-  --enable-wifi \
-  --enable-bluetooth \
+  ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \
+  ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
   --enable-ofono \
   --enable-tools \
   --disable-polkit \

1.7.5.4

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 17-08-11 08:13, Anders Darander schreef:

Q'd both, thanks!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOS2wiMkyGM64RGpERAsWhAJ0YCG/D/S/U02uqGIpMbS3B9HeO1ACdHKWK n+AmsYVGs2W6iBOaBOKDTjY=
=RqI1
-----END PGP SIGNATURE-----