diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-05-24 12:05:01 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-05-24 12:05:25 +0100 |
| commit | 9f23e3e49119c4529aee1f4879a59c2482b9292c (patch) | |
| tree | c3b29ef7889ef91d0af14bee564bf944c9f5d2b4 | |
| parent | 6bf1f8c76e0d69ed64c5f0bb9e9b24215c32dfbe (diff) | |
| download | openembedded-core-9f23e3e49119c4529aee1f4879a59c2482b9292c.tar.gz openembedded-core-9f23e3e49119c4529aee1f4879a59c2482b9292c.tar.bz2 openembedded-core-9f23e3e49119c4529aee1f4879a59c2482b9292c.zip | |
Update directdisk images to use common inc files
Signed-off-by: Joshua Lock <josh@linux.intel.com>
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 @@ +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 index 0000000000..3de2944c80 --- /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 index c64e77bd2d..0000000000 --- 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 index 0000000000..64144b9abf --- /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 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 @@ -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 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 @@ -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" |