From: Heiko Z. <smi...@us...> - 2008-02-22 15:22:24
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5625/scripts Modified Files: Tag: rel-1-2-patches open-vm-tools Log Message: - updated open-vm-tools to 2008.02.13-7792 Index: open-vm-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/open-vm-tools,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- open-vm-tools 20 Oct 2007 12:46:08 -0000 1.1.2.2 +++ open-vm-tools 22 Feb 2008 15:22:18 -0000 1.1.2.3 @@ -27,38 +27,38 @@ case $1 in build ) if [ "$CONFIG_OPEN_VM_TOOLS" = "y" ]; then - ./configure --prefix=/usr --disable-multimon --without-x || exit 1 - #make LDFLAGS=-liconv all || exit 1 - make all || exit 1 - echo "DONE" - exit 1 - - mkdir -p /lib/modules/$KERNELVERSION || exit 1 - ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/build || exit 1 - make || exit 1 + CC="gcc -U_FORTIFY_SOURCE -fno-PIE" LDFLAGS=-liconv ./configure --prefix=/usr --without-x || exit 1 + make all modules || exit 1 fi ;; install ) if [ "$CONFIG_OPEN_VM_TOOLS" = "y" ]; then - mkdir -p $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1 - cp -v vmmemctl-$KERNELVERSION $CDDIR/lib/modules/$KERNELVERSION/misc/vmmemctl.o || exit 1 - mkdir -p $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/net/ || exit 1 - cp -v vmxnet-$KERNELVERSION $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/net/vmxnet.o || exit 1 - - VMBINDIR=$(find_src_dir vmbin) - cp -dpvR $VMBINDIR/{lib,sbin} $CDDIR/usr/ || exit 1 - mkdir -p $ETCDIR/etc/vmware-tools || exit 1 - cp -dpvR $VMBINDIR/etc/* $ETCDIR/etc/ || exit 1 - cp $MYDIR/scripts/vmware $ETCDIR/etc/init.d || exit 1 + cp -dpvR libguestlib/.libs/libguestlib.so* $CDDIR/usr/lib/ || exit 1 - echo "# Load VMWare drivers?" >> $CONFIGFILE - #echo "# the driver will autodetect if we're running within a VM" >> $CONFIGFILE - #echo "# so you can safely leave this on" >> $CONFIGFILE - echo "START_VMWARE=no" >> $CONFIGFILE - echo >> $CONFIGFILE - echo "HELP_VMWARE=\"Load the vmware modules for better performance\"" >> $SOFTWAREHELP - + # copy all the binaries and put a vmware- in front of it + SBINS="guestd/guestd checkvm/checkvm hgfsclient/hgfsclient hgfsmounter/hgfsmounter xferlogs/xferlogs" + for SBIN in ${SBINS} ; + do + cp -dpv $SBIN $CDDIR/usr/sbin/vmware-${SBIN##*/} + done + + # now lets catch all the modules + mkdir -p $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1 + cp -dpv $(find modules/ -name \*.ko) $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1 + + mkdir -p $ETCDIR/etc/vmware-tools || exit 1 + cp -dpv scripts/linux/* $ETCDIR/etc/vmware-tools/ || exit 1 + chmod 775 $ETCDIR/etc/vmware-tools/* || exit 1 + + cp $MYDIR/scripts/vmware $ETCDIR/etc/init.d/ || exit 1 + + echo "# Load VMWare drivers?" >> $CONFIGFILE + #echo "# the driver will autodetect if we're running within a VM" >> $CONFIGFILE + #echo "# so you can safely leave this on" >> $CONFIGFILE + echo "START_VMWARE=no" >> $CONFIGFILE + echo >> $CONFIGFILE + echo "HELP_VMWARE=\"Load the vmware modules for better performance\"" >> $SOFTWAREHELP fi ;; |