Author: ks156
Date: 2009-05-29 14:24:56 +0200 (Fri, 29 May 2009)
New Revision: 4706
Modified:
software_suite_v2/tuxware/installers/unix/trunk/build.sh
software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile
software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile.amd64
Log:
* Fixed the server launcher
* Fixed the alsalib problem
Modified: software_suite_v2/tuxware/installers/unix/trunk/build.sh
===================================================================
--- software_suite_v2/tuxware/installers/unix/trunk/build.sh 2009-05-29
12:16:25 UTC (rev 4705)
+++ software_suite_v2/tuxware/installers/unix/trunk/build.sh 2009-05-29
12:24:56 UTC (rev 4706)
@@ -7,6 +7,7 @@
DEBIAN_DIR=$BUILD_DIR/DEBIAN
PREINST=$DEBIAN_DIR/preinst
POSTINST=$DEBIAN_DIR/postinst
+PRERM=$DEBIAN_DIR/prerm
CONTROL=$DEBIAN_DIR/control
@@ -205,10 +206,17 @@
packPython32 () {
echo "-- Copying python for 32 bits "
mkdir $MIRROR_DIR/tmp
- wget http://ftp.kysoh.com/apps/installers/unix/python32/Python32.tar.gz -O
\
+ wget http://ftp.kysoh.com/apps/x86_64_compat/python2.6.2/Python32.tar.gz
-O \
$MIRROR_DIR/tmp/Python32.tar.gz
}
+packAlsalib32 () {
+ echo "-- Copying alsa-lib 1.0.20 for 32 bits "
+ mkdir -p $MIRROR_DIR/usr/local/
+ wget
http://ftp.kysoh.com/apps/x86_64_compat/alsa-lib1.0.20/alsa-lib1.0.20.tar.gz -O
\
+ $MIRROR_DIR/tmp/alsalib.tar.gz
+}
+
# Install the python API from SVN
packPythAPI () {
echo "-- Copying the python API"
@@ -377,6 +385,8 @@
serverBin () {
echo "-- Creating server binary"
echo "#!/bin/bash" >$MIRROR_DIR/$PREFIX/$BIN_DIR/tuxhttpserver
+ echo "export LD_LIBRARY_PATH=/usr/local/lib" >> \
+ >> $MIRROR_DIR/$PREFIX/$BIN_DIR/tuxhttpserver
if [ $ARCH == "amd64" ]; then
echo "/opt/Python32/bin/python2.6 $PREFIX/$SERVER_DIR/tuxhttpserver.py"
>> \
$MIRROR_DIR/$PREFIX/$BIN_DIR/tuxhttpserver
@@ -441,10 +451,8 @@
# sed :
# I have to replace $PREFIX (ascii sequence) by the environment
# variable.
- echo $PREFIX
echo $line|cut -d ';' -f 3 |sed "s;\$PREFIX;\\${PREFIX};g" >path
path=`cat path`
- echo $path
rm path
echo $line|cut -d ';' -f 4 |sed "s;\$PREFIX;\\${PREFIX};g" >url
url=`cat url`
@@ -507,6 +515,20 @@
echo " - Tux driver" >> $CONTROL
}
+createPreRmDeb () {
+ echo "Creating pre remove script"
+ echo '/etc/init.d/tuxhttpserver stop
+ rm -r /opt/Python32
+ rm -r /etc/tuxdroid
+ for file in `find /usr/share/tuxdroid -iname "*.py[co]"`; do
+ rm $file
+ done
+ for file in `find /usr/lib/tuxdroid -iname "*.py[co]"`; do
+ rm $file
+ done' > $PRERM
+}
+
+
createPostInstFileDeb () {
echo "Creating post install script"
sed "s;PREFIX=;PREFIX=$PREFIX;g" build_deps/deb/postinst \
@@ -601,6 +623,7 @@
makeDEB () {
createDebianDir
packDebInitScript
+ createPreRmDeb
createPostInstFileDeb
createPreInstFileDeb
createControlFileDeb
@@ -620,59 +643,6 @@
rm filelist
}
-packChatterPlugin () {
- NAME="chatterTux"
- createTemp
- mkdir -p $BUILD_DIR
- mkdir -p $MIRROR_DIR
- mkdir -p $MIRROR_DIR/$PREFIX
- mkdir -p $MIRROR_DIR/$PREFIX/$SERVER_DIR
- mkdir -p $MIRROR_DIR/$PREFIX/$SERVER_DIR/resources
- mkdir -p $MIRROR_DIR/$PREFIX/$SERVER_DIR/chatterTux
- mkdir -p $MIRROR_DIR/$PREFIX/$ATTITUNES_DIR
- packChatterTux
- case $TYPE in
- deb)
- DEPS="libc6(>=2.3), python, python-pcapy, python-impacket"
- createDebianDir
- echo "-- Creating the control file"
- echo "Package: $NAME" >$CONTROL
- echo "Priority: extra" >> $CONTROL
- echo "Section: Application" >> $CONTROL
- SIZE=`du -s $BUILD_DIR |awk '{print $1}'`
- echo "Installed-Size: $SIZE" >> $CONTROL
- echo "Maintainer: KySoH <[email protected]>" >> $CONTROL
- echo "Architecture: $ARCH" >> $CONTROL
- echo "Version: $VERSION" >> $CONTROL
- echo "Depends: $DEPS" >> $CONTROL
- echo "Description: ChatterTux resource for Tux Droid" >> $CONTROL
- echo " This package contains the ChatterTux resource for TuxDroid"
>> \
- $CONTROL
- echo " - ChatterTux" >> $CONTROL
- echo " - pcapy" >> $CONTROL
- echo " - Impacket" >> $CONTROL
- cp ./build_deps/deb/resources/preinstChatterTux $PREINST
- chmod +x $PREINST
- cp ./build_deps/deb/resources/postinstChatterTux $POSTINST
- chmod +x $POSTINST
- packDebian
- ;;
- tar)
- mkdir -p $BUILD_DIR/deps
- wget -q http://oss.coresecurity.com/repo/pcapy-0.10.5.tar.gz
- tar -xvf pcapy-0.10.5.tar.gz -C $BUILD_DIR/deps
- rm pcapy-0.10.5.tar.gz
- wget -q http://oss.coresecurity.com/repo/Impacket-0.9.6.0.tar.gz
- tar -xvf Impacket-0.9.6.0.tar.gz -C $BUILD_DIR/deps
- rm Impacket-0.9.6.0.tar.gz
- sed "s;PREFIX=;PREFIX=$PREFIX;g" \
- build_deps/tar/resources/MakefileChatterTux >$BUILD_DIR/Makefile
- packTarball
- ;;
- esac
- clean
-}
-
NAME="tuxsetup"
TYPE=
VERSION=
@@ -761,6 +731,9 @@
if [ $ARCH == "amd64" ]; then
packPython32
fi
+if [ $TYPE == "deb" ] || [ $ARCH = "amd64" ]; then
+ packAlsalib32
+fi
packPythAPI
#compileDriver
packJavaAPI
@@ -791,5 +764,3 @@
;;
esac
clean
-
-packChatterPlugin
Modified:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile
===================================================================
--- software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile
2009-05-29 12:16:25 UTC (rev 4705)
+++ software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile
2009-05-29 12:24:56 UTC (rev 4706)
@@ -34,6 +34,7 @@
rm -rf tuxisalive setup.py build
chmod 0755 $(PREFIX)/share/tuxdroid/tuxhttpserver/tuxhttpserver.py
chmod 0755 $(PREFIX)/share/tuxdroid/tux_updater/tux_updater
+ tar -xvf /tmp/alsalib.tar.gz -C /usr/local/
echo Done.
uninstall:
Modified:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile.amd64
===================================================================
---
software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile.amd64
2009-05-29 12:16:25 UTC (rev 4705)
+++
software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile.amd64
2009-05-29 12:24:56 UTC (rev 4706)
@@ -35,6 +35,7 @@
chmod 0755 $(PREFIX)/share/tuxdroid/tuxhttpserver/tuxhttpserver.py
chmod 0755 $(PREFIX)/share/tuxdroid/tux_updater/tux_updater
tar -xvf ./mirror/Python32.tar.gz -C /opt/
+ tar -xvf /tmp/alsalib.tar.gz -C /usr/local/
echo Done.
uninstall:
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
