From d8ab3ff4c17bc7638f366822ca7907fd58edff42 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Sun, 10 Oct 2021 00:50:39 +0900 Subject: Create image specific weston setting method In patch of "Fix: weston is not running after BSP 5.5 merged in cluster-demo", I created common weston-init recipe for container guest. This patch add image specific weston setting method. Bug-AGL: SPEC-4099 Signed-off-by: Naoto Yamaguchi Change-Id: I0a47749932dc384e8a983b43214aefd939ccd06e --- .../recipes-graphics/wayland/weston-init-guest_0.1.bb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'meta-agl-lxc/recipes-graphics/wayland/weston-init-guest_0.1.bb') diff --git a/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest_0.1.bb b/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest_0.1.bb index e18dbe52..c95f92e0 100644 --- a/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest_0.1.bb +++ b/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest_0.1.bb @@ -2,9 +2,7 @@ SUMMARY = "Startup script and systemd unit file for the Weston Wayland composito LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - SRC_URI = "file://weston.env \ - file://weston.ini \ file://weston.service \ " @@ -13,7 +11,6 @@ S = "${WORKDIR}" inherit features_check systemd do_install() { - install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston # Install Weston systemd service and accompanying udev rule @@ -26,22 +23,24 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" -# rdepends on weston which depends on virtual/egl +# rdepends on weston-init-guest which depends on wayland REQUIRED_DISTRO_FEATURES = "wayland" -FILES_${PN} += " \ +FILES:${PN} += " \ ${sysconfdir}/xdg/weston/weston.ini \ ${systemd_system_unitdir}/weston.service \ ${sysconfdir}/default/weston \ " -CONFFILES_${PN} += " \ +CONFFILES:${PN} += " \ ${sysconfdir}/xdg/weston/weston.ini \ ${sysconfdir}/default/weston \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "weston.service" +SYSTEMD_SERVICE:${PN} = "weston.service" SYSTEMD_AUTO_ENABLE = "enable" -RDEPENDS_${PN} = "weston" - -RCONFLICTS_${PN} = "weston-init" +RDEPENDS:${PN} = " \ + weston \ + weston-ini \ + " +RCONFLICTS:${PN} = "weston-init" -- cgit 1.2.3-korg