diff --git a/meta-oniro-core/recipes-graphics/wayland/weston-init.bbappend b/meta-oniro-core/recipes-graphics/wayland/weston-init.bbappend index 91642e28d6df1f2747516da68516fbec42c2fcc1..9e018102139ed1f7929192d0a653762cd566a406 100644 --- a/meta-oniro-core/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-oniro-core/recipes-graphics/wayland/weston-init.bbappend @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${ONIRO_COREBASE}/assets:" +FILESEXTRAPATHS_prepend := "${ONIRO_COREBASE}/assets:" SRC_URI += "${@oe.utils.conditional('WESTON_INI_BACKGROUND_IMAGE', '', '', "file://${WESTON_INI_BACKGROUND_IMAGE_BASENAME}", d)}" diff --git a/meta-oniro-core/recipes-graphics/wayland/weston-init/weston-start b/meta-oniro-core/recipes-graphics/wayland/weston-init/weston-start deleted file mode 100755 index 2776d3ef1e308c7dfdaea6f788013e2a402a9575..0000000000000000000000000000000000000000 --- a/meta-oniro-core/recipes-graphics/wayland/weston-init/weston-start +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -# Copyright (C) 2016 O.S. Systems Software LTDA. -# Copyright (C) 2016 Freescale Semiconductor - -export PATH="/sbin:/usr/sbin:/bin:/usr/bin" - -usage() { - cat <<EOF - $0 [<openvt arguments>] [-- <weston options>] -EOF -} - -## Module support -modules_dir=@DATADIR@/weston-start - -# Add weston extra argument -add_weston_argument() { - weston_args="$weston_args $1" -} - -# Add openvt extra argument -add_openvt_argument() { - openvt_args="$openvt_args $1" -} - -## Add module to --modules argument -add_weston_module() { - if [ -z "${weston_modules}" ]; then - weston_modules="--modules " - fi; - weston_modules="${weston_modules}${1}," -} - - -if [ -n "$WAYLAND_DISPLAY" ]; then - echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." - exit 1 -fi - -if [ -n "$WESTON_USER" ]; then - if [ -z "$WESTON_TTY" ]; then - echo "ERROR: If you have WESTON_USER variable set, you also need WESTON_TTY." - exit 1 - fi - weston_args_user="-u $WESTON_USER -t $WESTON_TTY" -fi - -if [ -n "$DISPLAY" ]; then - launcher="weston" -else - launcher="weston-launch $weston_args_user --" -fi - -openvt_args="-s" -while [ -n "$1" ]; do - if [ "$1" = "--" ]; then - shift - break - fi - openvt_args="$openvt_args $1" - shift -done - -weston_args=$* - -# Load and run modules -if [ -d "$modules_dir" ]; then - for m in "$modules_dir"/*; do - # Skip backup files - if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then - continue - fi - - # process module - . $m - done - if [ -n "${weston_modules}" ]; then - add_weston_argument "${weston_modules}" - fi; -fi - -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - if [ -n "$WESTON_USER" ] - then - chown $WESTON_USER:$WESTON_USER $XDG_RUNTIME_DIR - fi -fi - -exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log diff --git a/meta-oniro-core/recipes-graphics/wayland/weston-init/weston@.service b/meta-oniro-core/recipes-graphics/wayland/weston-init/weston@.service deleted file mode 100644 index 70c706d75ceaaf6416e8715b091b6c41abd01cca..0000000000000000000000000000000000000000 --- a/meta-oniro-core/recipes-graphics/wayland/weston-init/weston@.service +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -[Unit] -Description=Weston Wayland Compositor -RequiresMountsFor=/run -Conflicts=plymouth-quit.service -After=systemd-user-sessions.service plymouth-quit-wait.service - -[Service] -Type=notify -NotifyAccess=all -User=%i -PAMName=login -EnvironmentFile=-/etc/default/weston -StandardError=journal -PermissionsStartOnly=true -IgnoreSIGPIPE=no - -ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS diff --git a/meta-oniro-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/meta-oniro-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch deleted file mode 100644 index a4444e5d1859c848253ae485757bf076b5bdc73e..0000000000000000000000000000000000000000 --- a/meta-oniro-core/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix atomic modesetting with musl - -atomic modesetting seems to fail with drm weston backend and this patch fixes -it, below errors are seen before weston exits - -atomic: couldn't commit new state: Invalid argument - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/libweston/backend-drm/kms.c -+++ b/libweston/backend-drm/kms.c -@@ -1168,8 +1168,8 @@ drm_pending_state_apply_atomic(struct dr - wl_list_for_each(plane, &b->plane_list, link) { - drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n", - (unsigned long) plane->plane_id); -- plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); -- plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); -+ //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); -+ //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); - } - - flags |= DRM_MODE_ATOMIC_ALLOW_MODESET; diff --git a/meta-oniro-core/recipes-graphics/wayland/weston/systemd-notify.weston-start b/meta-oniro-core/recipes-graphics/wayland/weston/systemd-notify.weston-start deleted file mode 100644 index fdb48cb6094ba187cc8be2b3f6ed2ba0f0741358..0000000000000000000000000000000000000000 --- a/meta-oniro-core/recipes-graphics/wayland/weston/systemd-notify.weston-start +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: Huawei Inc. -# SPDX-License-Identifier: Apache-2.0 - - -if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then - add_weston_module "systemd-notify.so" -fi diff --git a/meta-oniro-core/recipes-graphics/wayland/weston/xwayland.weston-start b/meta-oniro-core/recipes-graphics/wayland/weston/xwayland.weston-start deleted file mode 100644 index 22984f50a43db02c1a86f88a7b45351acbbc4f40..0000000000000000000000000000000000000000 --- a/meta-oniro-core/recipes-graphics/wayland/weston/xwayland.weston-start +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if type Xwayland >/dev/null 2>/dev/null; then - mkdir -p /tmp/.X11-unix - add_weston_module "xwayland.so" -fi diff --git a/meta-oniro-core/recipes-graphics/wayland/weston_8.0.0.bbappend b/meta-oniro-core/recipes-graphics/wayland/weston_8.0.0.bbappend deleted file mode 100644 index affce70b5d990e4bee8bd0fb20bef41a67ce3ba0..0000000000000000000000000000000000000000 --- a/meta-oniro-core/recipes-graphics/wayland/weston_8.0.0.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# SPDX-License-Identifier: Apache-2.0 - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://systemd-notify.weston-start" -SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch" - -do_install_append() { - install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify -}