summaryrefslogtreecommitdiffstats
path: root/meta-moblin/packages/images
diff options
context:
space:
mode:
Diffstat (limited to 'meta-moblin/packages/images')
-rw-r--r--meta-moblin/packages/images/moblin-image-live.bb4
-rw-r--r--meta-moblin/packages/images/moblin-image-live.inc4
-rw-r--r--meta-moblin/packages/images/moblin-image-minimal-initramfs.bb6
-rw-r--r--meta-moblin/packages/images/moblin-image-minimal-live.bb4
-rw-r--r--meta-moblin/packages/images/moblin-image-minimal.bb3
-rw-r--r--meta-moblin/packages/images/moblin-image-netbook-install.bb13
-rw-r--r--meta-moblin/packages/images/moblin-image-netbook-live.bb13
-rw-r--r--meta-moblin/packages/images/moblin-image-netbook.bb2
-rw-r--r--meta-moblin/packages/images/moblin-image-sato-live.bb9
-rw-r--r--meta-moblin/packages/images/moblin-image-sato.bb7
-rw-r--r--meta-moblin/packages/images/moblin-image-sdk-live.bb4
-rw-r--r--meta-moblin/packages/images/moblin-image-sdk.bb2
-rw-r--r--meta-moblin/packages/images/poky-image-live.bb9
-rw-r--r--meta-moblin/packages/images/poky-image-live.inc18
-rw-r--r--meta-moblin/packages/images/poky-image-minimal-initramfs.bb8
-rw-r--r--meta-moblin/packages/images/poky-image-minimal-live.bb9
-rw-r--r--meta-moblin/packages/images/poky-image-netbook.bb7
-rw-r--r--meta-moblin/packages/images/poky-image-sato-live.bb9
-rw-r--r--meta-moblin/packages/images/poky-image-sdk-live.bb9
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 @@
1#
2# Copyright (C) 2008 Intel Corporation.
3#
4
1DESCRIPTION = "Netbook Bootable Live Image" 5DESCRIPTION = "Netbook Bootable Live Image"
2 6
3require moblin-image-live.inc 7require 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 @@
1#
2# Copyright (C) 2008 Intel Corporation.
3#
4
1AUTO_SYSLINUXCFG = "1" 5AUTO_SYSLINUXCFG = "1"
2INITRD = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-initramfs-${MACHINE}.cpio.gz" 6INITRD = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-initramfs-${MACHINE}.cpio.gz"
3APPEND += "root=/dev/ram0 " 7APPEND += "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 @@
1# Simple initramfs image. Mostly used for live images. 1#
2# Copyright (C) 2008 Intel Corporation.
3#
4
5DESCRIPTION = "Simple initramfs image. Mostly used for live images."
2 6
3IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev" 7IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
4 8
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 @@
1#
2# Copyright (C) 2008 Intel Corporation.
3#
4
1DESCRIPTION = "Minimal Bootable Live Image" 5DESCRIPTION = "Minimal Bootable Live Image"
2 6
3require moblin-image-live.inc 7require 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 @@
1# 1#
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2008 Intel Corporation.
3# 3#
4
4IMAGE_INSTALL = "task-moblin-boot ${ROOTFS_PKGMANAGE}" 5IMAGE_INSTALL = "task-moblin-boot ${ROOTFS_PKGMANAGE}"
5 6
6IMAGE_LINGUAS = " " 7IMAGE_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 @@
1#
2# Copyright (C) 2008 Intel Corporation.
3#
4
5DESCRIPTION = "Netbook Bootable Live Image"
6
7require moblin-image-live.inc
8
9LABELS += "install"
10
11ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
12
13do_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 @@
1#
2# Copyright (C) 2008 Intel Corporation.
3#
4
5DESCRIPTION = "Netbook Bootable Live Image"
6
7require moblin-image-live.inc
8
9LABELS += "boot install"
10
11ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
12
13do_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 @@
1# 1#
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2008 Intel Corporation.
3# 3#
4 4
5IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}" 5IMAGE_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 @@
1DESCRIPTION = "Sato Bootable Live Image"
2
3require moblin-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-sato-${MACHINE}.ext3"
8
9do_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 @@
1#
2# Copyright (C) 2007 OpenedHand Ltd.
3#
4
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
6
7inherit 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 @@
1#
2# Copyright (C) 2008 Intel Corporation.
3#
4
1DESCRIPTION = "Bootable Live SDK Image" 5DESCRIPTION = "Bootable Live SDK Image"
2 6
3require moblin-image-live.inc 7require 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 @@
1# 1#
2# Copyright (C) 2007 OpenedHand Ltd. 2# Copyright (C) 2008 Intel Corporation.
3# 3#
4 4
5IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs dbg-pkgs" 5IMAGE_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 @@
1DESCRIPTION = "Netbook Bootable Live Image"
2
3require poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
8
9do_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 @@
1AUTO_SYSLINUXCFG = "1"
2INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz"
3APPEND += "root=/dev/ram0 "
4TIMEOUT = "10"
5
6EXCLUDE_FROM_WORLD = "1"
7
8do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs"
9
10inherit bootimg
11
12do_bootimg_prepend () {
13 import bb
14 fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
15 if 'ext3' not in fstypes:
16 bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
17}
18
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 @@
1# Simple initramfs image. Mostly used for live images.
2
3IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
4
5export IMAGE_BASENAME = "poky-image-minimal-initramfs"
6IMAGE_LINGUAS = ""
7
8inherit 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 @@
1DESCRIPTION = "Minimal Bootable Live Image"
2
3require poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
8
9do_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 @@
1#
2# Copyright (C) 2007 OpenedHand Ltd.
3#
4
5IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
6
7inherit 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 @@
1DESCRIPTION = "Sato Bootable Live Image"
2
3require poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
8
9do_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 @@
1DESCRIPTION = "Bootable Live SDK Image"
2
3require poky-image-live.inc
4
5LABELS += "boot install"
6
7ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sdk-${MACHINE}.ext3"
8
9do_bootimg[depends] += "poky-image-sdk:do_rootfs"