mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-15 20:25:17 +03:00
63 lines
4.1 KiB
Diff
63 lines
4.1 KiB
Diff
TODO: remove me when usr-bin-merge happened
|
|
---
|
|
From a12b01f4f71d7ca1ed528ea11f99520c10b0d93c Mon Sep 17 00:00:00 2001
|
|
From: Newbyte <newbie13xd@gmail.com>
|
|
Date: Tue, 14 Mar 2023 19:37:17 +0100
|
|
Subject: [PATCH 1/2] DOWNSTREAM: use /bin/touch and /bin/rm instead of /usr/bin/touch and /ust/bin/rm
|
|
|
|
as that's the path here in Alpine.
|
|
---
|
|
data/61-gdm.rules.in | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
|
|
index a4f841bdf..481c5b4dd 100644
|
|
--- a/data/61-gdm.rules.in
|
|
+++ b/data/61-gdm.rules.in
|
|
@@ -2,13 +2,13 @@
|
|
ACTION!="bind", ACTION!="add", GOTO="gdm_pci_device_end"
|
|
|
|
# cirrus
|
|
-ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
|
+ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
|
# virtio
|
|
-ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
|
+ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
|
# qxl
|
|
-ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
|
+ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
|
# vga
|
|
-ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
|
+ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
|
|
|
# disable Wayland on Hi1710 chipsets
|
|
ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
|
|
@@ -21,7 +21,7 @@
|
|
SUBSYSTEM!="drm", GOTO="gdm_hardware_gpu_end"
|
|
DRIVERS=="simple-framebuffer", GOTO="gdm_hardware_gpu_end"
|
|
IMPORT{parent}="GDM_MACHINE_HAS_VIRTUAL_GPU"
|
|
-ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
|
|
+ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
|
|
LABEL="gdm_hardware_gpu_end"
|
|
|
|
# The vendor nvidia driver has multiple modules that need to be loaded before GDM can make an
|
|
@@ -30,7 +30,7 @@
|
|
KERNEL!="nvidia", GOTO="gdm_nvidia_end"
|
|
SUBSYSTEM!="module", GOTO="gdm_nvidia_end"
|
|
ACTION!="add", GOTO="gdm_nvidia_end"
|
|
-RUN+="/usr/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
|
|
+RUN+="/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
|
|
|
|
# Import nvidia kernel parameters
|
|
IMPORT{program}="/bin/sh -c \"sed -e 's/: /=/g' -e 's/\([^[:upper:]]\)\([[:upper:]]\)/\1_\2/g' -e 's/[[:lower:]]/\U&/g' -e 's/^/NVIDIA_/' /proc/driver/nvidia/params\""
|
|
@@ -59,8 +59,8 @@
|
|
SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
|
|
ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
|
|
IMPORT{program}="/bin/sh -c \"echo GDM_NUMBER_OF_GRAPHICS_CARDS=`ls -1d /sys/class/drm/card[0-9] | wc -l`\""
|
|
-ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
|
|
-ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
|
|
+ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
|
|
+ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
|
|
LABEL="gdm_hybrid_graphics_check_end"
|
|
|
|
# Disable wayland in situation where we're in a guest with a virtual gpu and host passthrough gpu
|