Merge remote-tracking branch 'agl/next'

* agl/next:
  meta-agl-bsp: Add CONFIG_LSM workaround for 5.1+ kernels
  meta-agl-profile-cluster-qt5: disable qtbase patches
  zeus updates for dragonboard-410c
  meta-security: activates dbus-cynagora
  recipes-graphics/wayland/weston: Expose weston_output_damage()
  meta-agl-profile-core: tweak udisks2 configuration for AGL
  meta-agl-bsp/meta-arago: update weston bbappend
  [RCAR] Update rcar driver weston 7 bsp 3.21.0
  [RCAR] Update rcar driver weston 7 bsp 3.21.0
  [RCAR] Split ADSP path for ulcb and ulcb-kf
  Fix nss-localuser post install
  meta-agl-bsp: meta-raspberrypi: handle zeus upgrade
  meta-agl-profile-core: add patch for systemd-udevd SECLABEL crash
  meta-security: disable dbus-cynara patches
  meta-agl-bsp: handle ptest-runner upgrade
  meta-agl-distro: Add inc file for next branch over-rides
  meta-agl-distro: BBMASK problematic upstream meta-security bbappend
  meta-agl-distro: prefer linux-yocto 4.19 LTS kernel
  meta-agl-profile-graphical-qt5: enable qt5location services
  meta-agl-profile-core: update most recipe
  meta-agl-profile-core: update neardal recipe
  Update base local.conf.sample
  meta-agl-profile-graphical: don't always build agl-compositor
  meta-agl-profile-graphical: update weston and weston-init
  meta-agl-profile-graphical: update wayland-ivi-extension for weston 7.0.0
  meta-agl-distro: add polkit to DISTRO_FEATURES
  meta-agl-profile-core: update fontconfig bbappend
  meta-agl-profile-core: switch to udisks2
  meta-security: handle systemd upgrade
  meta-agl-profile-graphical-qt5: handle qtwayland upgrade
  meta-agl-profile-core: handle freetype upgrade
  meta-agl-bsp meta-agl-profile-core: upgrade to opencv 4.x
  meta-agl-profile-core: update rtl-sdr recipe for zeus
  meta-security meta-app-framework: handle xmlsec1 upgrade
  meta-agl-profile-graphical: upgrade to gstreamer 1.16
  meta-agl-profile-core: remove libmicrohttpd backport
  meta-agl-profile-core: remove backported curl and nghttp2 recipes
  meta-agl-profile-core: remove libnfc recipe
  meta-agl-profile-core: remove connman backport
  meta-agl-profile-graphical: remove weston 5.0.0 patches
  meta-agl-profile-core: remove old glibc patch
  meta-agl-bsp/meta-intel: remove linux-firmware_git.bbappend
  meta-agl-bsp: remove weston and wayland-protocols backports
  meta-app-framework: remove libzip recipe
  meta-security: remove keyutils recipe
  Declare layer compatibility with zeus

Change-Id: Ie8ee1e37958279e7cf2d503c54ffacb46ba0c31c

1 files changed, 7 insertions, 10 deletions

diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.conf.in b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.conf.in
index 89c436695..211136cc9 100644
--- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.conf.in
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init/weston.conf.in
@@ -1,17 +1,14 @@
-[Unit]
-Conflicts=getty@tty@WESTONTTY@.service
 [Service]
 Type=notify
-User=@WESTONUSER@
-Group=@WESTONGROUP@
 Environment="XDG_RUNTIME_DIR=@XDG_RUNTIME_DIR@"
 Environment="XDG_RUNTIMESHARE_DIR=@XDG_RUNTIME_DIR@/share"
 ExecStartPre=/bin/mkdir -p @XDG_RUNTIME_DIR@/share
 ExecStartPre=+/usr/bin/chsmack -a User::App-Shared -t @XDG_RUNTIME_DIR@/share
+# Note that clearing PAMName (thus not having PAMName=login) disables
+# logind support for the session, which allows setting XDG_RUNTIME_DIR
+# to something other than /run/user/% (as is done above).
+# Without systemd-logind support, weston needs to be patched to allow
+# its direct launcher to work for non-root users in this scenario.
+PAMName=
+ExecStart=
 ExecStart=@WESTONSTART@
-TTYPath=/dev/tty@WESTONTTY@
-StandardInput=tty
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-UtmpIdentifier=tty@WESTONTTY@