Tidy up images and tasks in meta and meta-moblin.

meta now only contains images and tasks relating to core Poky and the Sato environment.
meta-moblin contains images and tasks for netbooks and the moblin environment.

Remove any duplicated tasks and images and rename images and tasks in meta-moblin.

9 files changed, 13 insertions, 95 deletions

diff --git a/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb b/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
index 1ab8163fc..4523196bf 100644
--- a/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
+++ b/meta-moblin/packages/tasks/task-moblin-apps-x11-pimlico.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 DESCRIPTION = "X11 Pimlico Appications List"
diff --git a/meta-moblin/packages/tasks/task-moblin-boot.bb b/meta-moblin/packages/tasks/task-moblin-boot.bb
index a5b78fcf8..015b94bba 100644
--- a/meta-moblin/packages/tasks/task-moblin-boot.bb
+++ b/meta-moblin/packages/tasks/task-moblin-boot.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 DESCRIPTION = "Task for Moblin - minimal bootable image"
diff --git a/meta-moblin/packages/tasks/task-moblin-sdk.bb b/meta-moblin/packages/tasks/task-moblin-sdk.bb
index 84bb71a84..4b6030e2a 100644
--- a/meta-moblin/packages/tasks/task-moblin-sdk.bb
+++ b/meta-moblin/packages/tasks/task-moblin-sdk.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 DESCRIPTON = "Software Development Tasks for Moblin"
diff --git a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
index e9384f5ec..c9f118cdf 100644
--- a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
+++ b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
@@ -1,4 +1,8 @@
-DESCRIPTION = "Target packages for the standalone SDK"
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
+DESCRIPTION = "Target packages for the standalone Moblin SDK"
 PR = "r4"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
diff --git a/meta-moblin/packages/tasks/task-moblin-tools-bb b/meta-moblin/packages/tasks/task-moblin-tools-bb
index 6d5e60cbb..214db3c49 100644
--- a/meta-moblin/packages/tasks/task-moblin-tools-bb
+++ b/meta-moblin/packages/tasks/task-moblin-tools-bb
@@ -1,8 +1,8 @@
 #
-# Copyright (C) 2008 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
-DESCRIPTION = "Tools tasks for Moblin"
+DESCRIPTION = "Debuggin and profiling tools tasks for Moblin"
 PR = "r1"
 
 PACKAGES = "\
diff --git a/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb b/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb
index 90ee0d1ac..b8fa1e344 100644
--- a/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb
+++ b/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb
@@ -1,8 +1,8 @@
 #
-# Copyright (C) 2008 Intel.
+# Copyright (C) 2008 Intel Corporation.
 #
 
-DESCRIPTION = "Netbook Tasks for Moblin"
+DESCRIPTION = "Netbook GUI Tasks for Moblin"
 PR = "r0"
 
 PACKAGES = "\
diff --git a/meta-moblin/packages/tasks/task-moblin-x11-sato.bb b/meta-moblin/packages/tasks/task-moblin-x11-sato.bb
deleted file mode 100644
index 6ae3bc07c..000000000
--- a/meta-moblin/packages/tasks/task-moblin-x11-sato.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenedHand Ltd.
-#
-
-DESCRIPTION = "Sato Tasks for Moblin"
-PR = "r29"
-
-PACKAGES = "\
-    task-moblin-x11-sato \
-    task-moblin-x11-sato-dbg \
-    task-moblin-x11-sato-dev \
-    "
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-
-NETWORK_MANAGER ?= "networkmanager-applet"
-RDEPENDS_task-moblin-x11-sato = "\
-    matchbox-desktop \
-    matchbox-session-sato \
-    matchbox-keyboard \
-    matchbox-stroke \
-    matchbox-config-gtk \
-    xcursor-transparent-theme \
-    sato-icon-theme \
-    settings-daemon \
-    gtk-sato-engine \
-    ${NETWORK_MANAGER}"
diff --git a/meta-moblin/packages/tasks/task-moblin.bb b/meta-moblin/packages/tasks/task-moblin.bb
index cb9f0c34c..9b34d9999 100644
--- a/meta-moblin/packages/tasks/task-moblin.bb
+++ b/meta-moblin/packages/tasks/task-moblin.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 DESCRIPTION = "Tasks for Moblin"
diff --git a/meta-moblin/packages/tasks/tasks-moblin-tools.bb b/meta-moblin/packages/tasks/tasks-moblin-tools.bb
deleted file mode 100644
index 33dad20d8..000000000
--- a/meta-moblin/packages/tasks/tasks-moblin-tools.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2008 OpenedHand Ltd.
-#
-
-DESCRIPTION = "Tools tasks for Moblin"
-PR = "r1"
-
-PACKAGES = "\
-    task-moblin-tools-debug \
-    task-moblin-tools-debug-dbg \
-    task-moblin-tools-debug-dev \
-    task-moblin-tools-profile \
-    task-moblin-tools-profile-dbg \
-    task-moblin-tools-profile-dev \
-    task-moblin-tools-testapps \
-    task-moblin-tools-testapps-dbg \
-    task-moblin-tools-testapps-dev \
-    "
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-
-RDEPENDS_task-moblin-tools-debug = "\
-    gdb \
-    gdbserver \
-    strace"
-
-RDEPENDS_task-moblin-tools-profile = "\
-    exmap-console \
-    exmap-server \
-    oprofile \
-    oprofileui-server \
-    powertop \
-    lttng-control \
-    lttng-viewer"
-
-RDEPENDS_task-moblin-tools-profile_qemux86 += "valgrind"
-
-RRECOMMENDS_task-moblin-tools-profile = "\
-    kernel-module-oprofile"
-
-RDEPENDS_task-moblin-tools-testapps = "\
-    blktool \
-    tslib-calibrate \
-    tslib-tests \
-    lrzsz \
-    kexec-tools \
-    alsa-utils-amixer \
-    alsa-utils-aplay \
-    owl-video \
-    gst-meta-video \
-    gst-meta-audio \
-    xrestop \
-    xwininfo \
-    xprop \
-    xvideo-tests"