summaryrefslogtreecommitdiffstats
path: root/core/modules/xorg
diff options
context:
space:
mode:
Diffstat (limited to 'core/modules/xorg')
-rwxr-xr-xcore/modules/xorg/data/etc/X11/Xsession50
-rw-r--r--core/modules/xorg/data/etc/X11/xorg.conf.d/10-intel.conf5
-rw-r--r--core/modules/xorg/module.conf.ubuntu4
-rw-r--r--core/modules/xorg/module.conf.ubuntu.1639
-rw-r--r--core/modules/xorg/module.conf.ubuntu.1799
5 files changed, 20 insertions, 177 deletions
diff --git a/core/modules/xorg/data/etc/X11/Xsession b/core/modules/xorg/data/etc/X11/Xsession
index fadc69ba..33a003ac 100755
--- a/core/modules/xorg/data/etc/X11/Xsession
+++ b/core/modules/xorg/data/etc/X11/Xsession
@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/bash
#
# /etc/X11/Xsession
#
@@ -19,46 +19,32 @@ message () {
fi
}
-message_nonl () {
- # pretty-print messages of arbitrary length (no trailing newline); use
- # xmessage if it is available and $DISPLAY is set
- MESSAGE="$PROGNAME: $*"
- echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2;
- if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
- echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
- fi
-}
-
errormsg () {
# exit script with error
message "$*"
exit 1
}
-internal_errormsg () {
- # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message
- # One big call to message() for the sake of xmessage; if we had two then
- # the user would have dismissed the error we want reported before seeing the
- # request to report it.
- errormsg "$*" \
- "Please report the installed version of the \"x11-common\"" \
- "package and the complete text of this error message to" \
- "<debian-x@lists.debian.org>."
-}
+# Make sure we source the global profile - needed for ssh-agent, etc.
+[ -e "/etc/profile" ] && . "/etc/profile"
# Workaround to start Xsession. The original Xsession script includes error handling functionality and sources other scrips from the Xsession.d/ directory.
SESSIONDIR="/etc/X11/Xsession.d"
+tmpfile="$( mktemp "/tmp/xsession-log-$( date +%s )-XXXXXX" )"
+if [ -n "$tmpfile" ]; then
+ exec &> "$tmpfile"
+ set -x
+fi
+
if [ -d "$SESSIONDIR" ]; then
- for file in $SESSIONDIR/*; do
- . $file || slxlog "xsession" "Xsession: Could not source $file" "$file"
+ for file in "$SESSIONDIR"/*; do
+ [ -f "$file" ] || continue
+ . "$file"
done
fi
-# Make sure we source the global profile - needed for ssh-agent, etc.
-[ -e "/etc/profile" ] && source "/etc/profile"
-
# start selected session
case "$1" in
failsafe)
@@ -80,21 +66,21 @@ case "$1" in
default)
# Specific program was requested.
SESSION="default"
- if [ -e $HOME/.dmrc ]; then
- SESSION=$(cat $HOME/.dmrc|grep "Session"| cut -d "=" -f2)
+ if [ -s "$HOME/.dmrc" ]; then
+ SESSION=$( < "$HOME/.dmrc" grep -m1 "Session" | cut -d "=" -f2 )
fi
# somehow .dmrc is cleared when logging in the first time after boot
- if [ -e $HOME/.dmrc.real ]; then
- SESSION=$(cat $HOME/.dmrc.real|grep "Session"| cut -d "=" -f2)
+ if [ -s "$HOME/.dmrc.real" ]; then
+ SESSION=$( < "$HOME/.dmrc.real" grep -m1 "Session" | cut -d "=" -f2 )
fi
[ "x$SESSION" == "xdefault" ] && SESSION="gnome"
- CMD=$(cat /opt/openslx/xsessions/$SESSION.desktop|grep "Exec"| cut -d "=" -f2-99|head -n1)
+ CMD=$( < "/opt/openslx/xsessions/$SESSION.desktop" grep -m1 "Exec" | cut -d "=" -f2-99 | head -n1 )
exec $CMD
;;
*)
# Specific program was requested.
- STARTUP_FULL_PATH=$(/opt/openslx/bin/which "${1%% *}" || true)
+ STARTUP_FULL_PATH=$( which "${1%% *}" || true )
if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
if [ -x "$STARTUP_FULL_PATH" ]; then
exec $1
diff --git a/core/modules/xorg/data/etc/X11/xorg.conf.d/10-intel.conf b/core/modules/xorg/data/etc/X11/xorg.conf.d/10-intel.conf
deleted file mode 100644
index 711fd644..00000000
--- a/core/modules/xorg/data/etc/X11/xorg.conf.d/10-intel.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-Section "OutputClass"
- Identifier "Intel iGPU"
- MatchDriver "i915"
- Driver "intel"
-EndSection
diff --git a/core/modules/xorg/module.conf.ubuntu b/core/modules/xorg/module.conf.ubuntu
index 4fbb0307..79316abe 100644
--- a/core/modules/xorg/module.conf.ubuntu
+++ b/core/modules/xorg/module.conf.ubuntu
@@ -26,10 +26,10 @@ REQUIRED_INSTALLED_PACKAGES="
xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
+ xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
"
REQUIRED_CONTENT_PACKAGES="
xterm
@@ -62,10 +62,10 @@ REQUIRED_CONTENT_PACKAGES="
xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
+ xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
@xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
@xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
diff --git a/core/modules/xorg/module.conf.ubuntu.16 b/core/modules/xorg/module.conf.ubuntu.16
deleted file mode 100644
index 6cdcb051..00000000
--- a/core/modules/xorg/module.conf.ubuntu.16
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-"
-REQUIRED_CONTENT_PACKAGES="
- xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
- libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
- libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
- xkb-data
- x11-xkb-utils
- x11-xserver-utils
- x11-utils
- xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
-"
-
-REQUIRED_DIRECTORIES+="
- /usr/lib
-"
-REQUIRED_FILES=""
diff --git a/core/modules/xorg/module.conf.ubuntu.17 b/core/modules/xorg/module.conf.ubuntu.17
deleted file mode 100644
index e5b76dad..00000000
--- a/core/modules/xorg/module.conf.ubuntu.17
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
- fonts-dejavu-core
- fonts-dejavu-extra
- ttf-dejavu-core
- xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
- libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
- libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
- xkb-data
- x11-xkb-utils
- x11-xserver-utils
- x11-utils
- xdotool
- libtxc-dxtn-s2tc
- libinput10
- libwacom2
- xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
- libdrm-dev
- libgbm-dev
- libgl-dev
- libgl1-mesa-dev
- libudev-dev
- pkg-config
- x11proto-core-dev
- x11proto-dri2-dev
- x11proto-fonts-dev
- x11proto-randr-dev
- x11proto-render-dev
- x11proto-video-dev
- x11proto-xext-dev
- x11proto-xf86dri-dev
- xserver-xorg-dev
- xutils-dev
-"
-REQUIRED_CONTENT_PACKAGES="
- fonts-dejavu-core
- fonts-dejavu-extra
- ttf-dejavu-core
- xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
- libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
- libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
- libegl1-mesa
- libgbm1
- libcapnp-0.5.3
- libmirclient9
- libwayland-client0
- libwayland-server0
- xkb-data
- x11-xkb-utils
- x11-xserver-utils
- x11-utils
- xdotool
- libtxc-dxtn-s2tc
- xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
- xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
- @xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
-"
-# TODO: Required because the shipped ones crash on VT switch as of 2017-11-24
-# Remove when fixed in ubuntu repos
-REQUIRED_XORG_DRIVERS="
- xf86-video-ati//xf86-video-ati-18.0.1
- xf86-video-amdgpu//xf86-video-amdgpu-18.0.1
-"
-REQUIRED_LIBRARIES+="
- amdgpu_drv
- radeon_drv
- ati_drv
-"
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-06-13 17:21:28 +0200