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 --- .../weston-ini-conf-guest/weston.cluster-guest.ini | 9 ++++++ .../weston-ini-conf-guest/weston.default.ini | 9 ++++++ .../weston-ini-conf-guest/weston.ivi-guest.ini | 14 +++++++++ .../wayland/weston-ini-conf-guest_0.1.bb | 34 ++++++++++++++++++++++ .../wayland/weston-init-guest/weston.ini | 9 ------ .../wayland/weston-init-guest_0.1.bb | 19 ++++++------ .../images/guest-image-cluster-demo.bb | 1 + .../images/guest-image-ivi-demo.bb | 1 + 8 files changed, 77 insertions(+), 19 deletions(-) create mode 100644 meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.cluster-guest.ini create mode 100644 meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.default.ini create mode 100644 meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.ivi-guest.ini create mode 100644 meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest_0.1.bb delete mode 100644 meta-agl-lxc/recipes-graphics/wayland/weston-init-guest/weston.ini diff --git a/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.cluster-guest.ini b/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.cluster-guest.ini new file mode 100644 index 00000000..c709d60d --- /dev/null +++ b/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.cluster-guest.ini @@ -0,0 +1,9 @@ +[core] +backend=drm-backend.so +require-input=false +modules=systemd-notify.so +repaint-window=34 + +[shell] +panel-position=none +background-color=0xff000000 diff --git a/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.default.ini b/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.default.ini new file mode 100644 index 00000000..c709d60d --- /dev/null +++ b/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.default.ini @@ -0,0 +1,9 @@ +[core] +backend=drm-backend.so +require-input=false +modules=systemd-notify.so +repaint-window=34 + +[shell] +panel-position=none +background-color=0xff000000 diff --git a/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.ivi-guest.ini b/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.ivi-guest.ini new file mode 100644 index 00000000..a664f5e0 --- /dev/null +++ b/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest/weston.ivi-guest.ini @@ -0,0 +1,14 @@ +[core] +shell=ivi-shell.so +backend=drm-backend.so +require-input=false +modules=systemd-notify.so,ivi-controller.so + +[ivi-shell] +ivi-input-module=ivi-input-controller.so +ivi-id-agent-module=ivi-id-agent.so + +[desktop-app-default] +default-surface-id=9801 +default-surface-id-max=9821 + diff --git a/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest_0.1.bb b/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest_0.1.bb new file mode 100644 index 00000000..740fa8ff --- /dev/null +++ b/meta-agl-lxc/recipes-graphics/wayland/weston-ini-conf-guest_0.1.bb @@ -0,0 +1,34 @@ +SUMMARY = "Configuration file for the Weston and AGL Wayland compositors for guest container" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = " \ + file://weston.default.ini \ + file://weston.cluster-guest.ini \ + file://weston.ivi-guest.ini \ +" + +S = "${WORKDIR}" + +inherit allarch + +# Default weston.ini +WESTON_INI_FILE ??= "weston.default.ini" + +# Set container specific weston.ini +WESTON_INI_FILE:aglcontainercluster ?= "weston.cluster-guest.ini" +WESTON_INI_FILE:aglcontainerivi ?= "weston.ivi-guest.ini" + +do_install() { + install -D -p -m0644 ${WORKDIR}/${WESTON_INI_FILE} ${D}${sysconfdir}/xdg/weston/weston.ini +} + +FILES:${PN} += " \ + ${sysconfdir}/xdg/weston/weston.ini \ + " +CONFFILES:${PN} += " \ + ${sysconfdir}/xdg/weston/weston.ini \ + " +RDEPENDS:${PN} = "weston-init-guest" +RPROVIDES:${PN} = "weston-ini" +RCONFLICTS:${PN} = "weston-ini-conf" diff --git a/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest/weston.ini b/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest/weston.ini deleted file mode 100644 index 2c05c58a..00000000 --- a/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest/weston.ini +++ /dev/null @@ -1,9 +0,0 @@ -[core] -backend=drm-backend.so -require-input=false -modules=systemd-notify.so -repaint-window=34 - -[shell] -panel-position=none -background-color=0xff808080 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" diff --git a/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb b/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb index 3d88b8d0..1476d7ab 100644 --- a/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb +++ b/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb @@ -6,6 +6,7 @@ require guest-image-minimal.bb IMAGE_INSTALL += " \ weston \ weston-init-guest \ + weston-ini-conf-guest \ cluster-refgui \ pipewire-ic-ipc \ " diff --git a/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb b/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb index 1086e17c..9cb495a3 100644 --- a/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb +++ b/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb @@ -6,6 +6,7 @@ require guest-image-minimal.bb IMAGE_INSTALL += " \ weston \ weston-init-guest \ + weston-ini-conf-guest \ wayland-ivi-extension \ ilm-manager \ mominavi \ -- cgit 1.2.3-korg