From cf9e6b299aaae23f459d1887e9acf721c0b3f9a4 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 13 Jun 2011 14:34:31 +0100
Subject: task-sdk-host: Add nativesdk to the task name so its clearer what the
 contents of the task represent

This is particularly important since the file doens't use BBCLASSEXTEND
and PN is therefore misleading

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/populate_sdk.bbclass                  |  2 +-
 meta/recipes-core/tasks/task-sdk-host-nativesdk.bb | 33 ++++++++++++++++++++++
 meta/recipes-core/tasks/task-sdk-host.bb           | 33 ----------------------
 meta/recipes-qt/meta/meta-toolchain-qte.bb         |  2 +-
 .../tasks/task-qte-toolchain-host-nativesdk.bb     |  7 +++++
 meta/recipes-qt/tasks/task-qte-toolchain-host.bb   |  7 -----
 6 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 meta/recipes-core/tasks/task-sdk-host-nativesdk.bb
 delete mode 100644 meta/recipes-core/tasks/task-sdk-host.bb
 create mode 100644 meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb
 delete mode 100644 meta/recipes-qt/tasks/task-qte-toolchain-host.bb

(limited to 'meta')

diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass
index 413eb52ac..089ed9ab3 100644
--- a/meta/classes/populate_sdk.bbclass
+++ b/meta/classes/populate_sdk.bbclass
@@ -7,7 +7,7 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 
 SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}"
 
-TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
 TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
 
diff --git a/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb b/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb
new file mode 100644
index 000000000..5ec40b140
--- /dev/null
+++ b/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb
@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd
+#
+
+DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
+PR = "r10"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit nativesdk
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+    pkgconfig-nativesdk \
+    qemu-nativesdk \
+    qemu-helper-nativesdk \
+    pseudo-nativesdk \
+    unfs-server-nativesdk \
+    opkg-nativesdk \
+    libtool-nativesdk \
+    "
+
+RDEPENDS_${PN}_darwin8 = "\
+    odcctools-cross-canadian \
+    llvm-cross-canadian \
+    pkgconfig-nativesdk \
+    opkg-nativesdk \
+    libtool-nativesdk \
+    "
diff --git a/meta/recipes-core/tasks/task-sdk-host.bb b/meta/recipes-core/tasks/task-sdk-host.bb
deleted file mode 100644
index 5ec40b140..000000000
--- a/meta/recipes-core/tasks/task-sdk-host.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd
-#
-
-DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
-PR = "r10"
-LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-inherit nativesdk
-
-PACKAGES = "${PN}"
-
-RDEPENDS_${PN} = "\
-    pkgconfig-nativesdk \
-    qemu-nativesdk \
-    qemu-helper-nativesdk \
-    pseudo-nativesdk \
-    unfs-server-nativesdk \
-    opkg-nativesdk \
-    libtool-nativesdk \
-    "
-
-RDEPENDS_${PN}_darwin8 = "\
-    odcctools-cross-canadian \
-    llvm-cross-canadian \
-    pkgconfig-nativesdk \
-    opkg-nativesdk \
-    libtool-nativesdk \
-    "
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index 72fa702c7..72d58db5e 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -1,6 +1,6 @@
 # Qt Embedded toolchain
 PR = "r5"
-TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target"
 TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}"
 
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb b/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb
new file mode 100644
index 000000000..cfa45ef93
--- /dev/null
+++ b/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb
@@ -0,0 +1,7 @@
+require recipes-core/tasks/task-sdk-host-nativesdk.bb
+
+DESCRIPTION = "Host packages for Qt Embedded SDK"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS_${PN} += "qt4-tools-nativesdk"
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-host.bb b/meta/recipes-qt/tasks/task-qte-toolchain-host.bb
deleted file mode 100644
index 2ab6ccf6b..000000000
--- a/meta/recipes-qt/tasks/task-qte-toolchain-host.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require recipes-core/tasks/task-sdk-host.bb
-
-DESCRIPTION = "Host packages for Qt Embedded SDK"
-LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-
-RDEPENDS_${PN} += "qt4-tools-nativesdk"
-- 
cgit v1.2.3