summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-06 14:48:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-08 13:00:33 +0100
commita2e612c7763002c2fdc5f24cd015a8fd5b12b1e0 (patch)
tree54861fd1ee8147e15bec630ddb8a8a2aa37ca104 /meta/recipes-core
parent37dcf148ba6d5eb82e894bb52fa4d94e6d5de07e (diff)
downloadpoky-a2e612c7763002c2fdc5f24cd015a8fd5b12b1e0.tar.gz
ptest: Work from PTEST_ENABLED, not DISTRO_FEATURES
Some classes of recipe disable ptest even though its in DISTRO_FEATURES (e.g. nativesdk). We shouldn't attempt to build ptest packages when its disabled. This replaces some DISTRO_FEATURE checks with PTEST_ENABLED checks instead. (From OE-Core rev: 8b14fcc62f31bbbb231790136cdb984db96d9ba9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.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.inc2
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index c7e1e63573..4510ae3e95 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
8DEPENDS = "expat virtual/libintl" 8DEPENDS = "expat virtual/libintl"
9RDEPENDS_dbus_class-native = "" 9RDEPENDS_dbus_class-native = ""
10RDEPENDS_dbus_class-nativesdk = "" 10RDEPENDS_dbus_class-nativesdk = ""
11PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}" 11PACKAGES += "${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus-ptest', '', d)}"
12ALLOW_EMPTY_dbus-ptest = "1" 12ALLOW_EMPTY_dbus-ptest = "1"
13RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" 13RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest"
14 14
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 4d2726287c..65c83e9e55 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -31,7 +31,7 @@ S = "${WORKDIR}/glib-${PV}"
31 31
32CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" 32CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
33 33
34PTEST_CONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" 34PTEST_CONF = "${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-installed-tests', '--disable-installed-tests', d)}"
35EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" 35EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"
36EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" 36EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
37EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" 37EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu"