diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-07-25 23:02:31 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-07-26 16:23:34 +0000 |
| commit | 16aa39224d1b4691d3d2a109a860f904a94ff708 (patch) | |
| tree | ae4c2b3ffcb993cf9948d7f1c270b36fe1baca47 /meta-agl-distro/conf/distro/include | |
| parent | 986afefd22b5c6184ad42667bbc203ee47e83431 (diff) | |
Fix runqemu by generating an ext4 image by default
runqemu does not detect an ext4.xz , thus default to ext4.
Call it with:
runqemu qemux86-64 kvm audio
Also due to the optimization levels for x86-64, adapt QB_CPU and QB_CPU_KVM.
For audiomanager to start up, sound needs to be enabled. QB_AUDIO_DRV and QB_AUDIO_OPT enable this.
Finally bump memory in runqemu to 2G.
For CI purposes, introduce a DISTRO_FEATURES flag 'AGLCI'.
v2: fix missing space in append
v3: qemuboot options fix
v4: QB_AUDIO_DRV defaults to alsa
Bug-AGL: SPEC-784
Change-Id: Ie9c9c2b7d8838b512f3f19b1e29952079039e0ab
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10387
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Diffstat (limited to 'meta-agl-distro/conf/distro/include')
| -rw-r--r-- | meta-agl-distro/conf/distro/include/x86_64-tune.inc | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/meta-agl-distro/conf/distro/include/x86_64-tune.inc b/meta-agl-distro/conf/distro/include/x86_64-tune.inc index 9130173fa..023da85b8 100644 --- a/meta-agl-distro/conf/distro/include/x86_64-tune.inc +++ b/meta-agl-distro/conf/distro/include/x86_64-tune.inc @@ -19,27 +19,18 @@ TUNE_FEATURES_tune-corei7-32 = "${TUNE_FEATURES_tune-x86} corei7" BASE_LIB_tune-corei7-32 = "lib" TUNE_PKGARCH_tune-corei7-32 = "corei7-32" PACKAGE_EXTRA_ARCHS_tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-32} corei7-32" -QEMU_EXTRAOPTIONS_corei7-32 = " -cpu Nehalem,check=false" -QB_CPU_corei7-32 = "-cpu Nehalem,check=false" -QB_MACHINE_corei7-32 = "-machine q35" AVAILTUNES += "corei7-64" TUNE_FEATURES_tune-corei7-64 = "${TUNE_FEATURES_tune-x86-64} corei7" BASE_LIB_tune-corei7-64 = "lib64" TUNE_PKGARCH_tune-corei7-64 = "corei7-64" PACKAGE_EXTRA_ARCHS_tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64" -QEMU_EXTRAOPTIONS_corei7-64 = " -cpu Nehalem,check=false" -QB_CPU_corei7-64 = " -cpu Nehalem,check=false" -QB_MACHINE_corei7-64 = "-machine q35" AVAILTUNES += "corei7-64-x32" TUNE_FEATURES_tune-corei7-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} corei7" BASE_LIB_tune-corei7-64-x32 = "libx32" TUNE_PKGARCH_tune-corei7-64-x32 = "corei7-64-x32" PACKAGE_EXTRA_ARCHS_tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64-x32} corei7-64-x32" -QEMU_EXTRAOPTIONS_corei7-64-x32 = " -cpu Nehalem,check=false" -QB_CPU_corei7-64-x32 = "-cpu Nehalem,check=false" -QB_MACHINE_corei7-64-x32 = "-machine q35" TUNE_ARCH = "${@bb.utils.contains('TUNE_FEATURES', 'm64', '${X86ARCH64}', '' ,d)}" @@ -49,8 +40,13 @@ TUNE_FEATURES_tune-qemux86-64 = "${TUNE_FEATURES_tune-x86-64} corei7" BASE_LIB_tune-qemux86-64 = "lib64" TUNE_PKGARCH_tune-qemux86-64 = "corei7-64" PACKAGE_EXTRA_ARCHS_tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64" -QEMU_EXTRAOPTIONS_qemux86-64 = " -cpu Nehalem,check=false" -QB_CPU_qemux86-64 = " -cpu Nehalem,check=false" -QB_CPU_KVM_x86 = "-cpu Nehalem,check=false" -QB_CPU_KVM_x86-64 = "-cpu Nehalem,check=false" -QB_MACHINE_qemux86-64 = "-machine q35" + +# QEMU / runqemu options (partly overrides qemuboot-x86.inc) +QB_MACHINE = "-machine q35" +QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64" +QB_CPU_x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" +QB_CPU_KVM_x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" + +QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=1024x768-32 oprofile.timer=1 uvesafb.task_timeout=-1" +# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy +QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" |