diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index baae886cc6935c80ea9d1e4a18fcd4e35c3ae4a2..ca0d7a3924beb1f8c57d5c8bb26d227b2a9468a6 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -1898,7 +1898,7 @@ manifest_list: version: 9f66b6011d0743ae0551341397cb826619e1afdb yocto-meta-st: remote_url: https://gitee.com/openeuler/yocto-meta-st.git - version: 70cc25322f1a0f4e2595167f80f258957f1061ae + version: a4249a595dc8840032e1a514e77be739b80489e4 yocto-meta-sunxi: remote_url: https://github.com/linux-sunxi/meta-sunxi.git version: c475a1851a877bf700d6d9748be7336b2eadd3b2 diff --git a/.oebuild/platform/myd-ld25x-oee.yaml b/.oebuild/platform/myd-ld25x-oee.yaml index 82d3b1a3b42d826fe8f7a544c3bd87d05c81f7ae..41ae2cec7fd1a2c2af0aa5b80000f21285b601bf 100644 --- a/.oebuild/platform/myd-ld25x-oee.yaml +++ b/.oebuild/platform/myd-ld25x-oee.yaml @@ -11,11 +11,13 @@ layers: - yocto-meta-st/meta-st-openeuler - yocto-meta-st/meta-st-stm32mp-tsn-acm - yocto-meta-st/meta-st-stm32mp-tsn-swch + - yocto-meta-st/meta-st-x-linux-ai local_conf: | OPENEULER_PREBUILT_TOOLS_ENABLE = "no" - DISTRO_FEATURES:append = " kernel6 " + DISTRO_FEATURES:append = " kernel6 wayland opengl " PREFERRED_VERSION_linux-openeuler ?= "6.6%" PREFERRED_VERSION_linux-openeuler-rt ?= "6.6%" INIT_MANAGER = "systemd" ACCEPT_EULA_myd-ld25x-oee = "1" + IMAGE_FEATURES:append = " weston " diff --git a/meta-openeuler/recipes-graphics/wayland/weston-init.bbappend b/meta-openeuler/recipes-graphics/wayland/weston-init.bbappend index 47e9509b13e23449e3a84bc2731ca4dadc2a59f7..82175ee71481be0e3981d1979aa6eeef4e0f5d23 100644 --- a/meta-openeuler/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-openeuler/recipes-graphics/wayland/weston-init.bbappend @@ -1,5 +1,7 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - # we current use rc5.d of rcS, we don't want it autostart default # occurs when udev is used instead of systemd INITSCRIPT_PARAMS = "start 9 2 . stop 20 0 1 6 ." + +do_install:append () { + sed -i "s|^#* *background-image=.*|background-image=/usr/share/weston/openeuler.png|" ${D}${sysconfdir}/xdg/weston/weston.ini +} \ No newline at end of file diff --git a/meta-openeuler/recipes-graphics/wayland/weston-init/weston.ini b/meta-openeuler/recipes-graphics/wayland/weston-init/weston.ini deleted file mode 100644 index 3eca849a02a484fcf623eb462e2ba8766c80cad0..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-graphics/wayland/weston-init/weston.ini +++ /dev/null @@ -1,75 +0,0 @@ -# configuration file for Weston - -[core] -#modules=xwayland.so,cms-colord.so -#shell=desktop-shell.so -#gbm-format=xrgb2101010 -require-input=false - -[shell] -background-image=/usr/share/weston/openeuler.png -background-color=0xff002244 -background-type=scale-crop -clock-format=minutes -#panel-color=0x90ff0000 -locking=true -animation=zoom -startup-animation=fade -#binding-modifier=ctrl -#num-workspaces=6 -#cursor-theme=whiteglass -#cursor-size=24 - -#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png -#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg -#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg -#animation=fade - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -#path=/usr/bin/gnome-terminal - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -#path=/usr/bin/weston-terminal - -#[launcher] -#icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png -#path=/usr/bin/google-chrome - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/arts.png -#path=/build/weston-0lEgCh/weston-1.11.0/weston-flower - -#[input-method] -#path=/usr/libexec/weston-keyboard - -#[output] -#name=LVDS1 -#mode=1680x1050 -#transform=90 -#icc_profile=/usr/share/color/icc/colord/Bluish.icc - -#[output] -#name=VGA1 -#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync -#transform=flipped - -#[output] -#name=X1 -#mode=1024x768 -#transform=flipped-90 - -#[libinput] -#enable_tap=true - -#[touchpad] -#constant_accel_factor = 50 -#min_accel_factor = 0.16 -#max_accel_factor = 1.0 - -[screen-share] -command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize - -#[xwayland] -#path=/usr/bin/Xwayland