From 3598c9da49868a3a1343cb3e3ce45f7a0ebb873e Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 5 Nov 2023 11:27:38 +0100 Subject: [PATCH] Makefile.defs: updated --- Makefile.defs | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 8ebb9ae..a97f916 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -21,6 +21,14 @@ shadow-extra = util-linux /usr/bin/chsh = util-linux /usr/bin/su = util-linux +# procps-ng vs procps-ng3 +/bin/kill = procps-ng +/bin/pidof = procps-ng +/bin/ps = procps-ng +/usr/bin/kill = procps-ng +/usr/bin/pidof = procps-ng +/usr/bin/ps = procps-ng + /usr/bin/python3 = python3 /usr/bin/ruby = ruby @@ -149,11 +157,11 @@ libvdpau.so.1 = libvdpau libvdpau_trace.so.1 = libvdpau libsystemd-shared-252.so = libsystemd libsystemd-shared-252.so[SD_SHARED] = libsystemd -xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev \ - xorg-drv-video-ati xorg-drv-video-nouveau \ - xorg-drv-video-mach64 xorg-drv-video-mga xorg-drv-video-neomagic \ - xorg-drv-video-openchrome xorg-drv-video-r128 xorg-drv-video-s3virge xorg-drv-video-savage xf86-video-modesetting \ - xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo xorg-drv-video-amdgpu $(xorgproprietary) +xorgdrvvideo = xf86-video-ast xf86-video-cirrus xf86-video-dummy xorg-drv-video-fbdev \ + xorg-drv-video-ati xf86-video-nouveau \ + xf86-video-mach64 xf86-video-mga xf86-video-neomagic \ + xorg-drv-video-openchrome xf86-video-r128 xf86-video-s3virge xf86-video-savage xf86-video-modesetting \ + xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-amdgpu $(xorgproprietary) # xorg-drv-video-intel # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo bootloader = syslinux @@ -217,10 +225,11 @@ libGLcore.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia libvdpau.so.1[][64bit] = libvdpau libvdpau_trace.so.1[][64bit] = libvdpau -xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-ati xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev \ - xorg-drv-video-mach64 xorg-drv-video-mga xorg-drv-video-neomagic xorg-drv-video-nouveau \ - xorg-drv-video-openchrome xorg-drv-video-r128 xorg-drv-video-s3virge xorg-drv-video-savage xf86-video-modesetting \ - xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo $(xorgproprietary) +xorgdrvvideo = xf86-video-ast xf86-video-cirrus xf86-video-dummy xorg-drv-video-fbdev \ + xorg-drv-video-ati xf86-video-nouveau \ + xf86-video-mach64 xf86-video-mga xf86-video-neomagic \ + xorg-drv-video-openchrome xf86-video-r128 xf86-video-s3virge xf86-video-savage xf86-video-modesetting \ + xf86-video-vesa xf86-video-vmware xf86-video-voodoo xf86-video-amdgpu $(xorgproprietary) # xorg-drv-video-intel bootloader = syslinux endif