diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2020-07-13 17:31:56 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2020-07-14 14:32:10 +0000 |
| commit | c1ba83ee731c853dacb06136dbc83fcd77134f3c (patch) | |
| tree | 834703b974f29b2e89632c25172a33e0007a7162 | |
| parent | 47f14e3067db801e1a84058337d56a0b6ac57651 (diff) | |
meta-agl-bsp: Update weston-ini-conf fragments
Remove ivi-shell and ivi-extension related configuration fragments,
and update the core.cfg fragment to remove related configuration, they
are now unnecessary with the new compositor. Also remove commented
out old gst-record tweak from the bbappend.
Bug-AGL: SPEC-3469
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I67b0530c2e2929d07d2032de25d0e5e4706dbbb7
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25009
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>
Reviewed-by: Marius Vlad <marius.vlad@collabora.com>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
5 files changed, 1 insertions, 17 deletions
diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bb index 4628f96f8..14fbd0273 100644 --- a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bb @@ -3,8 +3,6 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "file://core.cfg \ - file://ivishell.cfg \ - file://id-agent.cfg \ file://shell.cfg \ file://hdmi-a-1-270.cfg \ " diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend index f954514cf..671fa171f 100644 --- a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -3,10 +3,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI += "${@bb.utils.contains("DISTRO_FEATURES", "weston-remoting", "file://remote-output.cfg", "",d)}" - -#do_configure_append() { -# if ${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', 'true', 'false', d)}; then -# echo virtual=1 >> ${WORKDIR}/core.cfg -# fi -#} - diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/core.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/core.cfg index eb5d470ed..90774ed79 100644 --- a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/core.cfg +++ b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/core.cfg @@ -1,5 +1,4 @@ [core] -shell=ivi-shell.so backend=drm-backend.so require-input=false -modules=systemd-notify.so,ivi-controller.so +modules=systemd-notify.so diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg deleted file mode 100644 index c85299250..000000000 --- a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[desktop-app-default] -default-surface-id=2000000 -default-surface-id-max=2001000 diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg deleted file mode 100644 index d0bcb833f..000000000 --- a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[ivi-shell] -ivi-input-module=ivi-input-controller.so -ivi-id-agent-module=ivi-id-agent.so |