MACHINE overrides in meta/recipes-gnome/tasks/task-sdk-gmae.inc

MACHINE overrides in meta/recipes-gnome/tasks/task-sdk-gmae.inc

[Martin Jansa]

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

Hi,

task-sdk-gmae.inc has couple of MACHINE overrides
SDK-EXTRAS ?= ""
SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev"
SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev"
SDK-EXTRAS_qemuppc ?= " lttng-ust-dev"
SDK-EXTRAS_qemuarm ?= " lttng-ust-dev"

but
meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
meta/recipes-gnome/tasks/task-core-sdk-gmae.bb

don't set PACKAGE_ARCH to MACHINE_ARCH, so those those SDK-EXTRAS
overrides should be changed to TARGET_ARCH overrides or add them for all
and exlude only arch which doesn't support valgrind || lttng-ust (seems
like only mips is missing from supported archs).

It also makes meta-toolchain-gmae-1.0-r6.do_populate_sdk.sigdata machine specific:

OE qemux86-64copy@ ~/oe-core $ bitbake-diffsigs stamps.dir.qemux86-64/x86_64-oe-linux/meta-toolchain-gmae-1.0-r6.do_populate_sdk.sigdata.fc96d8788ee32af391fbb4dc4dfa3928 stamps.dir.qemux86-64copy/x86_64-oe-linux/meta-toolchain-gmae-1.0-r6.do_populate_sdk.sigdata.f84bb156663caf2f71645227179d424d
basehash changed from 8bf3e5df1a9bf2efd8c0c698d44f9e30 to 37f334758d4f818e858387d110a1c7b7
Variable TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value changed from /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/share/x86_64-oe-linux_config_site.d to /OE/oe-core/tmp-eglibc/sysroots/qemux86-64copy/usr/share/x86_64-oe-linux_config_site.d
Variable TIME value changed from 084543 to 085638
Dependency on task linux-yocto_3.2.bb.do_package_write was added with hash 15cf120732c6515987793e39c29cb7f2
Dependency on task bzip2_1.0.6.bb.do_package_write was added with hash 63299b3c095759819803e3b60c1cd4bd
Dependency on task update-modules_1.0.bb.do_package_write was added with hash 266fe284dfd606af98605bcff02f06d8
Dependency on task elfutils_0.148.bb.do_package_write was added with hash 31516d4ca2606a60f23b8a38de93d88d
Dependency on task binutils_2.22.bb.do_package_write was added with hash 91222ff473a45a15187bfcedff21288d
Dependency on task module-init-tools_3.16.bb.do_package_write was added with hash 3485d645a9458516601e0c91dfd130d5
Dependency on task lttng-ust_1.9.4.bb.do_package_write was added with hash cd40a9f559d53c8bf874d69bb62482cf
Dependency on task liburcu_0.6.7.bb.do_package_write was added with hash 22805959bb795b93fcfc87428f1164fe
Hash for dependent task gstreamer_0.10.35.bb.do_package_write changed from 14dfff89952fba8f744946fc815931eb to 161c80d99567099d372247d584778df1
Hash for dependent task task-core-standalone-gmae-sdk-target.bb.do_package_write changed from e8ed16a445ff08d391380d4ed7f06ea5 to aa427a924b50e0a09ec14124cfac02a6
Hash for dependent task meta-environment.bb.do_package_write changed from d78bee1dbc70cb372a6cf4f07b254391 to a3c3dd9dde1635a7e74a04c687387238
Hash for dependent task task-cross-canadian.bb.do_package_write changed from c245cbf31a79c3983198ac73a70988b2 to 425abc28049ab1e5653c680141db7d8e

I'll send patch excluding meta-environment.bb.

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

[PATCH] layer.conf: exclude meta-environment with SIGGEN_EXCLUDERECIPES_ABISAFE

[Martin Jansa]

* it's machine specific and depends on TIME
  basehash changed from 30e97f9eeed1df8488b62b4fb47a3a0c to 72ea9a277e6599ae9052b169b9a94f1b
  Variable TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value changed from
  /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/share/x86_64-oe-linux_config_site.d
  to
  /OE/oe-core/tmp-eglibc/sysroots/qemux86-64copy/usr/share/x86_64-oe-linux_config_site.d
  Variable TIME value changed from 084543 to 085638
* causes task-cross-canadian to be also machine specific

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/conf/layer.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 76ae58c..87208fa 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -28,4 +28,5 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   pointercal \
   base-files \
   keymaps \
+  meta-environment \
 "
-- 
1.7.8.5

Re: MACHINE overrides in meta/recipes-gnome/tasks/task-sdk-gmae.inc

[Martin Jansa]

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

