diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-31 10:14:04 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 12:34:46 +0000 |
| commit | adc61820f15efe4e57e9089372e55ad20aaf1efb (patch) | |
| tree | bcd90c8cb8623285dede1ff7683c07ecef494d48 /classes | |
| parent | 01fc35f2ae5a20c7e892728318a91da3a8163b75 (diff) | |
emulator: boot-directdisk was merged with image-vm
Change-Id: I4b899dac24895ebd6ac9da1258f177faa4acac74
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image-hdd.bbclass | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index 05fd8479..1391be14 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -27,18 +27,13 @@ ## ############################################################################ -# need to define the dependency and the ROOTFS for directdisk -do_bootdirectdisk[depends] += "${PN}:do_rootfs" -ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" - -SYSLINUX_ROOT = "root=/dev/hda2 " -SYSLINUX_PROMPT = "0" -SYSLINUX_TIMEOUT = "1" -SYSLINUX_LABELS = "boot" -LABELS_append = " ${SYSLINUX_LABELS} " +VM_ROOTFS_TYPE = "ext3" +ROOT_VM = "root=/dev/hda2" +LABELS_VM = "boot" +AUTO_SYSLINUXMENU = "0" SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" -inherit image_types boot-directdisk +inherit image_types image-vm create_hdd_image () { cd ${DEPLOY_DIR_IMAGE} |