diff --git a/meta-webos/conf/distro/include/webos.inc b/meta-webos/conf/distro/include/webos.inc index 1cbe1022a..c34f2973c 100644 --- a/meta-webos/conf/distro/include/webos.inc +++ b/meta-webos/conf/distro/include/webos.inc @@ -304,7 +304,7 @@ SYSLINUX_ROOT_qemuall = "root=/dev/vda2" # Select at most one of the two choices here for the console: # Redirect console output to keep it from spewing all over the Emulator window # (This is added to qemux86 kernel cmdline by openembedded-core/meta/classes/syslinux.bbclass) -APPEND_append_qemuall = " console=ttyS0" +APPEND_append_qemuall = " console=ttyS0 net.ifnames=0 biosdevname=0" # - or - # If your build is not using the screen for graphics, and you're running an emulator, # you should be able to use the emulator's on-screen window as the console by diff --git a/meta-webos/recipes-multimedia/alsa/alsa-plugins/99-pulseaudio-qemu-emulator.conf b/meta-webos/recipes-multimedia/alsa/alsa-plugins/99-pulseaudio-qemu-emulator.conf index e3709516d..4f5885806 100644 --- a/meta-webos/recipes-multimedia/alsa/alsa-plugins/99-pulseaudio-qemu-emulator.conf +++ b/meta-webos/recipes-multimedia/alsa/alsa-plugins/99-pulseaudio-qemu-emulator.conf @@ -1,6 +1,6 @@ # Default to PulseAudio -pcm.pulse { +pcm.!default { type pulse hint { show on @@ -8,6 +8,6 @@ pcm.pulse { } } -ctl.pulse { +ctl.!default { type pulse } diff --git a/meta-webos/recipes-multimedia/pulseaudio/pulseaudio_9.0.bb b/meta-webos/recipes-multimedia/pulseaudio/pulseaudio_9.0.bb index d6bb88d68..2c32a798d 100644 --- a/meta-webos/recipes-multimedia/pulseaudio/pulseaudio_9.0.bb +++ b/meta-webos/recipes-multimedia/pulseaudio/pulseaudio_9.0.bb @@ -8,7 +8,7 @@ DEPENDS_remove = "libatomic-ops" DEPENDS += "pmloglib" WEBOS_VERSION = "9.0-1_e3be9b0f94ce588543f476e0e7eab9d2ca3e8f48" -PR = "r16" +PR = "r17" inherit webos_enhanced_submissions @@ -39,14 +39,15 @@ do_install_prepend() { } do_install_append() { - install -v -d ${D}${sysconfdir}/init/ - install -v -m 644 ${WORKDIR}/pulseaudio.conf ${D}${sysconfdir}/init/pulseaudio.conf install -v -m 644 ${S}/src/modules/module-palm-policy-default.h ${D}${includedir}/pulse/module-palm-policy.h install -v -m 644 ${S}/src/modules/module-palm-policy-tables-default.h ${D}${includedir}/pulse/module-palm-policy-tables.h } do_install_append_webos() { install -v -m 644 ${S}/palm/open_system.pa ${D}${sysconfdir}/pulse/system.pa } +do_install_append_qemuall() { + install -v -m 644 ${S}/palm/qemux86_system.pa ${D}${sysconfdir}/pulse/system.pa +} FILES_${PN}-dev += "${libdir}/pulse-9.0/modules/*.la ${datadir}/vala ${libdir}/cmake" diff --git a/meta-webos/recipes-webos/avoutputd/avoutput-adaptation-layer-mock.bb b/meta-webos/recipes-webos/avoutputd/avoutput-adaptation-layer-mock.bb index 8cfa5086a..de58afe7c 100644 --- a/meta-webos/recipes-webos/avoutputd/avoutput-adaptation-layer-mock.bb +++ b/meta-webos/recipes-webos/avoutputd/avoutput-adaptation-layer-mock.bb @@ -20,6 +20,6 @@ S = "${WORKDIR}/git" DEPENDS = "glib-2.0 pmloglib libpbnjson ls2-helpers avoutput-adaptation-layer-api" -WEBOS_VERSION = "1.0.0-7_48357bd41c836ffc623cf52c8d2f3bf7d6955bd3" +WEBOS_VERSION = "1.0.0-1_14419deaaa797c7c451047df2f5878577319b12f" PR = "r0"