diff options
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 0f401091c..453bc527c 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" EXCLUDE_FROM_WORLD = "1" +LABELS += "boot install" + do_bootimg[depends] += "moblin-image-minimal-initramfs:do_rootfs" inherit bootimg @@ -20,3 +22,6 @@ do_bootimg_prepend () { bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") } +ROOTFS = "${DEPLOY_DIR_IMAGE}/${MOBLIN_LIVE_IMAGENAME}-${MACHINE}.ext3" + +do_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 b2c8ff60d..9d7f789fa 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 @@ # DESCRIPTION = "Minimal Bootable Live Image" +MOBLIN_LIVE_IMAGENAME = "moblin-image-minimal" require moblin-image-live.inc -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-minimal-${MACHINE}.ext3" - -do_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 3fcfda727..78b579f77 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 @@ # DESCRIPTION = "Netbook Bootable Live Image" +MOBLIN_LIVE_IMAGENAME = "moblin-image-netbook" require moblin-image-live.inc -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-netbook-${MACHINE}.ext3" - -do_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 44d2cda95..8301d97ad 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 @@ # DESCRIPTION = "Bootable Live SDK Image" +MOBLIN_LIVE_IMAGENAME = "moblin-image-sdk" require moblin-image-live.inc -LABELS += "boot install" -ROOTFS = "${DEPLOY_DIR_IMAGE}/moblin-image-sdk-${MACHINE}.ext3" - -do_bootimg[depends] += "moblin-image-sdk:do_rootfs" |