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) | |
| download | meta-boot2qt-adc61820f15efe4e57e9089372e55ad20aaf1efb.tar.gz | |
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 05fd847..1391be1 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass | |||
| @@ -27,18 +27,13 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # need to define the dependency and the ROOTFS for directdisk | 30 | VM_ROOTFS_TYPE = "ext3" |
| 31 | do_bootdirectdisk[depends] += "${PN}:do_rootfs" | 31 | ROOT_VM = "root=/dev/hda2" |
| 32 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" | 32 | LABELS_VM = "boot" |
| 33 | 33 | AUTO_SYSLINUXMENU = "0" | |
| 34 | SYSLINUX_ROOT = "root=/dev/hda2 " | ||
| 35 | SYSLINUX_PROMPT = "0" | ||
| 36 | SYSLINUX_TIMEOUT = "1" | ||
| 37 | SYSLINUX_LABELS = "boot" | ||
| 38 | LABELS_append = " ${SYSLINUX_LABELS} " | ||
| 39 | SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" | 34 | SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" |
| 40 | 35 | ||
| 41 | inherit image_types boot-directdisk | 36 | inherit image_types image-vm |
| 42 | 37 | ||
| 43 | create_hdd_image () { | 38 | create_hdd_image () { |
| 44 | cd ${DEPLOY_DIR_IMAGE} | 39 | cd ${DEPLOY_DIR_IMAGE} |