[Devil-linux-commit] build/scripts GateOne, NONE, 1.1 MySQL-python, 1.6, 1.7 backports.ssl_match_hostname, 1.1, 1.2 build.sh, 1.114, 1.115 certifi, 1.1, 1.2 futures, 1.1, 1.2 html5lib, 1.1, 1.2 kid, 1.5, 1.6 setuptools, 1.1, 1.2 tornado, 1.1, 1.2

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

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7124/scripts

Modified Files:
	MySQL-python backports.ssl_match_hostname build.sh certifi 
	futures html5lib kid setuptools tornado 
Added Files:
	GateOne 
Log Message:
added gateone
fixed python installs


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- build.sh	30 Jan 2015 12:35:30 -0000	1.114
+++ build.sh	31 Jan 2015 22:37:00 -0000	1.115
@@ -17,10 +17,10 @@
 source $DL_DIR/scripts/settings
 
 # make sure all the needed mounts are done
-mount -t proc none /proc
-mount -t sysfs none /sys
+mount | grep "/proc" > /dev/null || mount -t proc none /proc
+mount | grep "/sys" > /dev/null || mount -t sysfs none /sys
 mkdir -p /dev/shm
-#mount -t tmpfs none /dev/shm
+mount | grep "/dev/shm" > /dev/null || mount -t tmpfs none /dev/shm
 
 # make sure /tmp has the correct rights
 chmod 1777 /tmp

Index: tornado
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/tornado,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tornado	24 Jan 2015 21:08:16 -0000	1.1
+++ tornado	31 Jan 2015 22:37:00 -0000	1.2
@@ -25,8 +25,8 @@
 
 	install )
 		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
-			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
-			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
+		    export PYTHONPATH=$(ls -d ${CDDIR}/usr/lib/python*/site-packages)
+		    python setup.py install --prefix=$CDDIR/usr || exit 1
 		fi
 		;;
 

Index: futures
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/futures,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- futures	24 Jan 2015 21:08:15 -0000	1.1
+++ futures	31 Jan 2015 22:37:00 -0000	1.2
@@ -25,8 +25,7 @@
 
 	install )
 		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
-			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
-			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
+			python setup.py install --root=$CDDIR || exit 1
 		fi
 		;;
 

--- NEW FILE: GateOne ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/GateOne,v $
# $Revision: 1.1 $
# $Date: 2015/01/31 22:37:00 $
#
# http://www.devil-linux.org

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

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

# source functions and config
source $MYDIR/settings

MYNAME=PYTHON_LDAP

case $1 in
	build )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_GATEONE" = "y" ] ; then
			python setup.py build || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_GATEONE" = "y" ] ; then
			python setup.py install --root=$CDDIR || exit 1
			
			cp $MYDIR/scripts/gateone $ETCDIR/etc/init.d/ || exit 1
		fi
		;;

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


Index: MySQL-python
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/MySQL-python,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- MySQL-python	5 Dec 2011 09:11:37 -0000	1.6
+++ MySQL-python	31 Jan 2015 22:37:00 -0000	1.7
@@ -26,9 +26,7 @@
 
 	install )
 		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_MYSQL_CLIENT" = "y" ] ; then
-			PYTHONDIR=$(ls -d /usr/lib/python*.*/site-packages)
-			mkdir -p $CDDIR/$PYTHONDIR || exit 1
-			cp -dvpR build/lib*/* $CDDIR/$PYTHONDIR/ || exit 1
+			python setup.py install --root=$CDDIR || exit 1
 		fi
 		;;
 

Index: setuptools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/setuptools,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setuptools	24 Jan 2015 21:08:16 -0000	1.1
+++ setuptools	31 Jan 2015 22:37:00 -0000	1.2
@@ -26,8 +26,7 @@
 
 	install )
 		if [ "$CONFIG_PYTHON" = "y" ] ; then
-			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
-			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
+			python setup.py install --root=$CDDIR || exit 1
 		fi
 		;;
 

Index: certifi
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/certifi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- certifi	24 Jan 2015 21:08:15 -0000	1.1
+++ certifi	31 Jan 2015 22:37:00 -0000	1.2
@@ -25,8 +25,7 @@
 
 	install )
 		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
-			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
-			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
+			python setup.py install --root=$CDDIR || exit 1
 		fi
 		;;
 

Index: backports.ssl_match_hostname
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/backports.ssl_match_hostname,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- backports.ssl_match_hostname	24 Jan 2015 21:08:15 -0000	1.1
+++ backports.ssl_match_hostname	31 Jan 2015 22:37:00 -0000	1.2
@@ -25,8 +25,7 @@
 
 	install )
 		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
-			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
-			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
+			python setup.py install --root=$CDDIR || exit 1
 		fi
 		;;
 

Index: html5lib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/html5lib,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- html5lib	24 Jan 2015 21:08:15 -0000	1.1
+++ html5lib	31 Jan 2015 22:37:00 -0000	1.2
@@ -25,8 +25,7 @@
 
 	install )
 		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
-			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
-			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
+			python setup.py install --root=$CDDIR || exit 1
 		fi
 		;;
 

Index: kid
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/kid,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kid	18 Oct 2014 13:27:11 -0000	1.5
+++ kid	31 Jan 2015 22:37:00 -0000	1.6
@@ -26,8 +26,8 @@
 
 	install )
 		if [ "$CONFIG_PYTHON" = "y" ] ; then
-			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
-			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
+			export PYTHONPATH=$(ls -d ${CDDIR}/usr/lib/python*/site-packages)
+			python setup.py install --prefix=$CDDIR/usr || exit 1
 		fi
 		;;