mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 02:10:04 +00:00
Code Issues Projects Releases Wiki Activity

Make use of the new bb.utils.filter() function

Browse Source 
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Peter Kjellerstedt
2017-03-01 18:30:49 +01:00
committed by Martin Jansa
parent b4524eb786
commit 0c31f55bcf
91 changed files with 112 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/bluez/bluez4.inc
+1 -5
View File
@@ -15,11 +15,7 @@ RCONFLICTS_${PN} += "${PN}-systemd"
DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
RDEPENDS_${PN}-dev = "bluez-hcidump"
PACKAGECONFIG ??= "\
${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\
${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \
"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pie systemd', d)}"
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
+1 -1
View File
@@ -8,7 +8,7 @@ SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2"
DEPENDS = "glib-2.0 intltool-native"
X11DEPENDS = " libxpm gtk+"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical"
PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite"
meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb
+1 -1
View File
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf79261
S = "${WORKDIR}/ModemManager-${PV}"
PACKAGECONFIG ??= "mbim qmi polkit \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
"
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,"
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb
+4 -4
View File
@@ -48,9 +48,9 @@ do_compile_prepend() {
}
PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \
${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \
"
PACKAGECONFIG[systemd] = " \
--with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
@@ -95,7 +95,7 @@ FILES_${PN} += " \
"
RRECOMMENDS_${PN} += "iptables \
${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \
${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \
"
RCONFLICTS_${PN} = "connman"