diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-11-11 16:32:16 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-08 10:20:51 +0000 |
commit | 642e92f2cd67980a731ba21b570d8d1c6f4798e0 (patch) | |
tree | ccae9a0f45db187759a1fcc536ddfc20a51c2dcb /meta/recipes-core | |
parent | 96eac69636d2c345cdd50b19262f157335d53380 (diff) | |
download | openembedded-core-contrib-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.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.8.20.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/glib-networking/glib-networking_2.46.1.bb | 2 |
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 S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" -inherit autotools pkgconfig gettext ptest +inherit autotools pkgconfig gettext ptest upstream-version-is-even EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" EXTRA_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 \ SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" -inherit useradd autotools pkgconfig gettext update-rc.d +inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even INITSCRIPT_NAME = "dbus-1" INITSCRIPT_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" LEAD_SONAME = "libglib-2.0.*" FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext" -inherit autotools gettext gtk-doc pkgconfig ptest-gnome +inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even S = "${WORKDIR}/glib-${PV}" 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" EXTRA_OECONF = "--without-gnome-proxy" -inherit gnomebase gettext +inherit gnomebase gettext upstream-version-is-even FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/" FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/" |