* [PATCH V4 0/1] dbus: fix a hard dependency about dbus-ptest
@ 2014-04-08 3:30 Chong Lu
2014-04-08 3:30 ` [PATCH V4 1/1] " Chong Lu
2014-06-16 12:04 ` [backport to Daisy] " Javier Viguera
0 siblings, 2 replies; 10+ messages in thread
From: Chong Lu @ 2014-04-08 3:30 UTC (permalink / raw)
To: openembedded-core
Changes since V3:
Add class-target suffix to RDEPENDS_dbus-ptest.
The following changes since commit bb66113bde5361b869dce2bdaece5b938f077ea8:
bitbake: fetch2: Fix bug in file checksum generation (2014-04-06 11:31:26 +0100)
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 | 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%)
--
1.8.1.2
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH V4 1/1] dbus: fix a hard dependency about dbus-ptest 2014-04-08 3:30 [PATCH V4 0/1] dbus: fix a hard dependency about dbus-ptest Chong Lu @ 2014-04-08 3:30 ` Chong Lu 2014-04-14 2:00 ` Chong Lu 2014-06-16 12:04 ` [backport to Daisy] " Javier Viguera 1 sibling, 1 reply; 10+ messages in thread From: Chong Lu @ 2014-04-08 3:30 UTC (permalink / raw) To: openembedded-core 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] Signed-off-by: Chong Lu <Chong.Lu@windriver.com> --- 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 5727ae7..9a9a00a 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 \ -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH V4 1/1] dbus: fix a hard dependency about dbus-ptest 2014-04-08 3:30 ` [PATCH V4 1/1] " Chong Lu @ 2014-04-14 2:00 ` Chong Lu 0 siblings, 0 replies; 10+ messages in thread From: Chong Lu @ 2014-04-14 2:00 UTC (permalink / raw) To: openembedded-core ping On 04/08/2014 11:30 AM, Chong Lu wrote: > 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] > > Signed-off-by: Chong Lu <Chong.Lu@windriver.com> > --- > 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 5727ae7..9a9a00a 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 \ ^ permalink raw reply [flat|nested] 10+ messages in thread
* [backport to Daisy] dbus: fix a hard dependency about dbus-ptest 2014-04-08 3:30 [PATCH V4 0/1] dbus: fix a hard dependency about dbus-ptest Chong Lu 2014-04-08 3:30 ` [PATCH V4 1/1] " Chong Lu @ 2014-06-16 12:04 ` Javier Viguera 2014-06-16 13:31 ` Burton, Ross 1 sibling, 1 reply; 10+ messages in thread From: Javier Viguera @ 2014-06-16 12:04 UTC (permalink / raw) To: openembedded-core@lists.openembedded.org Hi all, I see this was finally included in oe-core *master*, but the problem is still affecting Daisy. Creating a basic command-line image with dbus pulls in the dbus-ptest-ptest package (37MB installed): # du -sh /usr/lib/dbus-ptest/ptest 37.6M /usr/lib/dbus-ptest/ptest Could the fix be backported to Daisy? - Thanks, Javier Viguera Software Engineer Digi International® Spain S.A.U. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [backport to Daisy] dbus: fix a hard dependency about dbus-ptest 2014-06-16 12:04 ` [backport to Daisy] " Javier Viguera @ 2014-06-16 13:31 ` Burton, Ross 2014-06-16 15:10 ` Javier Viguera 0 siblings, 1 reply; 10+ messages in thread From: Burton, Ross @ 2014-06-16 13:31 UTC (permalink / raw) To: Javier Viguera; +Cc: openembedded-core@lists.openembedded.org 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. Ross On 16 June 2014 13:04, Javier Viguera <javier.viguera@digi.com> wrote: > Hi all, > > I see this was finally included in oe-core *master*, but the problem is > still affecting Daisy. > > Creating a basic command-line image with dbus pulls in the dbus-ptest-ptest > package (37MB installed): > > # du -sh /usr/lib/dbus-ptest/ptest > 37.6M /usr/lib/dbus-ptest/ptest > > Could the fix be backported to Daisy? > > - > Thanks, > > Javier Viguera > Software Engineer > Digi International® Spain S.A.U. > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [backport to Daisy] dbus: fix a hard dependency about dbus-ptest 2014-06-16 13:31 ` Burton, Ross @ 2014-06-16 15:10 ` Javier Viguera 2014-06-16 15:12 ` Burton, Ross 2014-06-16 16:36 ` Burton, Ross 0 siblings, 2 replies; 10+ messages in thread From: Javier Viguera @ 2014-06-16 15:10 UTC (permalink / raw) To: Burton, Ross, openembedded-core@lists.openembedded.org [-- 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 \ ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [backport to Daisy] dbus: fix a hard dependency about dbus-ptest 2014-06-16 15:10 ` Javier Viguera @ 2014-06-16 15:12 ` Burton, Ross 2014-06-16 16:36 ` Burton, Ross 1 sibling, 0 replies; 10+ messages in thread From: Burton, Ross @ 2014-06-16 15:12 UTC (permalink / raw) To: Javier Viguera; +Cc: openembedded-core@lists.openembedded.org 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. > > 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. That change doesn't solve your problem, so no. I'm not the daisy maintainer but I can see a good argument for merging the change even with the rename. Ross ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [backport to Daisy] dbus: fix a hard dependency about dbus-ptest 2014-06-16 15:10 ` Javier Viguera 2014-06-16 15:12 ` Burton, Ross @ 2014-06-16 16:36 ` Burton, Ross 2014-06-17 7:52 ` Richard Purdie 1 sibling, 1 reply; 10+ messages in thread From: Burton, Ross @ 2014-06-16 16:36 UTC (permalink / raw) To: Javier Viguera; +Cc: openembedded-core@lists.openembedded.org 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [backport to Daisy] dbus: fix a hard dependency about dbus-ptest 2014-06-16 16:36 ` Burton, Ross @ 2014-06-17 7:52 ` Richard Purdie 2014-06-17 9:43 ` Viguera, Javier 0 siblings, 1 reply; 10+ messages in thread From: Richard Purdie @ 2014-06-17 7:52 UTC (permalink / raw) To: Burton, Ross; +Cc: Javier Viguera, openembedded-core@lists.openembedded.org 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [backport to Daisy] dbus: fix a hard dependency about dbus-ptest 2014-06-17 7:52 ` Richard Purdie @ 2014-06-17 9:43 ` Viguera, Javier 0 siblings, 0 replies; 10+ messages in thread From: Viguera, Javier @ 2014-06-17 9:43 UTC (permalink / raw) To: 'Richard Purdie', 'Burton, Ross' Cc: 'openembedded-core@lists.openembedded.org' 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-06-17 9:50 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-04-08 3:30 [PATCH V4 0/1] dbus: fix a hard dependency about dbus-ptest Chong Lu 2014-04-08 3:30 ` [PATCH V4 1/1] " Chong Lu 2014-04-14 2:00 ` Chong Lu 2014-06-16 12:04 ` [backport to Daisy] " Javier Viguera 2014-06-16 13:31 ` Burton, Ross 2014-06-16 15:10 ` Javier Viguera 2014-06-16 15:12 ` Burton, Ross 2014-06-16 16:36 ` Burton, Ross 2014-06-17 7:52 ` Richard Purdie 2014-06-17 9:43 ` Viguera, Javier
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.