Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

some more virtual cleanup #1272

Merged
merged 3 commits into from Feb 3, 2017
Merged

some more virtual cleanup #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
def647d
xorg-server: adjust vmware rules
lrusak Feb 3, 2017
a2e3b5b
xf86-video-vmware: move open-vm-tools dependency
lrusak Feb 3, 2017
2d67790
config/graphic: cleanup unused option
lrusak Feb 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion config/graphic
View file
Open in desktop
Expand Up @@ -74,7 +74,6 @@ get_graphicdrivers() {
DRI_DRIVERS="$DRI_DRIVERS,swrast"
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
XORG_DRIVERS="$XORG_DRIVERS vmware"
# LLVM_SUPPORT="yes"
fi

done
Expand Down
8 changes: 8 additions & 0 deletions packages/virtual/virtual/package.mk
View file
Open in desktop
Expand Up @@ -29,3 +29,11 @@ PKG_LONGDESC="virtual is a Meta package to install Virtual project extra depende

PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

get_graphicdrivers

for drv in $GRAPHIC_DRIVERS; do
if [ "$drv" = "vmware" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET open-vm-tools"
fi
done
2 changes: 1 addition & 1 deletion packages/x11/driver/xf86-video-vmware/package.mk
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ PKG_ARCH="x86_64"
PKG_LICENSE="OSS"
PKG_SITE="http://www.vmware.com"
PKG_URL="http://xorg.freedesktop.org/releases/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_TARGET="toolchain mesa glu libX11 xorg-server open-vm-tools"
PKG_DEPENDS_TARGET="toolchain mesa glu libX11 xorg-server"
PKG_SECTION="x11/driver"
PKG_SHORTDESC="xf86-video-vmware: The Xorg driver for vmware video"
PKG_LONGDESC="xf86-video-vmware: The Xorg driver for vmware video"
Expand Down
7 changes: 1 addition & 6 deletions packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
View file
Open in desktop
Expand Up @@ -20,19 +20,14 @@ ACTION!="add|change", GOTO="end_video"

# xorg_start only does something for subsystem "pci" and "video" class.
SUBSYSTEM=="pci", ATTR{class}=="0x030000", GOTO="subsystem_pci"
SUBSYSTEM=="drivers", GOTO="subsystem_drivers"
GOTO="end_video"

# check for drivers dont use the pci substem
LABEL="subsystem_drivers"
KERNEL=="vmwgfx", ENV{xorg_driver}="vmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vmware.service"
GOTO="end_video"

# check for drivers using the pci substem
LABEL="subsystem_pci"
DRIVER=="i915", ENV{xorg_driver}="i915", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@i915.service"
DRIVER=="amdgpu", ENV{xorg_driver}="amdgpu", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@amdgpu.service"
DRIVER=="radeon", ENV{xorg_driver}="radeon", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@radeon.service"
DRIVER=="vmwgfx", ENV{xorg_driver}="vmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vmware.service"
GOTO="end_video"

LABEL="end_video"