diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 3 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 82ce46d860..3931b0f0fb 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc | |||
@@ -1,10 +1,8 @@ | |||
1 | # For runqemu | 1 | # For runqemu |
2 | IMAGE_CLASSES += "qemuboot" | 2 | IMAGE_CLASSES += "qemuboot" |
3 | QB_SYSTEM_NAME_x86 = "qemu-system-i386" | ||
4 | QB_CPU_x86 = "-cpu core2duo" | 3 | QB_CPU_x86 = "-cpu core2duo" |
5 | QB_CPU_KVM_x86 = "-cpu core2duo" | 4 | QB_CPU_KVM_x86 = "-cpu core2duo" |
6 | 5 | ||
7 | QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64" | ||
8 | QB_CPU_x86-64 = "-cpu core2duo" | 6 | QB_CPU_x86-64 = "-cpu core2duo" |
9 | QB_CPU_KVM_x86-64 = "-cpu core2duo" | 7 | QB_CPU_KVM_x86-64 = "-cpu core2duo" |
10 | 8 | ||
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 383e3bd6f3..4b50e664e4 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
@@ -39,3 +39,6 @@ module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" | |||
39 | 39 | ||
40 | WKS_FILE ?= "qemux86-directdisk.wks" | 40 | WKS_FILE ?= "qemux86-directdisk.wks" |
41 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 41 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |
42 | |||
43 | #For runqemu | ||
44 | QB_SYSTEM_NAME = "qemu-system-x86_64" | ||
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 272ad1e187..3832302f07 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
@@ -39,3 +39,6 @@ module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" | |||
39 | 39 | ||
40 | WKS_FILE ?= "qemux86-directdisk.wks" | 40 | WKS_FILE ?= "qemux86-directdisk.wks" |
41 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 41 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |
42 | |||
43 | #For runqemu | ||
44 | QB_SYSTEM_NAME = "qemu-system-i386" | ||