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

login
register
mail settings
Submitter Javier Viguera
Date June 16, 2014, 3:10 p.m.
Message ID <539F08D0.7060602@digi.com>
Download mbox | patch
Permalink /patch/73885/
State New
Headers show

Comments

Javier Viguera - June 16, 2014, 3:10 p.m.
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.
Ross Burton - June 16, 2014, 4:36 p.m.
On 16 June 2014 16:10, Javier Viguera <javier.viguera@digi.com> wrote:
> 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.

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

This was changed in master to use PTEST_ENABLED:

PACKAGES += "${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus-ptest', '', d)}"

If you could compare dbus.inc in this patch with master to ensure that
there's nothing else that should be merged that would be great.  Also
remove the Conflicts line from the message.

Ross
Richard Purdie - June 17, 2014, 7:52 a.m.
On Mon, 2014-06-16 at 17:36 +0100, Burton, Ross wrote:
> On 16 June 2014 16:10, Javier Viguera <javier.viguera@digi.com> wrote:
> > 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.
> 
> +PACKAGES += "${@base_contains('DISTRO_FEATURES', 'ptest',
> 'dbus-ptest', '', d)}"
> 
> This was changed in master to use PTEST_ENABLED:
> 
> PACKAGES += "${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus-ptest', '', d)}"
> 
> If you could compare dbus.inc in this patch with master to ensure that
> there's nothing else that should be merged that would be great.  Also
> remove the Conflicts line from the message.

For what its worth I've pulled the two patches we need into the daisy
branch for this. I'd appreciate someone confirming it does the right
thing though.

Cheers,

Richard
Javier Viguera - June 17, 2014, 9:43 a.m.
Hi Richard,

> -----Original Message-----
> From: Richard Purdie [mailto:richard.purdie@linuxfoundation.org]
> 
> For what its worth I've pulled the two patches we need into the daisy
> branch for this. I'd appreciate someone confirming it does the right
> thing though.

I've just made a basic test and at least the dbus-ptest issue is solved for me. The package was removed from the rootfs image and the overall size went down in about ~38MB, so yeah I'm happy with that.

Thanks,

Javier Viguera

Patch

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 \