summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch15
-rw-r--r--meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb22
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb6
3 files changed, 0 insertions, 43 deletions
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch
deleted file mode 100644
index 2cd2c78c31..0000000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
4--- a/extensions/Makefile.am
5+++ b/extensions/Makefile.am
6@@ -37,8 +37,8 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
7 --xinclude $(tools_dir)/identity.xsl \
8 $< > $@
9
10-extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
11+extensions.html _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/doc-generator.xsl
12 $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
13 $(tools_dir)/doc-generator.xsl \
14 $< > $@
15
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
deleted file mode 100644
index 039cfc3a89..0000000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SUMMARY = "Telepathy IRC connection manager"
2DESCRIPTION = "Telepathy implementation of the Internet Relay Chat protocols."
3HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
4DEPENDS = "glib-2.0 dbus telepathy-glib openssl libxslt-native"
5LICENSE = "LGPL-2.1-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
7 file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9"
8
9SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
10 file://fix-svc-gtk-doc.h-target.patch"
11SRC_URI[md5sum] = "92a2de5198284cbd3c430b0d1a971a86"
12SRC_URI[sha256sum] = "3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d76f2fab"
13
14inherit autotools pkgconfig ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
15
16FILES:${PN} += "${datadir}/telepathy \
17 ${datadir}/dbus-1"
18
19python() {
20 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
21 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
22}
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 9523e78ddd..163061ca7b 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -8,7 +8,6 @@ PACKAGES = "\
8 packagegroup-meta-oe \ 8 packagegroup-meta-oe \
9 packagegroup-meta-oe-benchmarks \ 9 packagegroup-meta-oe-benchmarks \
10 packagegroup-meta-oe-connectivity \ 10 packagegroup-meta-oe-connectivity \
11 packagegroup-meta-oe-connectivity-python2 \
12 packagegroup-meta-oe-core \ 11 packagegroup-meta-oe-core \
13 packagegroup-meta-oe-crypto \ 12 packagegroup-meta-oe-crypto \
14 packagegroup-meta-oe-bsp \ 13 packagegroup-meta-oe-bsp \
@@ -35,7 +34,6 @@ RDEPENDS:packagegroup-meta-oe = "\
35 packagegroup-meta-oe-benchmarks \ 34 packagegroup-meta-oe-benchmarks \
36 packagegroup-meta-oe-bsp \ 35 packagegroup-meta-oe-bsp \
37 packagegroup-meta-oe-connectivity \ 36 packagegroup-meta-oe-connectivity \
38 ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-connectivity-python2", "", d)} \
39 packagegroup-meta-oe-core \ 37 packagegroup-meta-oe-core \
40 packagegroup-meta-oe-crypto \ 38 packagegroup-meta-oe-crypto \
41 packagegroup-meta-oe-dbs \ 39 packagegroup-meta-oe-dbs \
@@ -167,10 +165,6 @@ RDEPENDS:packagegroup-meta-oe-connectivity ="\
167 165
168RDEPENDS:packagegroup-meta-oe-connectivity:append:libc-glibc = " wvstreams wvdial" 166RDEPENDS:packagegroup-meta-oe-connectivity:append:libc-glibc = " wvstreams wvdial"
169 167
170RDEPENDS:packagegroup-meta-oe-connectivity-python2 = "\
171 ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "telepathy-idle", "", d)} \
172"
173
174# dracut needs dracut 168# dracut needs dracut
175RDEPENDS:packagegroup-meta-oe-core = "\ 169RDEPENDS:packagegroup-meta-oe-core = "\
176 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dbus-broker", "", d)} \ 170 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dbus-broker", "", d)} \