sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

connman: add PACKAGECONFIG options 

- change TIST from being explicitly built, to a PACKAGECONFIG
- move wifi, 3g and bluetooth to PACKAGECONFIG
- change RDEPENDS and RPROVIDES to check PACKAGECONFIG rather
  than DISTRO_FEATURES

(From OE-Core rev: da3f9f7febdc485a356ccb102e0d93cd8f059da7)

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jack Mitchell 2013-04-26 12:22:40 +01:00 committed by Richard Purdie
parent d36cc47734
commit 9a3d8c214c
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
meta/recipes-connectivity/connman/connman.inc
View File

@ -13,17 +13,9 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://src/main.c;beginline=1;endline=20;md5=d6a1ac98a6791c5294e8a7f176ecd66d"
# we need to define the depends here, the dynamic stuff is too late
DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
"
DEPENDS = "dbus glib-2.0 ppp iptables gnutls"
INC_PR = "r19"
TIST = "--enable-tist"
TIST_powerpc = ""
INC_PR = "r20"
EXTRA_OECONF += "\
ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
@ -32,9 +24,6 @@ EXTRA_OECONF += "\
--enable-threads \
--enable-loopback \
--enable-ethernet \
${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
${@base_contains('DISTRO_FEATURES', '3g', '--enable-ofono', '--disable-ofono', d)} \
--enable-tools \
--enable-test \
--disable-polkit \
@ -43,6 +32,17 @@ EXTRA_OECONF += "\
${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
"
PACKAGECONFIG ??= "\
${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
${@base_contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \
${@base_contains('DISTRO_FEATURES', '3g','3g', '', d)} \
"
PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4"
PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
INITSCRIPT_NAME = "connman"
INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
@ -92,16 +92,16 @@ do_install_append() {
RPROVIDES_${PN} = "\
connman-plugin-loopback \
connman-plugin-ethernet \
${@base_contains('DISTRO_FEATURES', 'bluetooth','connman-plugin-bluetooth', '', d)} \
${@base_contains('DISTRO_FEATURES', 'wifi','connman-plugin-wifi', '', d)} \
${@base_contains('DISTRO_FEATURES', '3g','connman-plugin-ofono', '', d)} \
${@base_contains('PACKAGECONFIG', 'bluetooth','connman-plugin-bluetooth', '', d)} \
${@base_contains('PACKAGECONFIG', 'wifi','connman-plugin-wifi', '', d)} \
${@base_contains('PACKAGECONFIG', '3g','connman-plugin-ofono', '', d)} \
"
RDEPENDS_${PN} = "\
dbus \
${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \
${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \
"
PACKAGES_DYNAMIC += "^${PN}-plugin-.*"