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/poky-agl.conf | |
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/poky-agl.conf')
-rw-r--r-- | meta-agl-distro/conf/distro/poky-agl.conf | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index 47cb30836..f852b50f6 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -110,9 +110,12 @@ require conf/distro/include/${TARGET_ARCH}-tune.inc # Generic qemu and qemuboot (runqemu) enhancements # check qemuboot.bbclass -# - use 1G RAM by default -QB_MEM ?= "-m 1024" - +# - use 2G RAM by default +QB_MEM ?= "-m 2048" +# use pulseaudio on the host side - off as qemu-native is built with alsa +#QB_AUDIO_DRV = "pa" +# expose a virtual 'hda' sound card to the guest (arm/aarch64/x86-64) +QB_AUDIO_OPT = "-soundhw hda" # Board templates can add extra IMAGE_FSTYPES through this. # It is added (late) through the AGL image recipes. @@ -120,7 +123,7 @@ AGL_EXTRA_IMAGE_FSTYPES ??= "" AGL_EXTRA_INITRAMFS_FSTYPES ??= "" # # Default IMAGE FSTYPES compressed tarball + ext4.xz -AGL_DEFAULT_IMAGE_FSTYPES ?= "tar.xz ext4.xz" +AGL_DEFAULT_IMAGE_FSTYPES ?= "tar.xz ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz" # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this) |