diff options
| author | Simon Rettberg | 2019-02-21 12:52:29 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-21 12:52:29 +0100 |
| commit | f1eaad48be426635be58eeb17487bac76f8930ae (patch) | |
| tree | c8c9cd4356b06fba143907e292564db99e4e1ee5 /core/modules/xorg | |
| parent | [system-uuid] New UUID fallback format (diff) | |
| download | mltk-f1eaad48be426635be58eeb17487bac76f8930ae.tar.gz mltk-f1eaad48be426635be58eeb17487bac76f8930ae.tar.xz mltk-f1eaad48be426635be58eeb17487bac76f8930ae.zip | |
[xorg] Add missing packages; cleanup
Diffstat (limited to 'core/modules/xorg')
| -rw-r--r-- | core/modules/xorg/module.conf | 2 | ||||
| -rw-r--r-- | core/modules/xorg/module.conf.ubuntu | 5 | ||||
| -rw-r--r-- | core/modules/xorg/module.conf.ubuntu.17 | 5 | ||||
| -rw-r--r-- | core/modules/xorg/module.conf.ubuntu.18 | 29 |
4 files changed, 9 insertions, 32 deletions
diff --git a/core/modules/xorg/module.conf b/core/modules/xorg/module.conf index 019b0a81..f40a815a 100644 --- a/core/modules/xorg/module.conf +++ b/core/modules/xorg/module.conf @@ -20,7 +20,7 @@ REQUIRED_DIRECTORIES=" /usr/share/fonts /etc/fonts /usr/bin - /usr/lib/udev + /usr/lib " REQUIRED_FILES=" " diff --git a/core/modules/xorg/module.conf.ubuntu b/core/modules/xorg/module.conf.ubuntu index adc98b36..84c84953 100644 --- a/core/modules/xorg/module.conf.ubuntu +++ b/core/modules/xorg/module.conf.ubuntu @@ -66,8 +66,3 @@ REQUIRED_CONTENT_PACKAGES=" @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 index 8678a0a3..e5b76dad 100644 --- a/core/modules/xorg/module.conf.ubuntu.17 +++ b/core/modules/xorg/module.conf.ubuntu.17 @@ -86,10 +86,6 @@ REQUIRED_CONTENT_PACKAGES=" @xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX @xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX " - -REQUIRED_DIRECTORIES+=" - /usr/lib -" # TODO: Required because the shipped ones crash on VT switch as of 2017-11-24 # Remove when fixed in ubuntu repos REQUIRED_XORG_DRIVERS=" @@ -101,4 +97,3 @@ REQUIRED_LIBRARIES+=" radeon_drv ati_drv " -REQUIRED_FILES="" diff --git a/core/modules/xorg/module.conf.ubuntu.18 b/core/modules/xorg/module.conf.ubuntu.18 index b47f8b09..5225a6ec 100644 --- a/core/modules/xorg/module.conf.ubuntu.18 +++ b/core/modules/xorg/module.conf.ubuntu.18 @@ -7,6 +7,7 @@ REQUIRED_INSTALLED_PACKAGES=" xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX + libglx0 xkb-data x11-xkb-utils x11-xserver-utils @@ -19,27 +20,13 @@ REQUIRED_INSTALLED_PACKAGES=" 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-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 @@ -49,10 +36,12 @@ REQUIRED_CONTENT_PACKAGES=" xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX + libglx0 + libglx-mesa0 + libxcb-glx0 libegl1-mesa libgbm1 libcapnp-0.6.1 - libmirclient9 libwayland-client0 libwayland-server0 xkb-data @@ -64,6 +53,8 @@ REQUIRED_CONTENT_PACKAGES=" 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-sisusb$UBUNTU_XORG_PKG_SUFFIX @@ -84,7 +75,3 @@ REQUIRED_CONTENT_PACKAGES=" @xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX " -REQUIRED_DIRECTORIES+=" - /usr/lib -" -REQUIRED_FILES="" |