diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-06-25 12:12:23 +0000 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-06-25 12:12:23 +0000 |
| commit | 7474469f02371f8ec432da13ea3c0fe678568afd (patch) | |
| tree | c13f4491143d2ac30dfca7118d8d7a2fe4d6e7d0 /meta-agl-profile-graphical | |
| parent | 1e9bc66cdd68be6d6c23c57ccc0928bdbb5cf0a6 (diff) | |
| parent | 54c2fda805fd7fda591008693cd6843413cee9f8 (diff) | |
Merge "Merge the agl-compositor sandbox into master"
Diffstat (limited to 'meta-agl-profile-graphical')
3 files changed, 10 insertions, 6 deletions
diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb index c0e2d9895..41f5f027b 100644 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb @@ -18,4 +18,8 @@ S = "${WORKDIR}/git" inherit meson pkgconfig python3native -FILES_${PN} = "${bindir}/agl-compositor ${datadir}/${PN}/protocols/agl-shell.xml ${datadir}/${PN}/protocols/agl-shell-desktop.xml" +FILES_${PN} = " \ + ${bindir}/agl-compositor \ + ${datadir}/${PN}/protocols/agl-shell.xml \ + ${datadir}/${PN}/protocols/agl-shell-desktop.xml \ + " diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend index ddabff5f5..374e9aa75 100644 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend @@ -2,9 +2,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" inherit agl-graphical -WESTONSTART ??= "${@bb.utils.contains("DISTRO_FEATURES", "agl-compositor", "/usr/bin/agl-compositor", "/usr/bin/weston",d)} ${WESTONARGS}" -WESTONSTART_append = " ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", " --log=${DISPLAY_XDG_RUNTIME_DIR}/weston.log", "",d)}" -WESTONSTART_append = " ${@bb.utils.contains("DISTRO_FEATURES", "agl-compositor", " --config ${sysconfdir}/xdg/weston/weston.ini", "",d)}" +AGL_DEFAULT_WESTONSTART ??= "/usr/bin/agl-compositor --config ${sysconfdir}/xdg/weston/weston.ini" + +WESTONSTART ??= "${AGL_DEFAULT_WESTONSTART} ${WESTONARGS}" +WESTONSTART_append = " ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", " --log=${DISPLAY_XDG_RUNTIME_DIR}/compositor.log", "",d)}" WIFILES = " \ file://weston.conf.in \ diff --git a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb index 35db34df9..2a4b22930 100644 --- a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb +++ b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb @@ -14,9 +14,8 @@ RDEPENDS_${PN} += " \ weston-init \ weston-ini-conf \ weston-examples \ - weston-ready \ agl-login-manager \ agl-desktop-config \ - ${@bb.utils.contains("DISTRO_FEATURES", "agl-compositor", "agl-compositor", "",d)} \ + agl-compositor \ " |