summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2022-12-12 15:31:06 +0100
committerSimon Rettberg2022-12-12 15:31:06 +0100
commit20a74d7b383bd2ac377160f6a1f5143dfd378956 (patch)
treeb329eb6c6264a5a13232bdbf5112674c322feda3
parent[libvirt-python/libvirt-src] Bump version to 8.10 (diff)
downloadmltk-20a74d7b383bd2ac377160f6a1f5143dfd378956.tar.gz
mltk-20a74d7b383bd2ac377160f6a1f5143dfd378956.tar.xz
mltk-20a74d7b383bd2ac377160f6a1f5143dfd378956.zip
Make buildable on debian 12
-rw-r--r--core/modules/alsa/module.conf.debian5
-rw-r--r--core/modules/dbus/module.conf.debian4
-rw-r--r--core/modules/dhcpc-busybox/module.conf.debian5
-rw-r--r--core/modules/disk-partitions/module.conf.debian5
-rw-r--r--core/modules/dnbd3/module.conf.debian3
-rw-r--r--core/modules/docker-ce/module.build6
-rw-r--r--core/modules/docker-ce/module.conf.debian8
-rw-r--r--core/modules/libvirt-glib/module.conf.debian13
-rw-r--r--core/modules/libvirt-python/module.conf.debian8
-rw-r--r--core/modules/libvirt-src/module.conf.debian63
-rw-r--r--core/modules/looking-glass-client/module.conf.debian23
-rw-r--r--core/modules/openjdk-8-jre-headless/module.conf.debian5
-rw-r--r--core/modules/pam/module.conf.debian5
-rw-r--r--core/modules/pulseaudio/module.conf.debian18
-rw-r--r--core/modules/qemu-src/module.conf.debian51
-rw-r--r--core/modules/qemu/module.conf.debian10
-rw-r--r--core/modules/qt5core/module.conf.debian4
-rw-r--r--core/modules/run-virt-docker/module.conf.debian2
-rw-r--r--core/modules/sshd/module.conf.debian4
-rw-r--r--core/modules/sssd/module.conf.debian4
-rw-r--r--core/modules/sudo/module.conf.debian3
-rw-r--r--core/modules/swtpm/module.conf.debian20
-rw-r--r--core/modules/usbguard/module.conf.debian23
-rw-r--r--core/modules/vbox-src/module.conf.debian7
-rw-r--r--core/modules/virt-manager/module.conf.debian20
-rw-r--r--core/modules/virt-viewer/module.conf.debian17
-rw-r--r--core/modules/vmware12/module.conf.debian3
-rw-r--r--core/modules/xorg/module.conf1
-rw-r--r--core/modules/xorg/module.conf.debian10
-rw-r--r--core/modules/xscreensaver/module.build2
l---------core/targets/bwlp/x11vnc2
31 files changed, 332 insertions, 22 deletions
diff --git a/core/modules/alsa/module.conf.debian b/core/modules/alsa/module.conf.debian
index ec5c8e79..4f1464a2 100644
--- a/core/modules/alsa/module.conf.debian
+++ b/core/modules/alsa/module.conf.debian
@@ -1,7 +1,12 @@
#!/bin/bash
REQUIRED_CONTENT_PACKAGES="
alsa-utils
+ alsa-tools
libasound2
libasound2-data
libasound2-plugins
"
+
+REQUIRED_DIRECTORIES+="
+ /etc/modprobe.d
+"
diff --git a/core/modules/dbus/module.conf.debian b/core/modules/dbus/module.conf.debian
index 159cc642..a68a8e66 100644
--- a/core/modules/dbus/module.conf.debian
+++ b/core/modules/dbus/module.conf.debian
@@ -1,9 +1,9 @@
#!/bin/bash
REQUIRED_CONTENT_PACKAGES="
dbus
+ dbus-bin
dbus-x11
-"
-REQUIRED_FILES+="
+ dbus-daemon
"
REQUIRED_DIRECTORIES="
/usr/share/dbus-1
diff --git a/core/modules/dhcpc-busybox/module.conf.debian b/core/modules/dhcpc-busybox/module.conf.debian
new file mode 100644
index 00000000..06767018
--- /dev/null
+++ b/core/modules/dhcpc-busybox/module.conf.debian
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+REQUIRED_CONTENT_PACKAGES="
+ gawk
+"
diff --git a/core/modules/disk-partitions/module.conf.debian b/core/modules/disk-partitions/module.conf.debian
new file mode 100644
index 00000000..33a76ec0
--- /dev/null
+++ b/core/modules/disk-partitions/module.conf.debian
@@ -0,0 +1,5 @@
+REQUIRED_INSTALLED_PACKAGES="
+ xfsprogs
+ e2fsprogs
+ dosfstools
+"
diff --git a/core/modules/dnbd3/module.conf.debian b/core/modules/dnbd3/module.conf.debian
index 9794054b..35027d85 100644
--- a/core/modules/dnbd3/module.conf.debian
+++ b/core/modules/dnbd3/module.conf.debian
@@ -1,13 +1,12 @@
#!/bin/bash
REQUIRED_CONTENT_PACKAGES="
cmake
- fuse
+ fuse3
"
REQUIRED_INSTALLED_PACKAGES="
cmake
zlib1g-dev
libfuse-dev
- fuse
libjansson-dev
"
diff --git a/core/modules/docker-ce/module.build b/core/modules/docker-ce/module.build
index a7ba4966..6355a6af 100644
--- a/core/modules/docker-ce/module.build
+++ b/core/modules/docker-ce/module.build
@@ -5,9 +5,13 @@ module_init() {
declare -a apts
[ "$SYS_DISTRIBUTION" = "ubuntu" ] || [ "$SYS_DISTRIBUTION" = "debian" ] || return 0
# Forcefully add docker repo
+ local vers="$SYS_VERSION"
+ # XXX HACK - currently 12 is still testing, so we get "n/a"
+ # and then, there is no release for it yet at nvidia. So use debian 11 repo.
+ [ "$vers" = "n/a" ] && vers=11
apts=(
"https://download.docker.com/linux/${SYS_DISTRIBUTION}/gpg deb [arch=$(dpkg --print-architecture) signed-by=%FILE%] https://download.docker.com/linux/$SYS_DISTRIBUTION $(lsb_release -cs) stable"
- "https://nvidia.github.io/nvidia-docker/gpgkey https://nvidia.github.io/nvidia-docker/${SYS_DISTRIBUTION}$(lsb_release -rs)/nvidia-docker.list"
+ "https://nvidia.github.io/nvidia-docker/gpgkey https://nvidia.github.io/nvidia-docker/${SYS_DISTRIBUTION}${vers}/nvidia-docker.list"
)
for i in "${apts[@]}"; do
url="${i%% *}"
diff --git a/core/modules/docker-ce/module.conf.debian b/core/modules/docker-ce/module.conf.debian
new file mode 100644
index 00000000..7b71a6d4
--- /dev/null
+++ b/core/modules/docker-ce/module.conf.debian
@@ -0,0 +1,8 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+ containerd.io
+ docker-ce
+ docker-ce-cli
+ nvidia-container-toolkit
+ docker-compose
+"
diff --git a/core/modules/libvirt-glib/module.conf.debian b/core/modules/libvirt-glib/module.conf.debian
new file mode 100644
index 00000000..f339f37a
--- /dev/null
+++ b/core/modules/libvirt-glib/module.conf.debian
@@ -0,0 +1,13 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+ python3
+ python3-pip
+ debhelper
+ dh-python
+ intltool
+ pkg-config
+ libglib2.0-dev
+ libxml2-dev
+ libgirepository1.0-dev
+ gobject-introspection
+"
diff --git a/core/modules/libvirt-python/module.conf.debian b/core/modules/libvirt-python/module.conf.debian
new file mode 100644
index 00000000..c550b658
--- /dev/null
+++ b/core/modules/libvirt-python/module.conf.debian
@@ -0,0 +1,8 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+ python3
+ debhelper
+ dh-python
+ pkg-config
+ python3-all-dev
+"
diff --git a/core/modules/libvirt-src/module.conf.debian b/core/modules/libvirt-src/module.conf.debian
new file mode 100644
index 00000000..11c11507
--- /dev/null
+++ b/core/modules/libvirt-src/module.conf.debian
@@ -0,0 +1,63 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+ gcc
+ python3
+ python3-pip
+ ninja-build
+ bash-completion
+ debhelper
+ dh-apparmor
+ libxml2-dev
+ libncurses5-dev
+ libreadline-dev
+ zlib1g-dev
+ libgcrypt20-dev
+ libgnutls28-dev
+ libsasl2-dev
+ libxen-dev
+ lvm2
+ open-iscsi
+ libparted-dev
+ parted
+ libdevmapper-dev
+ uuid-dev
+ libudev-dev
+ libattr1-dev
+ libpciaccess-dev
+ kmod
+ policykit-1
+ libcurl4-gnutls-dev
+ libpolkit-gobject-1-dev
+ libcap-ng-dev
+ libnl-3-dev
+ libnl-route-3-dev
+ libyajl-dev
+ libpcap0.8-dev
+ libnuma-dev
+ numad
+ radvd
+ libsanlock-dev
+ libaudit-dev
+ libselinux1-dev
+ libapparmor-dev
+ libdbus-1-dev
+ nfs-common
+ systemtap-sdt-dev
+ xsltproc
+ zfsutils-linux
+ libzfslinux-dev
+ po-debconf
+ librbd-dev
+ librados-dev
+ libglusterfs-dev
+ libfuse-dev
+ augeas-tools
+ libxml2-utils
+ dnsmasq-base
+ openssh-client
+ netcat-openbsd
+ iptables
+ libtirpc-dev
+ genxdr
+ python3-docutils
+"
diff --git a/core/modules/looking-glass-client/module.conf.debian b/core/modules/looking-glass-client/module.conf.debian
new file mode 100644
index 00000000..00a5d1a9
--- /dev/null
+++ b/core/modules/looking-glass-client/module.conf.debian
@@ -0,0 +1,23 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+ gcc
+ pkg-config
+ gawk
+ binutils-dev
+ cmake
+ fonts-freefont-ttf
+ libfontconfig1-dev
+ libgl-dev
+ libgles-dev
+ libegl-dev
+ libgmp-dev
+ libspice-protocol-dev
+ nettle-dev
+ libx11-dev
+ libxpresent-dev
+ libxfixes-dev
+ libxkbcommon-x11-dev
+ libxi-dev
+ libxinerama-dev
+ libxss-dev
+"
diff --git a/core/modules/openjdk-8-jre-headless/module.conf.debian b/core/modules/openjdk-8-jre-headless/module.conf.debian
new file mode 100644
index 00000000..21e699fb
--- /dev/null
+++ b/core/modules/openjdk-8-jre-headless/module.conf.debian
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+REQUIRED_CONTENT_PACKAGES="
+ default-jre-headless
+"
diff --git a/core/modules/pam/module.conf.debian b/core/modules/pam/module.conf.debian
index 8e934bd3..470163e2 100644
--- a/core/modules/pam/module.conf.debian
+++ b/core/modules/pam/module.conf.debian
@@ -7,7 +7,6 @@ REQUIRED_INSTALLED_PACKAGES="
libpam-krb5
libssl-dev
ldap-utils
- libnfsidmap2
nfs-common
libpam0g-dev
cifs-utils
@@ -18,12 +17,12 @@ REQUIRED_CONTENT_PACKAGES="
libpam-modules
libpam-modules-bin
libpam-cap
- libldap-2.4-2
+ libldap-common
+ libnfsidmap1
krb5-user
krb5-config
libpam-krb5
ldap-utils
- libnfsidmap2
nfs-common
cifs-utils
keyutils
diff --git a/core/modules/pulseaudio/module.conf.debian b/core/modules/pulseaudio/module.conf.debian
new file mode 100644
index 00000000..182ec7dd
--- /dev/null
+++ b/core/modules/pulseaudio/module.conf.debian
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+REQUIRED_INSTALLED_PACKAGES="
+ lxqt-build-tools
+ libpulse-dev
+"
+
+REQUIRED_CONTENT_PACKAGES="
+ alsa-tools
+ alsa-utils
+ alsa-topology-conf
+ libasound2
+ libasound2-data
+ libasound2-plugins
+ libpulse0
+ pulseaudio
+ pulseaudio-utils
+"
diff --git a/core/modules/qemu-src/module.conf.debian b/core/modules/qemu-src/module.conf.debian
new file mode 100644
index 00000000..df5dd534
--- /dev/null
+++ b/core/modules/qemu-src/module.conf.debian
@@ -0,0 +1,51 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+ gcc
+ debhelper
+ device-tree-compiler
+ python3
+ python3-pip
+ ninja-build
+ libaio-dev
+ libpulse-dev
+ libasound2-dev
+ libbrlapi-dev
+ libcap-ng-dev
+ libcurl4-gnutls-dev
+ libfdt-dev
+ libgnutls28-dev
+ libgtk-3-dev
+ libvte-2.91-dev
+ libiscsi-dev
+ libncursesw5-dev
+ libvirglrenderer-dev
+ libepoxy-dev
+ libdrm-dev
+ libgbm-dev
+ libnuma-dev
+ libcacard-dev
+ libpixman-1-dev
+ librbd-dev
+ libsasl2-dev
+ libseccomp-dev
+ libslirp-dev
+ libspice-server-dev
+ librdmacm-dev
+ libibverbs-dev
+ libibumad-dev
+ libusb-1.0-0-dev
+ libusbredirparser-dev
+ libssh-dev
+ nettle-dev
+ uuid-dev
+ xfslibs-dev
+ zlib1g-dev
+ libudev-dev
+ libjpeg-dev
+ libpng-dev
+ libpmem-dev
+ liblzo2-dev
+ libzstd-dev
+ libbz2-dev
+ libfuse3-dev
+"
diff --git a/core/modules/qemu/module.conf.debian b/core/modules/qemu/module.conf.debian
new file mode 100644
index 00000000..1853bdf8
--- /dev/null
+++ b/core/modules/qemu/module.conf.debian
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+REQUIRED_INSTALLED_PACKAGES="
+ maven
+ default-jdk-headless
+"
+
+REQUIRED_CONTENT_PACKAGES="
+ jq
+"
diff --git a/core/modules/qt5core/module.conf.debian b/core/modules/qt5core/module.conf.debian
index 56e8cb78..bb7d16a8 100644
--- a/core/modules/qt5core/module.conf.debian
+++ b/core/modules/qt5core/module.conf.debian
@@ -1,7 +1,6 @@
#!/bin/bash
REQUIRED_INSTALLED_PACKAGES="
cmake
- libqt5gui5
libqt5svg5-dev
libqt5x11extras5-dev
qt5-qmake
@@ -9,11 +8,12 @@ REQUIRED_INSTALLED_PACKAGES="
qtbase5-dev-tools
qttools5-dev
qttools5-dev-tools
- qttranslations5-l10n
"
REQUIRED_CONTENT_PACKAGES="
+ gnome-icon-theme
libqt5gui5
libqt5svg5
+ qt5ct
qttranslations5-l10n
"
diff --git a/core/modules/run-virt-docker/module.conf.debian b/core/modules/run-virt-docker/module.conf.debian
new file mode 100644
index 00000000..1c6f5554
--- /dev/null
+++ b/core/modules/run-virt-docker/module.conf.debian
@@ -0,0 +1,2 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="pv"
diff --git a/core/modules/sshd/module.conf.debian b/core/modules/sshd/module.conf.debian
new file mode 100644
index 00000000..31137b90
--- /dev/null
+++ b/core/modules/sshd/module.conf.debian
@@ -0,0 +1,4 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+ openssh-server
+"
diff --git a/core/modules/sssd/module.conf.debian b/core/modules/sssd/module.conf.debian
index cdf9ca36..4df1886a 100644
--- a/core/modules/sssd/module.conf.debian
+++ b/core/modules/sssd/module.conf.debian
@@ -2,14 +2,14 @@
REQUIRED_INSTALLED_PACKAGES="
sssd-common
sssd-ldap
- libldb1
+ libldb2
libnss-sss
libpam-sss
"
REQUIRED_CONTENT_PACKAGES="
sssd-common
sssd-ldap
- libldb1
+ libldb2
libnss-sss
libpam-sss
"
diff --git a/core/modules/sudo/module.conf.debian b/core/modules/sudo/module.conf.debian
index 1fda609e..9e368ff8 100644
--- a/core/modules/sudo/module.conf.debian
+++ b/core/modules/sudo/module.conf.debian
@@ -2,3 +2,6 @@
REQUIRED_CONTENT_PACKAGES="
sudo
"
+REQUIRED_DIRECTORIES="
+ /usr/libexec/sudo
+"
diff --git a/core/modules/swtpm/module.conf.debian b/core/modules/swtpm/module.conf.debian
new file mode 100644
index 00000000..a142e4d7
--- /dev/null
+++ b/core/modules/swtpm/module.conf.debian
@@ -0,0 +1,20 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+ gcc
+ debhelper
+ expect
+ gawk
+ gnutls-bin
+ gnutls-dev
+ openssl
+ libfuse-dev
+ libglib2.0-dev
+ libjson-glib-dev
+ libseccomp-dev
+ libssl-dev
+ libtasn1-dev
+ libtool
+ net-tools
+ socat
+ softhsm2
+"
diff --git a/core/modules/usbguard/module.conf.debian b/core/modules/usbguard/module.conf.debian
new file mode 100644
index 00000000..c0f3817f
--- /dev/null
+++ b/core/modules/usbguard/module.conf.debian
@@ -0,0 +1,23 @@
+REQUIRED_INSTALLED_PACKAGES="
+ asciidoctor
+ autoconf
+ automake
+ libtool
+ g++
+ git
+ libudev-dev
+ libqb-dev
+ libcap-ng-dev
+ libseccomp-dev
+ libprotobuf-dev
+ protobuf-compiler
+ libdbus-1-dev
+ libdbus-glib-1-dev
+ xsltproc
+ libxml2-utils
+ libpolkit-gobject-1-dev
+"
+
+REQUIRED_CONTENT_PACKAGES="
+
+"
diff --git a/core/modules/vbox-src/module.conf.debian b/core/modules/vbox-src/module.conf.debian
index 835b926d..0e471810 100644
--- a/core/modules/vbox-src/module.conf.debian
+++ b/core/modules/vbox-src/module.conf.debian
@@ -4,6 +4,7 @@ REQUIRED_INSTALLED_PACKAGES="
makeself
nasm
genisoimage
+ glslang-tools
libcurl4-openssl-dev
libcap-dev
libdevmapper-dev
@@ -18,11 +19,15 @@ REQUIRED_INSTALLED_PACKAGES="
libopus-dev
usbutils
xsltproc
+ yasm
+"
+REQUIRED_CONTENT_PACKAGES="
+ usb.ids
"
# These are required for building 32-bit guest additions on 64-bit systems
REQUIRED_INSTALLED_PACKAGES_X64_X86="
libc6-dev-i386
- lib32gcc1
+ lib32gcc-s1
lib32stdc++6
gcc-multilib
g++-multilib
diff --git a/core/modules/virt-manager/module.conf.debian b/core/modules/virt-manager/module.conf.debian
new file mode 100644
index 00000000..d9b1ccf7
--- /dev/null
+++ b/core/modules/virt-manager/module.conf.debian
@@ -0,0 +1,20 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+ python3
+ debhelper
+ dh-python
+ gettext
+ python3-distutils
+ python3-docutils
+ cpio
+ genisoimage
+ gir1.2-libosinfo-1.0
+ gir1.2-gtksource-3.0
+ libglib2.0-bin
+ python3-argcomplete
+ python3-gi
+ python3-gi-cairo
+ python3-libxml2
+ python3-pytest
+ python3-requests
+"
diff --git a/core/modules/virt-viewer/module.conf.debian b/core/modules/virt-viewer/module.conf.debian
new file mode 100644
index 00000000..434612d4
--- /dev/null
+++ b/core/modules/virt-viewer/module.conf.debian
@@ -0,0 +1,17 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+ gcc
+ python3
+ python3-pip
+ ninja-build
+ debhelper
+ libgovirt-dev
+ libgtk-vnc-2.0-dev
+ libspice-client-gtk-3.0-dev
+ libxml2-dev
+ libglib2.0-dev
+ libgtk-3-dev
+ libvte-dev
+ libffi-dev
+ intltool
+"
diff --git a/core/modules/vmware12/module.conf.debian b/core/modules/vmware12/module.conf.debian
new file mode 100644
index 00000000..a4726b80
--- /dev/null
+++ b/core/modules/vmware12/module.conf.debian
@@ -0,0 +1,3 @@
+REQUIRED_INSTALLED_PACKAGES="
+ libncursesw5
+"
diff --git a/core/modules/xorg/module.conf b/core/modules/xorg/module.conf
index 219c0381..202a56df 100644
--- a/core/modules/xorg/module.conf
+++ b/core/modules/xorg/module.conf
@@ -3,7 +3,6 @@ REQUIRED_BINARIES="
X
Xorg
gtf
- cvt
setxkbmap
xkbvleds
xkbprint
diff --git a/core/modules/xorg/module.conf.debian b/core/modules/xorg/module.conf.debian
index 4fbb0307..16b15ac0 100644
--- a/core/modules/xorg/module.conf.debian
+++ b/core/modules/xorg/module.conf.debian
@@ -3,7 +3,6 @@ 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
@@ -18,7 +17,7 @@ REQUIRED_INSTALLED_PACKAGES="
x11-utils
xdotool
libinput10
- libwacom2
+ libwacom9
xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
@@ -26,7 +25,6 @@ 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
@@ -36,7 +34,6 @@ REQUIRED_CONTENT_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
@@ -51,6 +48,7 @@ REQUIRED_CONTENT_PACKAGES="
libgbm1
libwayland-client0
libwayland-server0
+ mesa-utils
xkb-data
x11-xkb-utils
x11-xserver-utils
@@ -59,11 +57,11 @@ REQUIRED_CONTENT_PACKAGES="
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-fbdev$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
+ xserver-xorg-video-radeon$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
diff --git a/core/modules/xscreensaver/module.build b/core/modules/xscreensaver/module.build
index 9faba11a..aa986717 100644
--- a/core/modules/xscreensaver/module.build
+++ b/core/modules/xscreensaver/module.build
@@ -28,7 +28,7 @@ build() {
pinfo "Building bwlp-screensaver"
- cmake "$SRCDIR/bwlp-screensaver" || perror "'cmake $SRCDIR/bwlp-screensaver' failed."
+ cmake -DCMAKE_BUILD_TYPE=Release "$SRCDIR/bwlp-screensaver" || perror "'cmake $SRCDIR/bwlp-screensaver' failed."
make || perror "'make' failed."
}
diff --git a/core/targets/bwlp/x11vnc b/core/targets/bwlp/x11vnc
index 61c1bfbd..eb755d19 120000
--- a/core/targets/bwlp/x11vnc
+++ b/core/targets/bwlp/x11vnc
@@ -1 +1 @@
-../../modules/x11vnc-src \ No newline at end of file
+../../modules/x11vnc \ No newline at end of file