diff options
Diffstat (limited to 'hooks-addons/50xorg')
| -rw-r--r-- | hooks-addons/50xorg | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/hooks-addons/50xorg b/hooks-addons/50xorg index b99b9aa..7a178b2 100644 --- a/hooks-addons/50xorg +++ b/hooks-addons/50xorg @@ -159,8 +159,10 @@ done rm -f $DESTDIR/usr/lib/xorg/modules/extensions/libglx.so* rm -f $DESTDIR/usr/lib/xorg/modules/libwfb.so rm -f $DESTDIR/usr/lib/xorg/modules/libnvidia-wfb.so.* -rm -rf $DESTDIR/usr/lib/xorg/modules/extensions/libGLcore.so -rm -rf $DESTDIR/usr/lib/libnvidia-* +rm -f $DESTDIR/usr/lib/xorg/modules/extensions/libGLcore.so +rm -f $DESTDIR/usr/lib/libnvidia-* +rm -f ${DESTDIR}/etc/modprobe.d/nvidia* + # for multiarch rm -rf $DESTDIR/usr/lib/*/libnvidia-* @@ -172,9 +174,11 @@ if [ -e /usr/lib/mesa/libGL.so.1 ]; then LIBGL_PATH=/usr/lib/mesa/ fi +MULTIARCH=$(basename $LIB_MULTIARCH) # multiarch support -[ -e $LIB_MULTIARCH/libGL.so.1 ] && LIBGL_PATH=$LIB_MULTIARCH -[ -e $LIB_MULTIARCH/mesa/libGL.so.1 ] && LIBGL_PATH=$LIB_MULTIARCH/mesa/ +[ -e $USRLIB_MULTIARCH/libGL.so.1 ] && LIBGL_PATH=$USRLIB_MULTIARCH +[ -e $USRLIB_MULTIARCH/mesa/libGL.so.1 ] && LIBGL_PATH=$USRLIB_MULTIARCH/mesa/ +[ -e "/usr/lib/mesa-diverted/$MULTIARCH/libGL.so.1" ] && LIBGL_PATH="/usr/lib/mesa-diverted/$MULTIARCH/" # delete vnc extension rm -f $DESTDIR/usr/lib/xorg/modules/extensions/libvnc.so |