diff options
author | Dimitri John Ledkov <dimitri.ledkov@canonical.com> | 2013-12-31 13:28:27 +0000 |
---|---|---|
committer | Dimitri John Ledkov <dimitri.ledkov@canonical.com> | 2013-12-31 13:28:27 +0000 |
commit | 9b4f2dd391d79f67fbff8627d7217f003105dfab (patch) | |
tree | 82a07d69e72baa942283bc332b5d4456a52fbc1a /hooks-addons/50xorg | |
parent | 85e11fb132b2b81b50a45647b070e8f6fd648d65 (diff) | |
parent | de57566ca38d821454f8df4dfe36f4820c8fbaa4 (diff) |
Merge tag 'tcos-0.89.93' into dgit/sidHEADdebian/0.89.93master
0.89.93
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 |