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.

19 files changed, 51 insertions, 89 deletions

diff --git a/meta-moblin/packages/images/moblin-image-live.bb b/meta-moblin/packages/images/moblin-image-live.bb
index ff12fd4074..3fcfda7279 100644
--- a/meta-moblin/packages/images/moblin-image-live.bb
+++ b/meta-moblin/packages/images/moblin-image-live.bb
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
 DESCRIPTION = "Netbook Bootable Live Image"
 
 require moblin-image-live.inc
diff --git a/meta-moblin/packages/images/moblin-image-live.inc b/meta-moblin/packages/images/moblin-image-live.inc
index 2dd9a8917f..0f401091c1 100644
--- a/meta-moblin/packages/images/moblin-image-live.inc
+++ b/meta-moblin/packages/images/moblin-image-live.inc
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
 AUTO_SYSLINUXCFG = "1"
 INITRD = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-initramfs-${MACHINE}.cpio.gz"
 APPEND += "root=/dev/ram0 "
diff --git a/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb b/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
index 1626a40678..7331eff150 100644
--- a/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
+++ b/meta-moblin/packages/images/moblin-image-minimal-initramfs.bb
@@ -1,4 +1,8 @@
-# Simple initramfs image. Mostly used for live images.
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
+DESCRIPTION = "Simple initramfs image. Mostly used for live images."
 
 IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
 
diff --git a/meta-moblin/packages/images/moblin-image-minimal-live.bb b/meta-moblin/packages/images/moblin-image-minimal-live.bb
index 83dab3ecc3..b2c8ff60d2 100644
--- a/meta-moblin/packages/images/moblin-image-minimal-live.bb
+++ b/meta-moblin/packages/images/moblin-image-minimal-live.bb
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
 DESCRIPTION = "Minimal Bootable Live Image"
 
 require moblin-image-live.inc
diff --git a/meta-moblin/packages/images/moblin-image-minimal.bb b/meta-moblin/packages/images/moblin-image-minimal.bb
index 58100265d7..3178fff07f 100644
--- a/meta-moblin/packages/images/moblin-image-minimal.bb
+++ b/meta-moblin/packages/images/moblin-image-minimal.bb
@@ -1,6 +1,7 @@
 #
-# Copyright (C) 2007 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
+
 IMAGE_INSTALL = "task-moblin-boot ${ROOTFS_PKGMANAGE}"
 
 IMAGE_LINGUAS = " "
diff --git a/meta-moblin/packages/images/moblin-image-netbook-install.bb b/meta-moblin/packages/images/moblin-image-netbook-install.bb
new file mode 100644
index 0000000000..184a33cb65
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-netbook-install.bb
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
+DESCRIPTION = "Netbook Bootable Live Image"
+
+require moblin-image-live.inc
+
+LABELS += "install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
+
+do_bootimg[depends] += "moblin-image-netbook:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-netbook-live.bb b/meta-moblin/packages/images/moblin-image-netbook-live.bb
new file mode 100644
index 0000000000..3fcfda7279
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-netbook-live.bb
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
+DESCRIPTION = "Netbook Bootable Live Image"
+
+require moblin-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
+
+do_bootimg[depends] += "moblin-image-netbook:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-netbook.bb b/meta-moblin/packages/images/moblin-image-netbook.bb
index a573dbe83f..8cbcf2a5e2 100644
--- a/meta-moblin/packages/images/moblin-image-netbook.bb
+++ b/meta-moblin/packages/images/moblin-image-netbook.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
diff --git a/meta-moblin/packages/images/moblin-image-sato-live.bb b/meta-moblin/packages/images/moblin-image-sato-live.bb
deleted file mode 100644
index 81c07b7e50..0000000000
--- a/meta-moblin/packages/images/moblin-image-sato-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Sato Bootable Live Image"
-
-require moblin-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-sato-${MACHINE}.ext3"
-
-do_bootimg[depends] += "moblin-image-sato:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-sato.bb b/meta-moblin/packages/images/moblin-image-sato.bb
deleted file mode 100644
index 61f97334f7..0000000000
--- a/meta-moblin/packages/images/moblin-image-sato.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
-
-IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
-
-inherit moblin-image
diff --git a/meta-moblin/packages/images/moblin-image-sdk-live.bb b/meta-moblin/packages/images/moblin-image-sdk-live.bb
index 84cf107537..44d2cda950 100644
--- a/meta-moblin/packages/images/moblin-image-sdk-live.bb
+++ b/meta-moblin/packages/images/moblin-image-sdk-live.bb
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2008 Intel Corporation.
+#
+
 DESCRIPTION = "Bootable Live SDK Image"
 
 require moblin-image-live.inc
