diff options
Diffstat (limited to 'os-plugins/plugins/xserver')
| -rw-r--r-- | os-plugins/plugins/xserver/XX_xserver.sh | 2 | ||||
| -rwxr-xr-x | os-plugins/plugins/xserver/files/suse-gfx-install.sh | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index 18c671c3..ceac1f22 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -69,7 +69,7 @@ if [ -e /initramfs/plugin-conf/xserver.conf -a \ cp -r ${PLUGIN_PATH}/etc/* /mnt/etc # if fglrx_dri.so is linked wrong -> we have to link it here - if [ "1" -eq "$( ls -l /usr/lib/dri/fglrx_dri.so \ + if [ "1" -eq "$( ls -l /mnt/usr/lib/dri/fglrx_dri.so \ | grep -o "/var/X11R6.*so$" | wc -l )" ]; then ln -s ${PLUGIN_ROOTFS}/usr/lib/dri/fglrx_dri.so \ ${glliblinks}dri/fglrx_dri.so diff --git a/os-plugins/plugins/xserver/files/suse-gfx-install.sh b/os-plugins/plugins/xserver/files/suse-gfx-install.sh index eb985f47..d1f41c90 100755 --- a/os-plugins/plugins/xserver/files/suse-gfx-install.sh +++ b/os-plugins/plugins/xserver/files/suse-gfx-install.sh @@ -245,6 +245,7 @@ if [ "$1" = "ati" ]; then cd .. rm -rf ${PKG} + buildfglrx ${KVERS} ;; @@ -296,6 +297,18 @@ if [ "$1" = "ati" ]; then esac cd .. + # OpenGl implementation (libGL?) expect fglrx_dri.so in /usr/X11R6/lib/dri/ + if [ ! -f /usr/X11R6/lib/modules/dri/fglrx_dri.so -a \ + ! -f usr/X11R6/lib/modules/dri/fglrx_dri.so ]; then + if [ ! -d /usr/X11R6/lib/modules/dri ]; then + mkdir -p /usr/X11R6/lib/modules/dri + fi + if [ -f usr/lib/dri/fglrx_dri.so ]; then + ln -s ${BASE}/ati/usr/lib/dri/fglrx_dri.so \ + /usr/X11R6/lib/modules/dri/fglrx_dri.so + fi + fi + rm -rf temp/ fi |