summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2023-05-03 03:38:16 +0900
committerNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2023-05-09 08:13:10 +0900
commit9b16e8afc30169d99da53d5413af3979cde472c4 (patch)
treedd92457b5404b9998f68aaa0cd59630a2fec94a0
parent05e6e4c383362e5c871759a1a4c625643b359a8f (diff)
Remove obsoleted weston configuration recipes
The weston-init and the weston-ini-conf ware not used in existing integration. This patch remove these obsoleted recipes. Bug-AGL: SPEC-4777 Change-Id: I8048bc311c1cece40ce5a78b3a0287bde74d2b25 Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
-rw-r--r--meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf.bbappend2
-rw-r--r--meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf/shell.cfg3
-rw-r--r--meta-agl-ic-container/recipes-graphics/wayland/weston-init.bbappend40
-rw-r--r--meta-agl-ic-container/recipes-graphics/wayland/weston-init/drm-lease.conf.in4
4 files changed, 0 insertions, 49 deletions
diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf.bbappend
deleted file mode 100644
index 46dfc124..00000000
--- a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-
diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf/shell.cfg b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf/shell.cfg
deleted file mode 100644
index 6fe34ea7..00000000
--- a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf/shell.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[shell]
-panel-position=none
-background-color=0xff000000
diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-init.bbappend b/meta-agl-ic-container/recipes-graphics/wayland/weston-init.bbappend
deleted file mode 100644
index 4374c455..00000000
--- a/meta-agl-ic-container/recipes-graphics/wayland/weston-init.bbappend
+++ /dev/null
@@ -1,40 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-
-AGL_DEFAULT_WESTONSTART ??= "/usr/bin/weston --config ${sysconfdir}/xdg/weston/weston.ini"
-WESTONARGS ?= "--idle-time=0 --drm-lease=\${DRM_LEASE_DEVICE}"
-
-WESTONSTART ??= "${AGL_DEFAULT_WESTONSTART} ${WESTONARGS}"
-WESTONSTART:append = " ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", " --debug", "",d)}"
-
-WIFILES = " \
- file://drm-lease.conf.in \
-"
-
-SRC_URI:append = " ${WIFILES}"
-
-do_install:append() {
- # Process ".in" files
- files=$(echo ${WIFILES} | sed s,file://,,g)
- for f in ${files}; do
- g=${f%.in}
- if [ "${f}" != "${g}" ]; then
- sed -e "s,@WESTONUSER@,${WESTONUSER},g" \
- -e "s,@WESTONGROUP@,${WESTONGROUP},g" \
- -e "s,@XDG_RUNTIME_DIR@,${DISPLAY_XDG_RUNTIME_DIR},g" \
- -e "s,@WESTONSTART@,${WESTONSTART},g" \
- -e "s,@WESTON_DRM_DEVICE@,${WESTON_DRM_DEVICE},g" \
- ${WORKDIR}/${f} > ${WORKDIR}/${g}
- fi
- done
-
- # Install weston drop-in
- install -d ${D}${systemd_system_unitdir}/weston@.service.d
- install -m644 ${WORKDIR}/drm-lease.conf ${D}/${systemd_system_unitdir}/weston@.service.d/
-
- install -d ${D}${systemd_system_unitdir}/multi-user.target.wants
- ln -s ../weston@.service ${D}${systemd_system_unitdir}/multi-user.target.wants/weston@root.service
-}
-
-FILES:${PN} += " \
- ${systemd_system_unitdir}/ \
-"
diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-init/drm-lease.conf.in b/meta-agl-ic-container/recipes-graphics/wayland/weston-init/drm-lease.conf.in
deleted file mode 100644
index 025cd58e..00000000
--- a/meta-agl-ic-container/recipes-graphics/wayland/weston-init/drm-lease.conf.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Service]
-Type=notify
-ExecStart=
-ExecStart=@WESTONSTART@