diff options
| author |   Chong Lu <Chong.Lu@windriver.com> | 2014-04-08 11:30:56 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-16 14:50:12 +0100 |
| commit | d865612c7c1aaccb9f4c65224c9e4c888876fe92 (patch) | |
| tree | 070c195bf9b08e4f04b31283ddcc048de1ca5fe6 /meta/recipes-core | |
| parent | d28b21e01fbc4b780d14495894c4253d422cd9d9 (diff) | |
| download | openembedded-core-d865612c7c1aaccb9f4c65224c9e4c888876fe92.tar.gz | |
dbus: fix a hard dependency about dbus-ptest
If image contains dbus and ptest is in DISTRO_FEATURES, dbus-ptest package
is installed, regardless of whether ptest-pkgs is in IMAGE_FEATURES. This
issue will increase size for most small images.
This patch fixes this problem.
[YOCTO #5702]
(From OE-Core rev: 0416583f014138656babdf78a574357ae5ff25bd)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
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-test_1.6.18.bb (renamed from meta/recipes-core/dbus/dbus-ptest_1.6.18.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb b/meta/recipes-core/dbus/dbus-test_1.6.18.bb index bc260defe0..bc260defe0 100644 --- a/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb +++ b/meta/recipes-core/dbus/dbus-test_1.6.18.bb diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 5727ae77b2..8c456f8411 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -6,9 +6,11 @@ LICENSE = "AFL-2 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" DEPENDS = "expat virtual/libintl" -RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" RDEPENDS_dbus_class-native = "" RDEPENDS_dbus_class-nativesdk = "" +PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}" +ALLOW_EMPTY_dbus-ptest = "1" +RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch \ |