This email list is read-only. Emails sent to this list will be discarded
----------------------------------
meta-moblin/packages/images/moblin-image-live.bb | 4 ++
meta-moblin/packages/images/moblin-image-live.inc | 4 ++
.../images/moblin-image-minimal-initramfs.bb | 6 ++-
.../packages/images/moblin-image-minimal-live.bb | 4 ++
.../packages/images/moblin-image-minimal.bb | 3 +-
.../images/moblin-image-netbook-install.bb | 13 +++++
.../packages/images/moblin-image-netbook-live.bb | 13 +++++
.../packages/images/moblin-image-netbook.bb | 2 +-
.../packages/images/moblin-image-sato-live.bb | 9 ---
meta-moblin/packages/images/moblin-image-sato.bb | 7 ---
.../packages/images/moblin-image-sdk-live.bb | 4 ++
meta-moblin/packages/images/moblin-image-sdk.bb | 2 +-
meta-moblin/packages/images/poky-image-live.bb | 9 ---
meta-moblin/packages/images/poky-image-live.inc | 18 ------
.../images/poky-image-minimal-initramfs.bb | 8 ---
.../packages/images/poky-image-minimal-live.bb | 9 ---
meta-moblin/packages/images/poky-image-netbook.bb | 7 ---
.../packages/images/poky-image-sato-live.bb | 9 ---
meta-moblin/packages/images/poky-image-sdk-live.bb | 9 ---
.../packages/tasks/task-moblin-apps-x11-pimlico.bb | 2 +-
meta-moblin/packages/tasks/task-moblin-boot.bb | 2 +-
meta-moblin/packages/tasks/task-moblin-sdk.bb | 2 +-
.../tasks/task-moblin-standalone-sdk-target.bb | 6 ++-
meta-moblin/packages/tasks/task-moblin-tools-bb | 4 +-
.../packages/tasks/task-moblin-x11-netbook.bb | 4 +-
meta-moblin/packages/tasks/task-moblin-x11-sato.bb | 29 ----------
meta-moblin/packages/tasks/task-moblin.bb | 2 +-
meta-moblin/packages/tasks/tasks-moblin-tools.bb | 57 --------------------
meta/packages/images/poky-image-netbook-install.bb | 9 ---
meta/packages/images/poky-image-netbook-live.bb | 9 ---
meta/packages/images/poky-image-netbook.bb | 7 ---
31 files changed, 64 insertions(+), 209 deletions(-)
New commits:
commit 98e6b819e439b2e3a043d50a3db95890a2afccb7
Author: Joshua Lock <[EMAIL PROTECTED]>
Date: Wed Oct 29 10:37:53 2008 +0000
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.
Diff in this email is a maximum of 400 lines.
diff --git a/meta-moblin/packages/images/moblin-image-live.bb
b/meta-moblin/packages/images/moblin-image-live.bb
index ff12fd4..3fcfda7 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 2dd9a89..0f40109 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 1626a40..7331eff 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 83dab3e..b2c8ff6 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 5810026..3178fff 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 0000000..184a33c
--- /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 0000000..3fcfda7
--- /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 a573dbe..8cbcf2a 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 81c07b7..0000000
--- 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 61f9733..0000000
--- 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 84cf107..44d2cda 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 0ec00f2..6f42a33 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 a3bfbfc..0000000
--- 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 7f8dd8f..0000000
--- 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 b2824a7..0000000
--- 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 7d9aa5f..0000000
--- 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 8138e9d..0000000
--- 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 9b686e8..0000000
--- 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 807de39..0000000
--- 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"
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 1ab8163..4523196 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 a5b78fc..015b94b 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 84bb71a..4b6030e 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 e9384f5..c9f118c 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 6d5e60c..214db3c 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 90ee0d1..b8fa1e3 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 6ae3bc0..0000000
--- 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 cb9f0c3..9b34d99 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 33dad20..0000000
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