diff --git a/meta-moblin/packages/images/moblin-image-sdk.bb b/meta-moblin/packages/images/moblin-image-sdk.bb
index 0ec00f2574..6f42a33d6c 100644
--- a/meta-moblin/packages/images/moblin-image-sdk.bb
+++ b/meta-moblin/packages/images/moblin-image-sdk.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenedHand Ltd.
+# Copyright (C) 2008 Intel Corporation.
 #
 
 IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs dbg-pkgs"
diff --git a/meta-moblin/packages/images/poky-image-live.bb b/meta-moblin/packages/images/poky-image-live.bb
deleted file mode 100644
index a3bfbfc71f..0000000000
--- a/meta-moblin/packages/images/poky-image-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Netbook Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta-moblin/packages/images/poky-image-live.inc b/meta-moblin/packages/images/poky-image-live.inc
deleted file mode 100644
index 7f8dd8fba5..0000000000
--- a/meta-moblin/packages/images/poky-image-live.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-AUTO_SYSLINUXCFG = "1"
-INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz"
-APPEND += "root=/dev/ram0 "
-TIMEOUT = "10"
-
-EXCLUDE_FROM_WORLD = "1"
-
-do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs"
-
-inherit bootimg
-
-do_bootimg_prepend () {
-	import bb
-	fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
-	if 'ext3' not in fstypes:
-		bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
-}
-
diff --git a/meta-moblin/packages/images/poky-image-minimal-initramfs.bb b/meta-moblin/packages/images/poky-image-minimal-initramfs.bb
deleted file mode 100644
index b2824a7d61..0000000000
--- a/meta-moblin/packages/images/poky-image-minimal-initramfs.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Simple initramfs image. Mostly used for live images.
-
-IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
-
-export IMAGE_BASENAME = "poky-image-minimal-initramfs"
-IMAGE_LINGUAS = ""
-
-inherit poky-image
diff --git a/meta-moblin/packages/images/poky-image-minimal-live.bb b/meta-moblin/packages/images/poky-image-minimal-live.bb
deleted file mode 100644
index 7d9aa5f154..0000000000
--- a/meta-moblin/packages/images/poky-image-minimal-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Minimal Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-minimal:do_rootfs"
diff --git a/meta-moblin/packages/images/poky-image-netbook.bb b/meta-moblin/packages/images/poky-image-netbook.bb
deleted file mode 100644
index 8138e9d598..0000000000
--- a/meta-moblin/packages/images/poky-image-netbook.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
-
-IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
-
-inherit poky-image
diff --git a/meta-moblin/packages/images/poky-image-sato-live.bb b/meta-moblin/packages/images/poky-image-sato-live.bb
deleted file mode 100644
index 9b686e812c..0000000000
--- a/meta-moblin/packages/images/poky-image-sato-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Sato Bootable Live Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-sato:do_rootfs"
diff --git a/meta-moblin/packages/images/poky-image-sdk-live.bb b/meta-moblin/packages/images/poky-image-sdk-live.bb
deleted file mode 100644
index 807de392a3..0000000000
--- a/meta-moblin/packages/images/poky-image-sdk-live.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Bootable Live SDK Image"
-
-require poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sdk-${MACHINE}.ext3"
-
-do_bootimg[depends] += "poky-image-sdk:do_rootfs"