diff options
| author | Jonathan Bauer | 2013-01-21 14:48:30 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2013-01-21 14:48:30 +0100 |
| commit | 1981d93c1022204e65a320f18664549e69783f14 (patch) | |
| tree | 1d9224fd1abfb2460ad14617df1fccce7e1dda00 | |
| parent | lightdm configs in data (diff) | |
| download | tm-scripts-1981d93c1022204e65a320f18664549e69783f14.tar.gz tm-scripts-1981d93c1022204e65a320f18664549e69783f14.tar.xz tm-scripts-1981d93c1022204e65a320f18664549e69783f14.zip | |
xorg fixes
| -rwxr-xr-x | remote/setup_tools | 8 | ||||
| -rw-r--r-- | remote/tools/xorg/xorg.conf | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/remote/setup_tools b/remote/setup_tools index bf1ac93e..ed6f58e9 100755 --- a/remote/setup_tools +++ b/remote/setup_tools @@ -59,7 +59,7 @@ copyfileswithdependencies () echo ${FILE} >> ${COPYFILES_LIST} # fetch dependencies # quick fix to exclude libc*, else it copies unneeded libs... - for i in $(ldd ${FILE} |awk '{print $1 $2 $3}'|grep -v ld-linux|grep -v libc.so*|grep -v linux-gate) + for i in $(ldd ${FILE} |awk '{print $1 $2 $3}'|grep -v ld-linux|grep -v libc.so*|grep -v linux-gate|grep -v linux-vdso) do arrIN=(${i//=>/ }) echo "--------------------------------------------------------" @@ -101,7 +101,7 @@ copyfileswithdependencies () echo ".${ENTRY}" >> ${COPYFILES_LIST} for LIB in $(find .${ENTRY} -type f -not -name "*.a" | xargs grep -l ELF) do - for i in $(ldd ${LIB} |awk '{print $1 $2 $3}'|grep -v ld-linux|grep -v libc.so*|grep -v linux-gate) + for i in $(ldd ${LIB} |awk '{print $1 $2 $3}'|grep -v ld-linux|grep -v libc.so*|grep -v linux-gate|grep -v linux-vdso) do arrIN=(${i//=>/ }) echo "--------------------------------------------------------" @@ -217,6 +217,10 @@ clean_tools() { clean_tool() { TOOLDIR=${TOOL_DIR}/$1 echo -n "Cleaning ${TOOLDIR}..." + #[ -e ${TOOLDIR}/build/list_wanted_stage3.2 ] && cd ${INIT_DIR} \ + # && xargs rm < ${TOOLDIR}/build/list_wanted_stage3.2 + #[ -d ${TOOLDIR}/data ] && cd ${INIT_DIR} \ +# && xargs rm < $(find ${TOOLDIR}/data -type f) [ -e ${TOOLDIR}/.built ] && rm ${TOOLDIR}/.built [ -e ${TOOLDIR}/.fetched_source ] && rm ${TOOLDIR}/.fetched_source [ -d ${TOOLDIR}/build ] && rm -rf ${TOOLDIR}/build diff --git a/remote/tools/xorg/xorg.conf b/remote/tools/xorg/xorg.conf index cb2aefa2..97174f64 100644 --- a/remote/tools/xorg/xorg.conf +++ b/remote/tools/xorg/xorg.conf @@ -29,5 +29,5 @@ REQUIRED_PACKAGES=" xserver-xorg xserver-xorg-video-s3 xserver-xorg-video-tdfx" REQUIRED_BINARIES=" Xorg vmwarectrl gtf cvt X xkbcomp xkbvleds xkbprint setxkbmap xkbwatch xkbbell xkbevd vmmouse_detect" -REQUIRED_DIRECTORIES="/lib/udev /usr/lib /usr/share/X11 /usr/lib/i386-linux-gnu/dri" +REQUIRED_DIRECTORIES="/lib/udev /usr/lib /usr/share/X11" REQUIRED_FILES="" |