From 5c5d96605f4e587d2065ddc0812175051881dc4b Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Mon, 6 Dec 2021 20:22:51 +0100 Subject: [PATCH] distribution/projetcs: updated displayserver & windowmanager opts - changed x11 to wl as suitable displayserver option for ARM based projects - changed the WINDOWMANAGER var from "none" to "no" if it's not in use to us the same naming scheme as for all other vars - set the WINDOWMANAGER for generic/wayland to weston --- projects/ARM/options | 8 ++++---- projects/Allwinner/options | 6 +++--- projects/Amlogic/options | 6 +++--- projects/Generic/devices/Generic/options | 4 ++-- projects/Generic/devices/wayland/options | 8 ++++---- projects/Generic/devices/x11/options | 2 +- projects/NXP/options | 6 +++--- projects/Qualcomm/devices/Dragonboard/options | 6 +++--- projects/RPi/options | 6 +++--- projects/Rockchip/options | 6 +++--- projects/Samsung/options | 6 +++--- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/projects/ARM/options b/projects/ARM/options index b24fa32182..ec9d160515 100644 --- a/projects/ARM/options +++ b/projects/ARM/options @@ -105,9 +105,6 @@ # build and install hfs filesystem utilities (yes / no) HFSTOOLS="no" - # Windowmanager to use (fluxbox / none) - WINDOWMANAGER="none" - # Xorg Graphic drivers to use (all / r300,r600,nvidia) GRAPHIC_DRIVERS="mesa" @@ -147,8 +144,11 @@ # OpenGL(X) implementation to use (no / mesa) OPENGL="no" - # Displayserver to use (x11 / no) + # Displayserver to use (wl / no) DISPLAYSERVER="no" + # Windowmanager to use (weston / no) + WINDOWMANAGER="no" + # additional Firmware to use FIRMWARE="" diff --git a/projects/Allwinner/options b/projects/Allwinner/options index 0e83dfbe18..9d988e435a 100644 --- a/projects/Allwinner/options +++ b/projects/Allwinner/options @@ -37,11 +37,11 @@ # OpenGL(X) implementation to use (no / mesa) OPENGL="no" - # Displayserver to use (x11 / no) + # Displayserver to use (wl / no) DISPLAYSERVER="no" - # Windowmanager to use (ratpoison / fluxbox / none) - WINDOWMANAGER="none" + # Windowmanager to use (weston / no) + WINDOWMANAGER="no" # Xorg Graphic drivers to use (all / lima,panfrost) # Space separated list is supported, diff --git a/projects/Amlogic/options b/projects/Amlogic/options index 9e95422e82..f77a2ab6d8 100644 --- a/projects/Amlogic/options +++ b/projects/Amlogic/options @@ -46,11 +46,11 @@ # OpenGL(X) implementation to use (no / mesa) OPENGL="no" - # Displayserver to use (x11 / no) + # Displayserver to use (wl / no) DISPLAYSERVER="no" - # Windowmanager to use (fluxbox / none) - WINDOWMANAGER="none" + # Windowmanager to use (weston / no) + WINDOWMANAGER="no" # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, diff --git a/projects/Generic/devices/Generic/options b/projects/Generic/devices/Generic/options index ad64946caa..94475cd756 100644 --- a/projects/Generic/devices/Generic/options +++ b/projects/Generic/devices/Generic/options @@ -7,8 +7,8 @@ # Displayserver to use (weston / x11 / no) DISPLAYSERVER="no" -# Windowmanager to use (fluxbox / none) - WINDOWMANAGER="none" +# Windowmanager to use (fluxbox / weston / no) + WINDOWMANAGER="no" # KODI Player implementation to use (mesa / default) KODIPLAYER_DRIVER="mesa" diff --git a/projects/Generic/devices/wayland/options b/projects/Generic/devices/wayland/options index c9c0f1f332..948674a923 100644 --- a/projects/Generic/devices/wayland/options +++ b/projects/Generic/devices/wayland/options @@ -4,11 +4,11 @@ # OpenGL-ES implementation to use (mesa / no) OPENGLES="mesa" -# Displayserver to use (weston / x11 / no) - DISPLAYSERVER="weston" +# Displayserver to use (wl / x11 / no) + DISPLAYSERVER="wl" -# Windowmanager to use (fluxbox / none) - WINDOWMANAGER="none" +# Windowmanager to use (fluxbox / weston / no) + WINDOWMANAGER="weston" # KODI Player implementation to use (mesa / default) KODIPLAYER_DRIVER="mesa" diff --git a/projects/Generic/devices/x11/options b/projects/Generic/devices/x11/options index 9f0a2e7f71..a5ff6d8ffb 100644 --- a/projects/Generic/devices/x11/options +++ b/projects/Generic/devices/x11/options @@ -7,7 +7,7 @@ # Displayserver to use (weston / x11 / no) DISPLAYSERVER="x11" -# Windowmanager to use (fluxbox / none) +# Windowmanager to use (fluxbox / weston / no) WINDOWMANAGER="fluxbox" # KODI Player implementation to use (mesa / default) diff --git a/projects/NXP/options b/projects/NXP/options index 6c404dc3aa..300c16efec 100644 --- a/projects/NXP/options +++ b/projects/NXP/options @@ -38,11 +38,11 @@ # include uvesafb support (yes / no) UVESAFB_SUPPORT="no" - # Displayserver to use (x11 / no) + # Displayserver to use (wl / no) DISPLAYSERVER="no" - # Windowmanager to use (ratpoison / fluxbox / none) - WINDOWMANAGER="none" + # Windowmanager to use (weston / no) + WINDOWMANAGER="no" # Xorg Graphic drivers to use (all / etnaviv) # Space separated list is supported, diff --git a/projects/Qualcomm/devices/Dragonboard/options b/projects/Qualcomm/devices/Dragonboard/options index 3f7b31f77c..a43c08fb62 100644 --- a/projects/Qualcomm/devices/Dragonboard/options +++ b/projects/Qualcomm/devices/Dragonboard/options @@ -66,11 +66,11 @@ # include uvesafb support (yes / no) UVESAFB_SUPPORT="no" - # Displayserver to use (x11 / no) + # Displayserver to use (wl / no) DISPLAYSERVER="no" - # Windowmanager to use (ratpoison / fluxbox / none) - WINDOWMANAGER="none" + # Windowmanager to use (weston / no) + WINDOWMANAGER="no" # Xorg Graphic drivers to use (all / freedreno) # Space separated list is supported, diff --git a/projects/RPi/options b/projects/RPi/options index 7c3c8aa847..b4e8e7cb72 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -75,11 +75,11 @@ # OpenGL-ES implementation to use (no / bcm2835-driver / mesa) OPENGLES="mesa" - # Displayserver to use (x11 / no) + # Displayserver to use (wl / no) DISPLAYSERVER="no" - # Windowmanager to use (fluxbox / none) - WINDOWMANAGER="none" + # Windowmanager to use (weston / no) + WINDOWMANAGER="no" # Xorg Graphic drivers to use (all / vc4 / none) # Space separated list is supported, diff --git a/projects/Rockchip/options b/projects/Rockchip/options index 33fbfd6551..1c20771c9c 100644 --- a/projects/Rockchip/options +++ b/projects/Rockchip/options @@ -44,11 +44,11 @@ # OpenGL-ES implementation to use (no / libmali / mesa) OPENGLES="${OPENGLES:-mesa}" - # Displayserver to use (weston / no) + # Displayserver to use (wl / no) DISPLAYSERVER="no" - # Windowmanager to use (fluxbox / none) - WINDOWMANAGER="none" + # Windowmanager to use (weston / no) + WINDOWMANAGER="no" # Xorg Graphic drivers to use (all / lima,panfrost) # Space separated list is supported, diff --git a/projects/Samsung/options b/projects/Samsung/options index 1d7b976803..111b6472b9 100644 --- a/projects/Samsung/options +++ b/projects/Samsung/options @@ -48,11 +48,11 @@ # OpenGL(X) implementation to use (no / mesa) OPENGL="no" - # Displayserver to use (x11 / no) + # Displayserver to use (wl / no) DISPLAYSERVER="no" - # Windowmanager to use (fluxbox / none) - WINDOWMANAGER="none" + # Windowmanager to use (weston / no) + WINDOWMANAGER="no" # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported,