dbus: fix a hard dependency about dbus-ptest
v2 cover dbus: fix a hard dependency about dbus-ptest
Changes since V1:
It can't check IMAGE_FEATURES in a non-image recipe.
When ptest doesn't be included in DISTRO_FEATURES, we need RPROVIDES.
The following changes since commit 1f16ca9fba325f5ddbb1edad5bbad78d990de5e0:
bitbake: hob: sync after image deploy (2014-03-17 15:57:35 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib chonglu/dbus
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/dbus
Chong Lu (1):
dbus: fix a hard dependency about dbus-ptest
meta/recipes-core/dbus/{dbus-ptest_1.6.18.bb => dbus-test_1.6.18.bb} | 0
meta/recipes-core/dbus/dbus.inc | 5 ++++-
2 files changed, 4 insertions(+), 1 deletion(-)
rename meta/recipes-core/dbus/{dbus-ptest_1.6.18.bb => dbus-test_1.6.18.bb} (100%)Signature · 1 line
1.8.1.2
PATCH v2 1/1 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]
---
meta/recipes-core/dbus/{dbus-ptest_1.6.18.bb => dbus-test_1.6.18.bb} | 0
meta/recipes-core/dbus/dbus.inc | 5 ++++-
2 files changed, 4 insertions(+), 1 deletion(-)
rename meta/recipes-core/dbus/{dbus-ptest_1.6.18.bb => dbus-test_1.6.18.bb} (100%)meta/recipes-core/dbus/dbus-test_1.6.18.bb renamed from meta/recipes-core/dbus/dbus-ptest_1.6.18.bb +0 -0
meta/recipes-core/dbus/dbus.inc +4 -1
@@ -6,9 +6,12 @@ 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 += "dbus-ptest" +ALLOW_EMPTY_${PN}-ptest = "1" +RDEPENDS_dbus-ptest = "dbus-test-ptest" +RPROVIDES_dbus-ptest = "${@base_contains('DISTRO_FEATURES', 'ptest', '', 'dbus-test-ptest', d)}" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch \
Signature · 1 line
1.8.1.2
Quoted 1 line · Chong Lu
+PACKAGES += "dbus-ptest"
This should be conditional on DISTRO_FEATURES containing ptest.
meta/recipes-core/dbus/dbus.inc LICENSE = "AFL-2 | GPLv2+" · line 13
Quoted 2 lines
meta/recipes-core/dbus/dbus.inc +2
-0+ALLOW_EMPTY_${PN}-ptest = "1" +RDEPENDS_dbus-ptest = "dbus-test-ptest"
Please be consistent with the use of dbus-ptest and ${PN}-ptest.
Quoted 1 line
+RPROVIDES_dbus-ptest = "${@base_contains('DISTRO_FEATURES', 'ptest', '', 'dbus-test-ptest', d)}"
This line took me a minute to understand and won't be needed if the PACKAGES addition is conditional.
Ross
Quoted 10 lines · Ross
Quoted 1 line · Chong Lu
+PACKAGES += "dbus-ptest"
This should be conditional on
DISTRO_FEATUREScontaining ptest.meta/recipes-core/dbus/dbus.inc LICENSE = "AFL-2 | GPLv2+" · line 13
Quoted 2 lines
meta/recipes-core/dbus/dbus.inc +2
-0+ALLOW_EMPTY_${PN}-ptest = "1" +RDEPENDS_dbus-ptest = "dbus-test-ptest"Please be consistent with the use of dbus-ptest and ${PN}-ptest.
Quoted 5 lines
Quoted 2 lines
+RPROVIDES_dbus-ptest = "${@base_contains('DISTRO_FEATURES', 'ptest', '', 'dbus-test-ptest', d)}"
This line took me a minute to understand and won't be needed if the PACKAGES addition is conditional.
Right, agreed on all three.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre