diff options
| author |   Cristian Iorga <cristian.iorga@intel.com> | 2015-05-04 17:15:38 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-05 22:15:18 +0100 |
| commit | 1f6d4cc971da5ad04d5ceb52337116a2016560c9 (patch) | |
| tree | e36e71284eebe41086c11fbdd9aff0a0d057f954 | |
| parent | a2b98efc0e07644df5ea8d1d498b0c8ca3a3cc3e (diff) | |
| download | openembedded-core-contrib-1f6d4cc971da5ad04d5ceb52337116a2016560c9.tar.gz | |
connman: code cleanup
- cleanup multiple inherit lines;
- RDEPENDS cleanup, use PACKAGECONFIG[] instead.
(From OE-Core rev: 993594c018c845cc1cd58348d999dc9e52b778a4)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index d068ba894a..17dc4b938c 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -13,7 +13,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" -inherit bluetooth +inherit autotools pkgconfig systemd update-rc.d bluetooth DEPENDS = "dbus glib-2.0 ppp iptables" @@ -43,9 +43,9 @@ PACKAGECONFIG ??= "wispr \ # PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp" PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" -PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant" -PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" -PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono" +PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" +PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, ${BLUEZ}" +PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono" PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" PACKAGECONFIG[vpnc] = "--enable-vpnc --with-vpnc=${sbindir}/vpnc,--disable-vpnc,,vpnc" @@ -69,8 +69,6 @@ SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" -inherit autotools pkgconfig systemd update-rc.d - # This allows *everyone* to access ConnMan over DBus, without any access # control. Really the at_console flag should work, which would mean that # both this and the xuser patch can be dropped. @@ -114,9 +112,6 @@ RPROVIDES_${PN} = "\ RDEPENDS_${PN} = "\ dbus \ - ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', '${BLUEZ}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \ ${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)} \ " |