On Wed, Feb 29, 2012 at 11:45:08AM +0100, Martin Jansa wrote:
> Hi,
> 
> task-sdk-gmae.inc has couple of MACHINE overrides
> SDK-EXTRAS ?= ""
> SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev"
> SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev"
> SDK-EXTRAS_qemuppc ?= " lttng-ust-dev"
> SDK-EXTRAS_qemuarm ?= " lttng-ust-dev"
> 
> but
> meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
> meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
> 
> don't set PACKAGE_ARCH to MACHINE_ARCH, so those those SDK-EXTRAS
> overrides should be changed to TARGET_ARCH overrides or add them for all
> and exlude only arch which doesn't support valgrind || lttng-ust (seems
> like only mips is missing from supported archs).
> 
> It also makes meta-toolchain-gmae-1.0-r6.do_populate_sdk.sigdata machine specific:
> 
> OE qemux86-64copy@ ~/oe-core $ bitbake-diffsigs stamps.dir.qemux86-64/x86_64-oe-linux/meta-toolchain-gmae-1.0-r6.do_populate_sdk.sigdata.fc96d8788ee32af391fbb4dc4dfa3928 stamps.dir.qemux86-64copy/x86_64-oe-linux/meta-toolchain-gmae-1.0-r6.do_populate_sdk.sigdata.f84bb156663caf2f71645227179d424d
> basehash changed from 8bf3e5df1a9bf2efd8c0c698d44f9e30 to 37f334758d4f818e858387d110a1c7b7
> Variable TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value changed from /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/share/x86_64-oe-linux_config_site.d to /OE/oe-core/tmp-eglibc/sysroots/qemux86-64copy/usr/share/x86_64-oe-linux_config_site.d
> Variable TIME value changed from 084543 to 085638
> Dependency on task linux-yocto_3.2.bb.do_package_write was added with hash 15cf120732c6515987793e39c29cb7f2
> Dependency on task bzip2_1.0.6.bb.do_package_write was added with hash 63299b3c095759819803e3b60c1cd4bd
> Dependency on task update-modules_1.0.bb.do_package_write was added with hash 266fe284dfd606af98605bcff02f06d8
> Dependency on task elfutils_0.148.bb.do_package_write was added with hash 31516d4ca2606a60f23b8a38de93d88d
> Dependency on task binutils_2.22.bb.do_package_write was added with hash 91222ff473a45a15187bfcedff21288d
> Dependency on task module-init-tools_3.16.bb.do_package_write was added with hash 3485d645a9458516601e0c91dfd130d5
> Dependency on task lttng-ust_1.9.4.bb.do_package_write was added with hash cd40a9f559d53c8bf874d69bb62482cf
> Dependency on task liburcu_0.6.7.bb.do_package_write was added with hash 22805959bb795b93fcfc87428f1164fe
> Hash for dependent task gstreamer_0.10.35.bb.do_package_write changed from 14dfff89952fba8f744946fc815931eb to 161c80d99567099d372247d584778df1
> Hash for dependent task task-core-standalone-gmae-sdk-target.bb.do_package_write changed from e8ed16a445ff08d391380d4ed7f06ea5 to aa427a924b50e0a09ec14124cfac02a6
> Hash for dependent task meta-environment.bb.do_package_write changed from d78bee1dbc70cb372a6cf4f07b254391 to a3c3dd9dde1635a7e74a04c687387238
> Hash for dependent task task-cross-canadian.bb.do_package_write changed from c245cbf31a79c3983198ac73a70988b2 to 425abc28049ab1e5653c680141db7d8e
> 
> I'll send patch excluding meta-environment.bb.
> 
> Cheers,

Also for some reason runtime deps weren't properly mangled (while using debian.bbclass)

| Configuring task-core-standalone-gmae-sdk-target-dbg.
| Collected errors:
|  * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-core-standalone-gmae-sdk-target:
|  *    telepathy-glib (= 0.17.4-r1) *  libgalago *     gupnp-av *      telepathy-glib *        libart-lgpl *   libtelepathy *
|  * opkg_install_cmd: Cannot install package task-core-standalone-gmae-sdk-target.


Package: task-core-standalone-gmae-sdk-target
Version: 1.0-r13
Depends: telepathy-mission-control, gstreamer-dev, bluez4-dev, telepathy-glib-dev, libgalago, libgypsy0, pulseaudio, gupnp-av, libecal-1.2-dev, telepathy-python, gnome-desktop, task-core-standalone-sdk-target, telepathy-glib, libgupnp-1.0-3, libart-lgpl, dbus-dev, gupnp-tools, libglade-2.0-dev, gconf-dev, libsqlite3-dev, libxi-dev, libtelepathy, libdbus-glib-1-dev, eds-dbus-dev, libgssdp-1.0-2, libebook-1.2-dev, telepathy-idle, avahi-dev, gtk+-dev, galago-daemon
Section: base
Architecture: armv7a-vfp-neon

