[Devil-linux-commit] build/scripts vmmemctl,1.1,1.2 vmxnet,1.1,1.2 php,1.14,1.15

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22719/scripts

Modified Files:
	php 
Added Files:
	vmmemctl vmxnet 
Log Message:
- updated cipe to v1.6.0
- added vmware modules (vmxnet & vmmemctl)
- enabled php multibyte support


--- NEW FILE: vmxnet ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/vmxnet,v $
# $Revision: 1.2 $
# $Date: 2006/04/05 19:19:23 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       vmxnet
# Required-Start: $basebuildtools $libs linux
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings


case $1 in
	build )
		if [ "$CONFIG_VMWARE" = "y" ]; then
			mkdir -p /lib/modules/$KERNELVERSION || exit 1
			ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/build || exit 1
			make || exit 1
		fi
	        ;;

	install )
		if [ "$CONFIG_VMWARE" = "y" ]; then
			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
			echo "# Load VMWare drivers?" >> $CONFIGFILE
			echo "START_VMWARE=no" >> $CONFIGFILE
			echo >> $CONFIGFILE
			echo "HELP_VMWARE=\"Load the vmware modules for better performance\"" >> $SOFTWAREHELP
									
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac


Index: php
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- php	29 Jul 2005 20:35:32 -0000	1.14
+++ php	5 Apr 2006 19:19:23 -0000	1.15
@@ -29,12 +29,13 @@
 	build )
 		IMAPDIR=$(find_src_dir imap)
 		if [ "$CONFIG_PHP" = "y" ]; then
-			CC="gcc -lpthread" ./configure --with-apxs2=/usr/sbin/apxs --with-mysql=/usr --disable-cgi --with-openssl --with-zlib --with-bz2 --enable-calendar \
+			./configure --with-apxs2=/usr/sbin/apxs --with-mysql=/usr --disable-cgi --with-openssl --with-zlib --with-bz2 --enable-calendar \
 				--with-jpeg-dir=/usr --enable-dba --with-gdbm --with-db4 --with-inifile --with-flatfile --with-dom --with-dom-xslt \
 				--with-config-file-path=/etc --with-dom-exslt --enable-ftp --with-gd --with-gmp \
 				--enable-gd-native-ttf --with-ldap --with-mcrypt --with-mhash --with-pgsql --with-snmp \
-				--with-imap=$IMAPDIR --with-imap-ssl --with-openssl --with-iconv --with-gettext \
-				--sysconfdir=/etc --with-config-file-path=/etc --prefix=/usr || exit 1
+				--with-imap=$IMAPDIR --with-imap-ssl --with-openssl --with-iconv \
+				--sysconfdir=/etc --with-config-file-path=/etc --prefix=/usr --with-gettext \
+				--enable-mbstring || exit 1
 			#
 			# not working --enable-xslt --with-kerberos
 			# do not use --with-cyrus
@@ -45,20 +46,20 @@
 
 	install )
 		if [ "$CONFIG_PHP" = "y" ]; then
-			rm -rf $TMPDIR
-			mkdir -p $TMPDIR/etc
-			cp -dpR $ETCDIR/etc/apache2 $TMPDIR/etc
-			make install INSTALL_ROOT=$TMPDIR
-			replace_str $TMPDIR/etc/apache2/httpd.conf ${WORKDIR#*/}/tmp/usr /usr
-			rm $TMPDIR/etc/apache2/httpd.conf.bak
-			rm $TMPDIR/etc/apache2/httpd.conf.old
-			cp -dp $TMPDIR/etc/apache2/httpd.conf $ETCDIR/etc/apache2/
+			rm -rf $WORKDIR/tmp
+			mkdir -p $WORKDIR/tmp/etc
+			cp -dpR $ETCDIR/etc/apache2 $WORKDIR/tmp/etc
+			make install INSTALL_ROOT=$WORKDIR/tmp
+			replace_str $WORKDIR/tmp/etc/apache2/httpd.conf ${WORKDIR#*/}/tmp/usr /usr
+			rm $WORKDIR/tmp/etc/apache2/httpd.conf.bak
+			rm $WORKDIR/tmp/etc/apache2/httpd.conf.old
+			cp -dp $WORKDIR/tmp/etc/apache2/httpd.conf $ETCDIR/etc/apache2/
 			cp -dp php.ini-dist $ETCDIR/etc/php.ini || exit 1
-			rm -rf $TMPDIR/usr/include || exit 1
-			cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
-			copy_docs $TMPDIR/
-			cp -dpR $TMPDIR/usr/* $CDDIR/usr/ || exit 1
-			rm -rf $TMPDIR || exit 1
+			rm -rf $WORKDIR/tmp/usr/include || exit 1
+			cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
+			copy_docs $WORKDIR/tmp/
+			cp -dpR $WORKDIR/tmp/usr/* $CDDIR/usr/ || exit 1
+			rm -rf $WORKDIR/tmp || exit 1
 
 		fi
 		;;

--- NEW FILE: vmmemctl ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/vmmemctl,v $
# $Revision: 1.2 $
# $Date: 2006/04/05 19:19:23 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       vmmemctl
# Required-Start: $basebuildtools $libs linux
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings


case $1 in
	build )
		if [ "$CONFIG_VMWARE" = "y" ]; then
			mkdir -p /lib/modules/$KERNELVERSION || exit 1
			ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/build || exit 1
			make || exit 1
		fi
	        ;;

	install )
		if [ "$CONFIG_VMWARE" = "y" ]; then
			mkdir -p $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1
			cp -v vmmemctl-$KERNELVERSION $CDDIR/lib/modules/$KERNELVERSION/misc/vmmemctl.o || exit 1
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac