diff options
| author | Bastian Wissler | 2008-10-28 15:37:05 +0100 |
|---|---|---|
| committer | Bastian Wissler | 2008-10-28 15:37:05 +0100 |
| commit | 52d66d3997879f885699d4497f93fa806aaa5cb6 (patch) | |
| tree | 0baf0c520b45b0d334f9b1dffa110640e98d0e8c /os-plugins | |
| parent | xserver: * better linkage.sh-Skript / * fixed suse-gfx-install.sh-Skript (diff) | |
| download | core-52d66d3997879f885699d4497f93fa806aaa5cb6.tar.gz core-52d66d3997879f885699d4497f93fa806aaa5cb6.tar.xz core-52d66d3997879f885699d4497f93fa806aaa5cb6.zip | |
xserver: * fixed linkage.sh
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2373 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rwxr-xr-x | os-plugins/plugins/xserver/files/linkage.sh | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/os-plugins/plugins/xserver/files/linkage.sh b/os-plugins/plugins/xserver/files/linkage.sh index 4c999a4a..2cb9d0a2 100755 --- a/os-plugins/plugins/xserver/files/linkage.sh +++ b/os-plugins/plugins/xserver/files/linkage.sh @@ -66,20 +66,12 @@ divert() { for lib in $(find ${ROOT} -wholename \ "*/xorg/modules" -prune -a '!' -type d -o -name '*so*'); do -<<<<<<< .mine # strip leading ROOT - to get e.g.: "/usr/lib/libGL.so.1.2" stripstr ${lib} ${ROOT} rlib=${VAL} # strip leading /usr/lib/ - name for /var/X11R6/lib stripstr ${rlib} ${RR} divname=${VAL} -======= - if [ -e "${cmplib}" -a -e "${lib}" ]; then - # system folder conflicts with ROOT - linkMesa ${cmplib} - continue - fi ->>>>>>> .r2371 echo "${lib} ${rlib} ${divname} after stripping" |