while correct names are:
telepathy-glib -> libtelepathy-glib0
libgalago -> libgalago3
gupnp-av -> libgupnp-av-1.0-2
libart-lgpl -> libart-lgpl-2-2
libtelepathy -> libtelepathy2

Anyone seen this?

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] layer.conf: exclude meta-environment with SIGGEN_EXCLUDERECIPES_ABISAFE

[Richard Purdie]

On Wed, 2012-02-29 at 11:47 +0100, Martin Jansa wrote:
> * it's machine specific and depends on TIME
>   basehash changed from 30e97f9eeed1df8488b62b4fb47a3a0c to 72ea9a277e6599ae9052b169b9a94f1b
>   Variable TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value changed from
>   /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/share/x86_64-oe-linux_config_site.d
>   to
>   /OE/oe-core/tmp-eglibc/sysroots/qemux86-64copy/usr/share/x86_64-oe-linux_config_site.d
>   Variable TIME value changed from 084543 to 085638
> * causes task-cross-canadian to be also machine specific

I think a better way to fix this might be:

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 6fc9c13..6ca85d9 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -127,6 +127,8 @@ toolchain_create_sdk_siteconfig () {
                fi
        done
 }
+# The immediate expansion above can result in unwanted path dependencies here
+toolchain_create_sdk_siteconfig[vardepsexclude] = "TOOLCHAIN_CONFIGSITE_SYSROOTCACHE"
 
 #This function create a version information file
 toolchain_create_sdk_version () {
@@ -138,6 +140,7 @@ toolchain_create_sdk_version () {
        echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile
        echo 'Timestamp: ${DATETIME}' >> $versionfile
 }
+toolchain_create_sdk_version[vardepsexclude] = "DATETIME"
 
 python __anonymous () {
     deps = d.getVarFlag('do_configure', 'depends') or ""

Cheers,

Richard

Re: [PATCH] layer.conf: exclude meta-environment with SIGGEN_EXCLUDERECIPES_ABISAFE

[Martin Jansa]

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

On Wed, Feb 29, 2012 at 01:24:12PM +0000, Richard Purdie wrote:
> On Wed, 2012-02-29 at 11:47 +0100, Martin Jansa wrote:
> > * it's machine specific and depends on TIME
> >   basehash changed from 30e97f9eeed1df8488b62b4fb47a3a0c to 72ea9a277e6599ae9052b169b9a94f1b
> >   Variable TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value changed from
> >   /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/share/x86_64-oe-linux_config_site.d
> >   to
> >   /OE/oe-core/tmp-eglibc/sysroots/qemux86-64copy/usr/share/x86_64-oe-linux_config_site.d
> >   Variable TIME value changed from 084543 to 085638
> > * causes task-cross-canadian to be also machine specific
> 
> I think a better way to fix this might be:

Agreed, please push your patch instead.

Cheers,

> 
> diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
> index 6fc9c13..6ca85d9 100644
> --- a/meta/classes/toolchain-scripts.bbclass
> +++ b/meta/classes/toolchain-scripts.bbclass
> @@ -127,6 +127,8 @@ toolchain_create_sdk_siteconfig () {
>                 fi
>         done
>  }
> +# The immediate expansion above can result in unwanted path dependencies here
> +toolchain_create_sdk_siteconfig[vardepsexclude] = "TOOLCHAIN_CONFIGSITE_SYSROOTCACHE"
>  
>  #This function create a version information file
>  toolchain_create_sdk_version () {
> @@ -138,6 +140,7 @@ toolchain_create_sdk_version () {
>         echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile
>         echo 'Timestamp: ${DATETIME}' >> $versionfile
>  }
> +toolchain_create_sdk_version[vardepsexclude] = "DATETIME"
>  
>  python __anonymous () {
>      deps = d.getVarFlag('do_configure', 'depends') or ""
> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] layer.conf: exclude meta-environment with SIGGEN_EXCLUDERECIPES_ABISAFE

[Richard Purdie]

On Fri, 2012-03-09 at 09:29 +0100, Martin Jansa wrote:
> On Wed, Feb 29, 2012 at 01:24:12PM +0000, Richard Purdie wrote:
> > On Wed, 2012-02-29 at 11:47 +0100, Martin Jansa wrote:
> > > * it's machine specific and depends on TIME
> > >   basehash changed from 30e97f9eeed1df8488b62b4fb47a3a0c to 72ea9a277e6599ae9052b169b9a94f1b
> > >   Variable TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value changed from
> > >   /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/share/x86_64-oe-linux_config_site.d
> > >   to
> > >   /OE/oe-core/tmp-eglibc/sysroots/qemux86-64copy/usr/share/x86_64-oe-linux_config_site.d
> > >   Variable TIME value changed from 084543 to 085638
> > > * causes task-cross-canadian to be also machine specific
> > 
> > I think a better way to fix this might be:
> 
> Agreed, please push your patch instead.

I already have :)

Cheers,

Richard