Re: [backport to Daisy] dbus: fix a hard dependency about dbus-ptest

[Javier Viguera <javier.viguera@digi.com>]

[-- Attachment #1: Type: text/plain, Size: 1068 bytes --]

Hi Ross,

On 16/06/14 15:31, Burton, Ross wrote:
> If you'd be willing to backport the patch, verify that it works, and
> send it to the list, then that would be much appreciated and speed
> integration.

Attached the obvious cherry-pick of the commit from *master* with a 
basic conflict solved. But I don't think this is acceptable in an 
already-released stable branch "Daisy" as it involves a recipe rename 
(dbus-ptest_1.6.18.bb => dbus-test_1.6.18.bb) that probably will break 
the projects of current users of yocto Daisy.

Instead, would a basic change like the following be enough?:

-RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 
'dbus-ptest-ptest', '', d)}"
+RDEPENDS_dbus = "${@base_contains('PTEST_ENABLED', '1', 
'dbus-ptest-ptest', '', d)}"

This does not change any recipe name so it seems suitable for a bug-fix 
only branch but unfortunately this goes beyond my skills in Yocto and 
ptest framework so any advise would be appreciated.

-
Javier Viguera
Software Engineer
Digi International® Spain S.A.U.

[-- Attachment #2: 0001-dbus-fix-a-hard-dependency-about-dbus-ptest.patch --]
[-- Type: text/x-diff, Size: 2240 bytes --]

From 1395fc67a29b568daae191cc69089bed5124f311 Mon Sep 17 00:00:00 2001
From: Chong Lu <Chong.Lu@windriver.com>
Date: Tue, 8 Apr 2014 11:30:56 +0800
Subject: [PATCH] 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>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>

Conflicts:
	meta/recipes-core/dbus/dbus.inc
---
 meta/recipes-core/dbus/{dbus-ptest_1.6.18.bb => dbus-test_1.6.18.bb} | 0
 meta/recipes-core/dbus/dbus.inc                                      | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename meta/recipes-core/dbus/{dbus-ptest_1.6.18.bb => dbus-test_1.6.18.bb} (100%)

diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb b/meta/recipes-core/dbus/dbus-test_1.6.18.bb
similarity index 100%
rename from meta/recipes-core/dbus/dbus-ptest_1.6.18.bb
rename to 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 5727ae77b223..9a9a00af371a 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 += "${@base_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 \