diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-01-21 18:46:25 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-22 09:56:35 -0800 |
commit | b5cce2f54fd922877c1b8c796292d6d608bcc7f9 (patch) | |
tree | 9c467689dc5cffd2bc163574c3e11bef5f0c651a | |
parent | 713ae34131da6936739e1e9409a8cb5bbd99457c (diff) | |
download | meta-openembedded-contrib-b5cce2f54fd922877c1b8c796292d6d608bcc7f9.tar.gz |
telepathy-idle: Disable when meta-py2 is not present
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb | 7 | ||||
-rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb index 5eb00aefbe..42ce3301f5 100644 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb @@ -11,7 +11,12 @@ SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz SRC_URI[md5sum] = "92a2de5198284cbd3c430b0d1a971a86" SRC_URI[sha256sum] = "3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d76f2fab" -inherit autotools pkgconfig python3native +inherit autotools pkgconfig pythonnative FILES_${PN} += "${datadir}/telepathy \ ${datadir}/dbus-1" + +python() { + if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') +} diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index baf1fa1d61..f045167e8e 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -65,11 +65,12 @@ RDEPENDS_packagegroup-meta-oe-connectivity ="\ libuv libwebsockets linuxptp lirc loudmouth \ modemmanager mosh \ paho-mqtt-c phonet-utils rabbitmq-c rfkill rtorrent \ - ser2net smstools3 telepathy-glib telepathy-idle thrift \ + ser2net smstools3 telepathy-glib thrift \ usbmuxd zabbix zeromq \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obex-data-server", "", d)} \ libmikmod \ obexftp openobex libnet \ + ${@bb.utils.contains("BBPATH", "meta-python2", "telepathy-idle", "", d)} \ " RDEPENDS_packagegroup-meta-oe-connectivity_append_libc-glibc = " wvstreams wvdial" |