diff options
6 files changed, 30 insertions, 38 deletions
diff --git a/meta-moblin/packages/images/moblin-image-directdisk.inc b/meta-moblin/packages/images/moblin-image-directdisk.inc new file mode 100644 index 0000000000..bcce9d5389 --- /dev/null +++ b/meta-moblin/packages/images/moblin-image-directdisk.inc | |||
@@ -0,0 +1,8 @@ | |||
1 | inherit boot-directdisk | ||
2 | |||
3 | do_bootdirectdisk_prepend () { | ||
4 | import bb | ||
5 | fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) | ||
6 | if 'ext3' not in fstypes: | ||
7 | bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") | ||
8 | } | ||
diff --git a/meta-moblin/packages/images/moblin-image-netbook-directdisk.bb b/meta-moblin/packages/images/moblin-image-netbook-directdisk.bb new file mode 100644 index 0000000000..3de2944c80 --- /dev/null +++ b/meta-moblin/packages/images/moblin-image-netbook-directdisk.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | # | ||
2 | # Copyright (C) 2010 Intel Corporation. | ||
3 | # | ||
4 | require moblin-image-directdisk.inc | ||
5 | |||
6 | DESCRIPTION = "Moblin Direct Disk Image" | ||
7 | |||
8 | ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3" | ||
9 | |||
10 | do_bootdirectdisk[depends] += "moblin-image-netbook:do_rootfs" | ||
diff --git a/meta-moblin/packages/images/moblin-image-netbook.directdisk.bb b/meta-moblin/packages/images/moblin-image-netbook.directdisk.bb deleted file mode 100644 index c64e77bd2d..0000000000 --- a/meta-moblin/packages/images/moblin-image-netbook.directdisk.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | # | ||
2 | # Copyright (C) 2008 Intel Corporation. | ||
3 | # | ||
4 | DESCRIPTION = "Moblin Direct Disk Image" | ||
5 | |||
6 | IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}" | ||
7 | |||
8 | inherit boot-directdisk | ||
9 | inherit moblin-image | ||
10 | |||
11 | do_bootdirectdisk_prepend () { | ||
12 | import bb | ||
13 | fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) | ||
14 | if 'ext3' not in fstypes: | ||
15 | bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") | ||
16 | } | ||
17 | |||
18 | ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3" | ||
19 | |||
20 | do_bootdirectdisk[depends] += "moblin-image-netbook:do_rootfs" | ||
diff --git a/meta/packages/images/poky-image-directdisk.inc b/meta/packages/images/poky-image-directdisk.inc new file mode 100644 index 0000000000..64144b9abf --- /dev/null +++ b/meta/packages/images/poky-image-directdisk.inc | |||
@@ -0,0 +1,8 @@ | |||
1 | inherit boot-directdisk | ||
2 | |||
3 | do_bootdirectdisk_prepend () { | ||
4 | import bb | ||
5 | fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) | ||
6 | if 'ext3' not in fstypes: | ||
7 | bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") | ||
8 | } \ No newline at end of file | ||
diff --git a/meta/packages/images/poky-image-minimal-directdisk.bb b/meta/packages/images/poky-image-minimal-directdisk.bb index 0623a6b189..e068464607 100644 --- a/meta/packages/images/poky-image-minimal-directdisk.bb +++ b/meta/packages/images/poky-image-minimal-directdisk.bb | |||
@@ -1,13 +1,6 @@ | |||
1 | DESCRIPTION = "Minimal Bootable Direct Disk Image" | 1 | require poky-image-directdisk.inc |
2 | |||
3 | inherit boot-directdisk | ||
4 | 2 | ||
5 | do_bootdirectdisk_prepend () { | 3 | DESCRIPTION = "Minimal Bootable Direct Disk Image" |
6 | import bb | ||
7 | fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) | ||
8 | if 'ext3' not in fstypes: | ||
9 | bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") | ||
10 | } | ||
11 | 4 | ||
12 | ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3" | 5 | ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3" |
13 | 6 | ||
diff --git a/meta/packages/images/poky-image-sato-directdisk.bb b/meta/packages/images/poky-image-sato-directdisk.bb index f24d938adf..eac3b589b1 100644 --- a/meta/packages/images/poky-image-sato-directdisk.bb +++ b/meta/packages/images/poky-image-sato-directdisk.bb | |||
@@ -1,13 +1,6 @@ | |||
1 | DESCRIPTION = "Sato Direct Disk Image" | 1 | require poky-image-directdisk.inc |
2 | |||
3 | inherit boot-directdisk | ||
4 | 2 | ||
5 | do_bootdirectdisk_prepend () { | 3 | DESCRIPTION = "Sato Direct Disk Image" |
6 | import bb | ||
7 | fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) | ||
8 | if 'ext3' not in fstypes: | ||
9 | bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") | ||
10 | } | ||
11 | 4 | ||
12 | ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3" | 5 | ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3" |
13 | 6 | ||