From 0123b8615c58f2de3e8b95bdcb2d7dc808ab9196 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 19 May 2020 17:11:47 +0200 Subject: Debian! --- core/modules/xorg/module.conf.debian | 108 ++++++++++++++++++++++---------- core/modules/xorg/module.conf.ubuntu | 45 ++++++++----- core/modules/xorg/module.conf.ubuntu.18 | 83 ------------------------ 3 files changed, 104 insertions(+), 132 deletions(-) delete mode 100644 core/modules/xorg/module.conf.ubuntu.18 (limited to 'core/modules/xorg') diff --git a/core/modules/xorg/module.conf.debian b/core/modules/xorg/module.conf.debian index 8f65ce7a..4fbb0307 100644 --- a/core/modules/xorg/module.conf.debian +++ b/core/modules/xorg/module.conf.debian @@ -1,43 +1,83 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" - ttf-dejavu -" -REQUIRED_CONTENT_PACKAGES=" - xserver-xorg - xserver-xorg-core + xauth + 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 libgl1-mesa-glx + libglx0 + libegl1 + libegl1-mesa + libegl-mesa0 xkb-data x11-xkb-utils x11-xserver-utils - xserver-xorg-input-evdev - xserver-xorg-input-mouse - xserver-xorg-input-vmmouse - xserver-xorg-video-intel - xserver-xorg-video-ati - xserver-xorg-video-vesa - xserver-xorg-video-mga - xserver-xorg-video-sisusb - xserver-xorg-video-vmware - xserver-xorg-video-fbdev - xserver-xorg-video-radeon - xserver-xorg-video-sisusb - xserver-xorg-video-nouveau - @xserver-xorg-video-openchrome - @xserver-xorg-video-savage - @xserver-xorg-video-trident - @xserver-xorg-video-mach64 - @xserver-xorg-video-qxl - @xserver-xorg-video-siliconmotion - @xserver-xorg-video-cirrus - @xserver-xorg-video-r128 - @xserver-xorg-video-neomagic - @xserver-xorg-video-geode - @xserver-xorg-video-s3 - @xserver-xorg-video-tdfx - ttf-dejavu + x11-utils + xdotool + 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-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 " -REQUIRED_DIRECTORIES+=" - /usr/lib +REQUIRED_CONTENT_PACKAGES=" + xterm + xauth + 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 + libgl1-mesa-glx + libglx0 + libglx-mesa0 + libxcb-glx0 + @libgbm1 + libegl1 + libegl1-mesa + libegl-mesa0 + libgbm1 + libwayland-client0 + libwayland-server0 + xkb-data + x11-xkb-utils + x11-xserver-utils + x11-utils + xdotool + 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-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-input-mouse$UBUNTU_XORG_PKG_SUFFIX + @xserver-xorg-video-ati$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_FILES="" diff --git a/core/modules/xorg/module.conf.ubuntu b/core/modules/xorg/module.conf.ubuntu index 84c84953..4fbb0307 100644 --- a/core/modules/xorg/module.conf.ubuntu +++ b/core/modules/xorg/module.conf.ubuntu @@ -1,58 +1,73 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" + xauth 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 + libgl1-mesa-dri + libgl1-mesa-glx + libglx0 + libegl1 + libegl1-mesa + libegl-mesa0 xkb-data x11-xkb-utils x11-xserver-utils x11-utils xdotool + libinput10 + libwacom2 xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX - xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX - xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX + xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX 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-mga$UBUNTU_XORG_PKG_SUFFIX xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX - xserver-xorg-video-radeon$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 " REQUIRED_CONTENT_PACKAGES=" + xterm + xauth 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 + libgl1-mesa-dri + libgl1-mesa-glx + libglx0 + libglx-mesa0 + libxcb-glx0 + @libgbm1 + libegl1 + libegl1-mesa + libegl-mesa0 + libgbm1 + libwayland-client0 + libwayland-server0 xkb-data x11-xkb-utils x11-xserver-utils x11-utils xdotool - 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-vmmouse$UBUNTU_XORG_PKG_SUFFIX xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX - xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX 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-mga$UBUNTU_XORG_PKG_SUFFIX xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX - xserver-xorg-video-radeon$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-ati$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 diff --git a/core/modules/xorg/module.conf.ubuntu.18 b/core/modules/xorg/module.conf.ubuntu.18 deleted file mode 100644 index 4fbb0307..00000000 --- a/core/modules/xorg/module.conf.ubuntu.18 +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash -REQUIRED_INSTALLED_PACKAGES=" - xauth - 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 - libgl1-mesa-glx - libglx0 - libegl1 - libegl1-mesa - libegl-mesa0 - xkb-data - x11-xkb-utils - x11-xserver-utils - x11-utils - xdotool - 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-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 -" -REQUIRED_CONTENT_PACKAGES=" - xterm - xauth - 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 - libgl1-mesa-glx - libglx0 - libglx-mesa0 - libxcb-glx0 - @libgbm1 - libegl1 - libegl1-mesa - libegl-mesa0 - libgbm1 - libwayland-client0 - libwayland-server0 - xkb-data - x11-xkb-utils - x11-xserver-utils - x11-utils - xdotool - 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-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-input-mouse$UBUNTU_XORG_PKG_SUFFIX - @xserver-xorg-video-ati$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 -" -- cgit v1.2.3-55-g7522