diff options
-rw-r--r-- | meta/classes/ptest.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass index c96e74fd9e..4e6f075efe 100644 --- a/meta/classes/ptest.bbclass +++ b/meta/classes/ptest.bbclass | |||
@@ -13,7 +13,7 @@ PTEST_ENABLED_class-cross-canadian = "" | |||
13 | RDEPENDS_${PN}-ptest_class-native = "" | 13 | RDEPENDS_${PN}-ptest_class-native = "" |
14 | RDEPENDS_${PN}-ptest_class-nativesdk = "" | 14 | RDEPENDS_${PN}-ptest_class-nativesdk = "" |
15 | 15 | ||
16 | PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" | 16 | PACKAGES =+ "${@bb.utils.contains('PTEST_ENABLED', '1', '${PN}-ptest', '', d)}" |
17 | 17 | ||
18 | do_configure_ptest() { | 18 | do_configure_ptest() { |
19 | : | 19 | : |
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 \ | |||
8 | DEPENDS = "expat virtual/libintl" | 8 | DEPENDS = "expat virtual/libintl" |
9 | RDEPENDS_dbus_class-native = "" | 9 | RDEPENDS_dbus_class-native = "" |
10 | RDEPENDS_dbus_class-nativesdk = "" | 10 | RDEPENDS_dbus_class-nativesdk = "" |
11 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}" | 11 | PACKAGES += "${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus-ptest', '', d)}" |
12 | ALLOW_EMPTY_dbus-ptest = "1" | 12 | ALLOW_EMPTY_dbus-ptest = "1" |
13 | RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" | 13 | RDEPENDS_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 | ||
32 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" | 32 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" |
33 | 33 | ||
34 | PTEST_CONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" | 34 | PTEST_CONF = "${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-installed-tests', '--disable-installed-tests', d)}" |
35 | EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" | 35 | EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" |
36 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" | 36 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" |
37 | EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" | 37 | EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" |