1 files changed, 33 insertions, 20 deletions
diff --git a/tools/buildbinaries b/tools/buildbinaries
index 0301cd7..2a5236c 100644
--- a/tools/buildbinaries
+++ b/tools/buildbinaries
@@ -1,46 +1,59 @@
 #!/bin/bash
 
 set -e
+set -x
 
-VERSION=31.2.0
-JAILDIR="/home/systems/gnuzilla/jails/toutatis"
-ARCHS="i386 amd64"
+if [ $# != 1 ]; then
+  echo E: pass the source dir as parameter
+  exit 1
+fi
 
-rm binaries -rf
 mkdir binaries
 
-for ARCH in $ARCHS; do
-  [ -f $JAILDIR-$ARCH/proc/cpuinfo ] || mount -t proc none $JAILDIR-$ARCH/proc
-  mount -t tmpfs -o size=20G none $JAILDIR-$ARCH/root/
-  cp icecat-$VERSION -a $JAILDIR-$ARCH/root/
+for ARCH in i386 amd64; do
+
+cp -a $1 binaries/$ARCH
+mkdir binaries/$ARCH/temp
 
-  cat << EOF > $JAILDIR-$ARCH/root/buildscript
+cat << EOF > binaries/$ARCH/run.sh
 set -e
 set -x
 
-export LANG=C
-cd /root/icecat-$VERSION
-mkdir temp
-cd temp
+if [ $ARCH = "i386" ]; then
+for BIN in /bin/uname /usr/bin/arch ; do
+cp \$BIN \$BIN.orig
+cat << EOF2 > \$BIN
+#!/bin/bash
+\$BIN.orig "\\\$@" | sed s/x86_64/i686/g
+EOF2
+chmod 755 \$BIN
+done
+fi
 
+cd $PWD/binaries/$ARCH/temp
+apt-get -q -y --yes build-dep firefox
 ../configure --with-l10n-base=\$PWD/../l10n --enable-official-branding --disable-crashreporter --disable-gnomevfs --enable-gio --disable-debug --enable-gstreamer=0.10 --with-distribution-id=org.gnu --disable-updater
-make -j8
+make -j7
 
 cd browser/installer
 make
 
+[ $ARCH = "i386" ] && exit 0
 cd ../locales
 for locale in \$(ls ../../../l10n/ -1); do
 make langpack-\$locale LOCALE_MERGEDIR=.
 done
 EOF
 
-  chroot $JAILDIR-$ARCH /bin/bash /root/buildscript
-  cp $JAILDIR-$ARCH/root/icecat-$VERSION/temp/dist/icecat*.tar.bz2 binaries
-  [ $ARCH = i386 ] && cp $JAILDIR-$ARCH/root/icecat-$VERSION/temp/dist/linux-*/xpi/ -a binaries/langpacks
-
-  umount $JAILDIR-$ARCH/root/ || true
-  umount $JAILDIR-$ARCH/proc || true
 
+env -i TERM=screen eatmydata sudo HOME=/home/ruben BUILDDIST=toutatis ARCH=$ARCH pbuilder execute $PWD/binaries/$ARCH/run.sh
 done
 
+mv binaries build
+mkdir -p binaries/langpacks
+cp build/i386/temp/dist/icecat-* binaries
+cp build/amd64/temp/dist/icecat-* binaries
+cp build/amd64/temp/dist/linux-x86_64/xpi/icecat-* binaries/langpacks
+cp icecat-*.tar.bz2 binaries
+rm binaries/*.json binaries/*.txt
+