diff options
| -rw-r--r-- | hooks-addons/00main | 19 | ||||
| -rw-r--r-- | hooks-addons/20alsa | 4 | ||||
| -rw-r--r-- | hooks-addons/50xorg | 4 | ||||
| -rw-r--r-- | hooks-addons/51dri | 2 | ||||
| -rw-r--r-- | hooks-addons/70tcosmonitor | 15 |
5 files changed, 26 insertions, 18 deletions
diff --git a/hooks-addons/00main b/hooks-addons/00main index 0921053..9344c9e 100644 --- a/hooks-addons/00main +++ b/hooks-addons/00main @@ -115,27 +115,28 @@ cpifexists /etc/securetty /etc cpifexists /etc/services /etc/ # create (if not exists) empty modules file -touch $DESTDIR/etc/modules +touch $DESTDIR/etc/modules mkdir -p $DESTDIR/usr/lib +mkdir -p $DESTDIR/${USRLIB_MULTIARCH} $DESTDIR/${LIB_MULTIARCH} # multiarch support LIB_DIR=/lib/ -[ -e /lib/${MULTIARCH}/libresolv.so.2 ] && LIB_DIR=/lib/${MULTIARCH} +[ -e $LIB_MULTIARCH/libresolv.so.2 ] && LIB_DIR=$LIB_MULTIARCH -cpifexists ${LIB_DIR}/libresolv.so.2 /lib/ -cpifexists /usr/${LIB_DIR}/libgssapi_krb5.so.2 /usr/lib/ +cpifexists ${LIB_DIR}/libresolv.so.2 ${LIB_DIR}/ +cpifexists ${USRLIB_MULTIARCH}/libgssapi_krb5.so.2 ${USRLIB_MULTIARCH}/ # need to copy this libs to support usernames with busybox -cpifexists ${LIB_DIR}/libnss_compat.so.2 /lib/ -cpifexists ${LIB_DIR}/libnss_files.so.2 /lib/ -cpifexists ${LIB_DIR}/libnss_nis.so.2 /lib/ -cpifexists ${LIB_DIR}/libnss_dns.so.2 /lib/ +cpifexists ${LIB_DIR}/libnss_compat.so.2 ${LIB_DIR}/ +cpifexists ${LIB_DIR}/libnss_files.so.2 ${LIB_DIR}/ +cpifexists ${LIB_DIR}/libnss_nis.so.2 ${LIB_DIR}/ +cpifexists ${LIB_DIR}/libnss_dns.so.2 ${LIB_DIR}/ [ -e ${LIB_DIR}/libnss_db.so.2 ] && cpifexists ${LIB_DIR}/libnss_db.so.2 /usr/lib/ # new lib (needed for DNS calls) [ -e /lib/libnss_mdns4_minimal.so.2 ] && cpifexists /lib/libnss_mdns4_minimal.so.2 /lib/ - +[ -e ${LIB_DIR}/libnss_mdns4_minimal.so.2 ] && cpifexists ${LIB_DIR}/libnss_mdns4_minimal.so.2 ${LIB_DIR}/ # needed for NFS diff --git a/hooks-addons/20alsa b/hooks-addons/20alsa index 59e74a4..4c79d3c 100644 --- a/hooks-addons/20alsa +++ b/hooks-addons/20alsa @@ -51,7 +51,9 @@ else ALSA_LIB_DIR=/usr/lib/alsa-lib/ - [ -d $LIB_MULTIARCH/alsa-lib ] && ALSA_LIB_DIR=$LIB_MULTIARCH/alsa-lib + [ -d $USRLIB_MULTIARCH/alsa-lib ] && ALSA_LIB_DIR=$USRLIB_MULTIARCH/alsa-lib + + _verbose "(20alsa) alsa-lib=$ALSA_LIB_DIR" mkdir -p ${DESTDIR}/$ALSA_LIB_DIR [ -e $ALSA_LIB_DIR/libasound_module_pcm_pulse.so ] && \ diff --git a/hooks-addons/50xorg b/hooks-addons/50xorg index 9b692cf..28ce7d8 100644 --- a/hooks-addons/50xorg +++ b/hooks-addons/50xorg @@ -174,8 +174,8 @@ 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 diff --git a/hooks-addons/51dri b/hooks-addons/51dri index 5a60abb..f15fc1a 100644 --- a/hooks-addons/51dri +++ b/hooks-addons/51dri @@ -10,7 +10,7 @@ #TCOS_XORG_DRI_MATROX= DRI_DIR=/usr/lib/dri/ -[ -d $LIB_MULTIARCH/dri ] && DRI_DIR=$LIB_MULTIARCH/dri/ +[ -d $USRLIB_MULTIARCH/dri ] && DRI_DIR=$USRLIB_MULTIARCH/dri/ mkdir -p ${DESTDIR}/${DRI_DIR} diff --git a/hooks-addons/70tcosmonitor b/hooks-addons/70tcosmonitor index fa179cb..831a205 100644 --- a/hooks-addons/70tcosmonitor +++ b/hooks-addons/70tcosmonitor @@ -11,11 +11,16 @@ copy_exec /usr/bin/eject /usr/bin/ # SCROT package copy_exec /usr/bin/scrot /usr/bin/ -mkdir -p $DESTDIR/usr/lib/imlib2/filters/ -mkdir -p $DESTDIR/usr/lib/imlib2/loaders/ -cpifexists /usr/lib/imlib2/loaders/png.so /usr/lib/imlib2/loaders/ -cpifexists /usr/lib/imlib2/loaders/jpeg.so /usr/lib/imlib2/loaders/ -#cpifexists /usr/lib/imlib2/loaders/gif.so /usr/lib/imlib2/loaders/ + +IMLIB_DIR=/usr/lib/imlib2/loaders/ +[ -d $USRLIB_MULTIARCH/imlib2/loaders ] && IMLIB_DIR=$USRLIB_MULTIARCH/imlib2/loaders +#/usr/lib/x86_64-linux-gnu/imlib2/loaders/png.so + + +mkdir -p $DESTDIR/$IMLIB_DIR +cpifexists $IMLIB_DIR/png.so $IMLIB_DIR/ +cpifexists $IMLIB_DIR/jpeg.so $IMLIB_DIR/ + # screenshot script and webserver cpifexists ${TCOS_BINS}/screenshot.sh /sbin/ |