From aac207c39cfe5726000a54c9849b927fe15aa3ce Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Sat, 6 Nov 2021 14:19:31 -0400
Subject: meta-agl-core: remove weston-init backport

Remove backport of weston-init changes done for Marlin release,
they are not required with post-hardknott releases of Yocto.

Bug-AGL: SPEC-3819

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I81e32fa082df174b3a8a705ac51085176bddb4b8
---
 .../wayland/weston-init_aglcore.inc                | 46 ----------------------
 1 file changed, 46 deletions(-)

(limited to 'meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc')

diff --git a/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc b/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc
index 8966700ac..896f1eafb 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc
+++ b/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc
@@ -6,49 +6,3 @@ do_install:append() {
 }
 
 RDEPENDS:${PN} += "weston-ini"
-
-# Temporary effective backport of upstream commit ccdaab97
-# This gets us on the same page as upstream with respect to running
-# weston as non-root, and should make migrating to 3.5/Kirkstone
-# easier.
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/weston-init:"
-
-SRC_URI += " \
-           file://weston.service \
-           file://weston.socket \
-           file://weston-autologin \
-"
-
-do_install:append() {
-	rm -f ${D}${sysconfdir}/udev/rules.d/71-weston-drm.rules
-	rm -f ${D}${systemd_system_unitdir}/weston@.service
-	rm -f ${D}${systemd_system_unitdir}/weston@.socket
-
-	install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service
-	install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket
-        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
-               install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin
-        fi
-
-	sed -i -e s:/etc:${sysconfdir}:g \
-		-e s:/usr/bin:${bindir}:g \
-		-e s:/var:${localstatedir}:g \
-		${D}${systemd_system_unitdir}/weston.service
-
-	install -dm 755 -o weston -g weston ${D}/home/weston
-}
-
-inherit useradd
-
-USERADD_PACKAGES = "${PN}"
-
-FILES:${PN} += "\
-    ${systemd_system_unitdir}/weston.service \
-    ${systemd_system_unitdir}/weston.socket \
-    /home/weston \
-"
-
-SYSTEMD_SERVICE:${PN} = "weston.service weston.socket"
-USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input weston"
-GROUPADD_PARAM:${PN} = "-r wayland"
-- 
cgit 1.2.3-korg