summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-31 00:10:12 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-31 00:10:12 +0000
commit90f97b66b52a7a2890b4a2da07117ee8596948be (patch)
treef2a187b57630a50b7e9a0151bfe1e38487839e53
parent323ba2166a1ba393bbb2581de217c67f58656dc6 (diff)
downloadpoky-90f97b66b52a7a2890b4a2da07117ee8596948be.tar.gz
moblin-images-live: Move common code to the .inc file
-rw-r--r--meta-moblin/packages/images/moblin-image-live.inc5
-rw-r--r--meta-moblin/packages/images/moblin-image-minimal-live.bb6
-rw-r--r--meta-moblin/packages/images/moblin-image-netbook-live.bb6
-rw-r--r--meta-moblin/packages/images/moblin-image-sdk-live.bb5
4 files changed, 8 insertions, 14 deletions
diff --git a/meta-moblin/packages/images/moblin-image-live.inc b/meta-moblin/packages/images/moblin-image-live.inc
index 0f401091c1..453bc527c8 100644
--- a/meta-moblin/packages/images/moblin-image-live.inc
+++ b/meta-moblin/packages/images/moblin-image-live.inc
@@ -9,6 +9,8 @@ TIMEOUT = "10"
9 9
10EXCLUDE_FROM_WORLD = "1" 10EXCLUDE_FROM_WORLD = "1"
11 11
12LABELS += "boot install"
13
12do_bootimg[depends] += "moblin-image-minimal-initramfs:do_rootfs" 14do_bootimg[depends] += "moblin-image-minimal-initramfs:do_rootfs"
13 15
14inherit bootimg 16inherit bootimg
@@ -20,3 +22,6 @@ do_bootimg_prepend () {
20 bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") 22 bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
21} 23}
22 24
25ROOTFS = "${DEPLOY_DIR_IMAGE}/${MOBLIN_LIVE_IMAGENAME}-${MACHINE}.ext3"
26
27do_bootimg[depends] += "${MOBLIN_LIVE_IMAGENAME}:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-minimal-live.bb b/meta-moblin/packages/images/moblin-image-minimal-live.bb
index b2c8ff60d2..9d7f789fa3 100644
--- a/meta-moblin/packages/images/moblin-image-minimal-live.bb
+++ b/meta-moblin/packages/images/moblin-image-minimal-live.bb
@@ -3,11 +3,7 @@
3# 3#
4 4
5DESCRIPTION = "Minimal Bootable Live Image" 5DESCRIPTION = "Minimal Bootable Live Image"
6MOBLIN_LIVE_IMAGENAME = "moblin-image-minimal"
6 7
7require moblin-image-live.inc 8require moblin-image-live.inc
8 9
9LABELS += "boot install"
10
11ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-${MACHINE}.ext3"
12
13do_bootimg[depends] += "moblin-image-minimal:do_rootfs"
diff --git a/meta-moblin/packages/images/moblin-image-netbook-live.bb b/meta-moblin/packages/images/moblin-image-netbook-live.bb
index 3fcfda7279..78b579f779 100644
--- a/meta-moblin/packages/images/moblin-image-netbook-live.bb
+++ b/meta-moblin/packages/images/moblin-image-netbook-live.bb
@@ -3,11 +3,7 @@
3# 3#
4 4
5DESCRIPTION = "Netbook Bootable Live Image" 5DESCRIPTION = "Netbook Bootable Live Image"
6MOBLIN_LIVE_IMAGENAME = "moblin-image-netbook"
6 7
7require moblin-image-live.inc 8require moblin-image-live.inc
8 9
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-sdk-live.bb b/meta-moblin/packages/images/moblin-image-sdk-live.bb
index 44d2cda950..8301d97ad1 100644
--- a/meta-moblin/packages/images/moblin-image-sdk-live.bb
+++ b/meta-moblin/packages/images/moblin-image-sdk-live.bb
@@ -3,11 +3,8 @@
3# 3#
4 4
5DESCRIPTION = "Bootable Live SDK Image" 5DESCRIPTION = "Bootable Live SDK Image"
6MOBLIN_LIVE_IMAGENAME = "moblin-image-sdk"
6 7
7require moblin-image-live.inc 8require moblin-image-live.inc
8 9
9LABELS += "boot install"
10 10
11ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-sdk-${MACHINE}.ext3"
12
13do_bootimg[depends] += "moblin-image-sdk:do_rootfs"