From 13d967d68bb2f01119d1b14a98b89a98fc3ee6ef Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 20 Apr 2011 10:44:52 +0800 Subject: task-poky-tools.bb, task-sdk-gmae.inc: enable lttng-ust for ARM lttng-ust can build on ARM from 0.12 on. Merged with rebranding Fixes [YOCTO #856] Signed-off-by: Dexuan Cui Signed-off-by: Saul Wold --- meta/recipes-core/tasks/task-core-tools.bb | 8 ++++---- meta/recipes-gnome/tasks/task-core-sdk-gmae.bb | 4 ++-- meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb | 4 ++-- meta/recipes-gnome/tasks/task-sdk-gmae.inc | 1 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb index 958dff12a..9b2a4ce8e 100644 --- a/meta/recipes-core/tasks/task-core-tools.bb +++ b/meta/recipes-core/tasks/task-core-tools.bb @@ -2,11 +2,11 @@ # Copyright (C) 2008 OpenedHand Ltd. # -DESCRIPTION = "Tools tasks for Poky" +DESCRIPTION = "Tools tasks for OE-Core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r8" +PR = "r9" PACKAGES = "\ task-core-tools-debug \ @@ -57,9 +57,9 @@ RRECOMMENDS_task-core-tools-profile = "\ # exmap-server # At present we only build lttng-ust on -# qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu +# qemux86/qemux86-64/qemuppc/qemuarm/emenlow/atom-pc since upstream liburcu # (which is required by lttng-ust) may not build on other platforms, like -# MIPS and qemu ARMv5te that poky uses now. +# MIPS. RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap" RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap" RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap" diff --git a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb index 6cb14107d..d56aa07bb 100644 --- a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb +++ b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb @@ -2,11 +2,11 @@ # Copyright (C) 2007 OpenedHand Ltd. # -DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky" +DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r10" +PR = "r11" ALLOW_EMPTY = "1" diff --git a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb index 32e60a858..42d41482e 100644 --- a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb +++ b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb @@ -2,11 +2,11 @@ # Copyright (C) 2007 OpenedHand Ltd. # -DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky" +DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r12" +PR = "r13" ALLOW_EMPTY = "1" diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/tasks/task-sdk-gmae.inc index 0ab0b6ede..2071089f2 100644 --- a/meta/recipes-gnome/tasks/task-sdk-gmae.inc +++ b/meta/recipes-gnome/tasks/task-sdk-gmae.inc @@ -35,5 +35,6 @@ 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" SDK-EXTRAS_emenlow ?= " lttng-ust-dev" SDK-EXTRAS_atom-pc ?= " lttng-ust-dev" -- cgit v1.2.3