Update directdisk images to use common inc files

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta-moblin/packages/images/moblin-image-directdisk.inc b/meta-moblin/packages/images/moblin-image-directdisk.inc
new file mode 100644 (file)
index 0000000..bcce9d5
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-directdisk.inc
@@ -0,0 +1,8 @@
+inherit boot-directdisk
+
+do_bootdirectdisk_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/moblin-image-netbook-directdisk.bb b/meta-moblin/packages/images/moblin-image-netbook-directdisk.bb
new file mode 100644 (file)
index 0000000..3de2944
--- /dev/null
+++ b/meta-moblin/packages/images/moblin-image-netbook-directdisk.bb
@@ -0,0 +1,10 @@
+#
+# Copyright (C) 2010 Intel Corporation.
+#
+require moblin-image-directdisk.inc
+
+DESCRIPTION = "Moblin Direct Disk Image"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
+
+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 (file)
index c64e77b..0000000
--- a/meta-moblin/packages/images/moblin-image-netbook.directdisk.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2008 Intel Corporation.
-#
-DESCRIPTION = "Moblin Direct Disk Image"
-
-IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
-
-inherit boot-directdisk
-inherit moblin-image
-
-do_bootdirectdisk_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")
-}
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3"
-
-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 (file)
index 0000000..64144b9
--- /dev/null
+++ b/meta/packages/images/poky-image-directdisk.inc
@@ -0,0 +1,8 @@
+inherit boot-directdisk
+
+do_bootdirectdisk_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")
+}
\ 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 0623a6b1895abc758a92fac437afca83b72a5088..e068464607d861f83fdd8e54dd8c53c60b0afef5 100644 (file)
--- a/meta/packages/images/poky-image-minimal-directdisk.bb
+++ b/meta/packages/images/poky-image-minimal-directdisk.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "Minimal Bootable Direct Disk Image"
-
-inherit boot-directdisk
+require poky-image-directdisk.inc
 
-do_bootdirectdisk_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")
-}
+DESCRIPTION = "Minimal Bootable Direct Disk Image"
 
 ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
 

diff --git a/meta/packages/images/poky-image-sato-directdisk.bb b/meta/packages/images/poky-image-sato-directdisk.bb
index f24d938adfe2605f936567c71a11f29bb67d8851..eac3b589b10204e553bc3d76a085b1e957d1f7a3 100644 (file)
--- a/meta/packages/images/poky-image-sato-directdisk.bb
+++ b/meta/packages/images/poky-image-sato-directdisk.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "Sato Direct Disk Image"
-
-inherit boot-directdisk
+require poky-image-directdisk.inc
 
-do_bootdirectdisk_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")
-}
+DESCRIPTION = "Sato Direct Disk Image"
 
 ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"