Enabling experimental GL driver modifies library path.

This commit is contained in:
spl 2016-06-09 15:09:05 +01:00
parent efdfcc1e66
commit 0de0f6307c

View File

@ -1092,7 +1092,7 @@ do_gldriver() {
if [ $RET -eq $CURRENT ]; then if [ $RET -eq $CURRENT ]; then
ASK_TO_REBOOT=1 ASK_TO_REBOOT=1
fi fi
if [ $RET -eq 0 ]; then # disable driver if [ $RET -eq 0 ]; then # enable driver
sed $CONFIG -i -e "s/^#dtoverlay=vc4-kms-v3d/dtoverlay=vc4-kms-v3d/" sed $CONFIG -i -e "s/^#dtoverlay=vc4-kms-v3d/dtoverlay=vc4-kms-v3d/"
if ! grep -q -E "^dtoverlay=vc4-kms-v3d" $CONFIG; then if ! grep -q -E "^dtoverlay=vc4-kms-v3d" $CONFIG; then
printf "dtoverlay=vc4-kms-v3d\n" >> $CONFIG printf "dtoverlay=vc4-kms-v3d\n" >> $CONFIG
@ -1107,11 +1107,15 @@ Exec=xcompmgr -a
EOF EOF
mv /usr/share/X11/xorg.conf.d/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ mv /usr/share/X11/xorg.conf.d/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~
sed $CONFIG -i -e "s/^gpu_mem/#gpu_mem/" sed $CONFIG -i -e "s/^gpu_mem/#gpu_mem/"
mv /etc/ld.so.conf.d/00-vmcs.conf /etc/ld.so.conf.d/z00-vmcs.conf
ldconfig
STATUS=enabled STATUS=enabled
elif [ $RET -eq 1 ]; then #enable driver elif [ $RET -eq 1 ]; then # disable driver
sed $CONFIG -i -e "s/^dtoverlay=vc4-kms-v3d/#dtoverlay=vc4-kms-v3d/" sed $CONFIG -i -e "s/^dtoverlay=vc4-kms-v3d/#dtoverlay=vc4-kms-v3d/"
rm /etc/xdg/autostart/xcompmgr.desktop rm /etc/xdg/autostart/xcompmgr.desktop
mv /usr/share/X11/xorg.conf.d/99-fbturbo.~ /usr/share/X11/xorg.conf.d/99-fbturbo.conf mv /usr/share/X11/xorg.conf.d/99-fbturbo.~ /usr/share/X11/xorg.conf.d/99-fbturbo.conf
mv /etc/ld.so.conf.d/z00-vmcs.conf /etc/ld.so.conf.d/00-vmcs.conf
ldconfig
STATUS=disabled STATUS=disabled
else else
return $RET return $RET