summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-11-11 16:32:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:51 +0000
commit642e92f2cd67980a731ba21b570d8d1c6f4798e0 (patch)
treeccae9a0f45db187759a1fcc536ddfc20a51c2dcb /meta/recipes-core
parent96eac69636d2c345cdd50b19262f157335d53380 (diff)
downloadpoky-642e92f2cd67980a731ba21b570d8d1c6f4798e0.tar.gz
package_regex.inc: split entries with odd-even versioning into their own recipes
(From OE-Core rev: 5ddaba1fb833d0408cef5f58f786513b9293c30a) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dbus/dbus-test_1.8.20.bb2
-rw-r--r--meta/recipes-core/dbus/dbus_1.8.20.bb2
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
-rw-r--r--meta/recipes-core/glib-networking/glib-networking_2.46.1.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb b/meta/recipes-core/dbus/dbus-test_1.8.20.bb
index 704070bf20..f5400a0f26 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.8.20.bb
@@ -24,7 +24,7 @@ SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b
24S="${WORKDIR}/dbus-${PV}" 24S="${WORKDIR}/dbus-${PV}"
25FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" 25FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
26 26
27inherit autotools pkgconfig gettext ptest 27inherit autotools pkgconfig gettext ptest upstream-version-is-even
28 28
29EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" 29EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
30EXTRA_OECONF_X_class-native = "--without-x" 30EXTRA_OECONF_X_class-native = "--without-x"
diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb b/meta/recipes-core/dbus/dbus_1.8.20.bb
index 207a018c25..c0ad48b33c 100644
--- a/meta/recipes-core/dbus/dbus_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus_1.8.20.bb
@@ -22,7 +22,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
22SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" 22SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
23SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" 23SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"
24 24
25inherit useradd autotools pkgconfig gettext update-rc.d 25inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
26 26
27INITSCRIPT_NAME = "dbus-1" 27INITSCRIPT_NAME = "dbus-1"
28INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." 28INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index ae0eb79727..6e3cf56666 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -27,7 +27,7 @@ PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
27LEAD_SONAME = "libglib-2.0.*" 27LEAD_SONAME = "libglib-2.0.*"
28FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext" 28FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext"
29 29
30inherit autotools gettext gtk-doc pkgconfig ptest-gnome 30inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even
31 31
32S = "${WORKDIR}/glib-${PV}" 32S = "${WORKDIR}/glib-${PV}"
33 33
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.46.1.bb b/meta/recipes-core/glib-networking/glib-networking_2.46.1.bb
index b56e75744b..c980a09ed7 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.46.1.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.46.1.bb
@@ -22,7 +22,7 @@ PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit"
22 22
23EXTRA_OECONF = "--without-gnome-proxy" 23EXTRA_OECONF = "--without-gnome-proxy"
24 24
25inherit gnomebase gettext 25inherit gnomebase gettext upstream-version-is-even
26 26
27FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/" 27FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/"
28FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/" 28FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/"