X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=builds%2Fdeb;h=763dd55e861e886a5372e759aba691a3fa543232;hb=c7292767fe4935da750423461a41224b3e0a8e37;hp=2289bbbb368314e8ac8294f0b266021f16b23815;hpb=2e296a18d68d9f6922a9b40e921426eb69889a03;p=dcpomatic.git

diff --git a/builds/deb b/builds/deb
index 2289bbbb3..763dd55e8 100755
--- a/builds/deb
+++ b/builds/deb
@@ -1,21 +1,33 @@
-#!/bin/bash -e
+#!/bin/bash
 
-./waf dist
+UBUNTU_VERSION=$1
+BITS=$2
+if [ "$UBUNTU_VERSION" == "" -o "$BITS" == "" ]; then
+  echo "Syntax: $0 <ubuntu version> <bits>"
+  exit 1
+fi
+
+if [ "$BITS" == 32 ]; then
+  CPU=i386
+else
+  CPU=amd64
+fi
+
+ID=$UBUNTU_VERSION-$BITS
+CHROOT=/home/carl/Environments/ubuntu-$ID
 TARBALL=`ls -1 *.tar.bz2`
 VERSION=`echo $TARBALL | sed -e 's/^dvdomatic-\(.*\).tar.bz2/\1/'`
 
-echo "dvdomatic_$VERSION-1_i386.deb video extra" > debian/files
+echo "ID: $ID"
+echo "chroot: $CHROOT"
+echo "tarball: $TARBALL"
+echo "version: $VERSION"
 
-rm -rf build/deb
-mkdir -p build/deb
-cd build/deb
-mv ../../*.tar.bz2 .
-DEB_TARBALL="dvdomatic_$VERSION.orig.tar.bz2"
-echo "Renaming $TARBALL to $DEB_TARBALL"
-mv $TARBALL $DEB_TARBALL
-tar xjf $DEB_TARBALL
-cd dvdomatic-*
-dpkg-source -b .
-dpkg-buildpackage
-cp ../*.deb ../../../
+sudo cp *.tar.bz2 $CHROOT/root/
+sudo schroot -c "ubuntu-$ID" -d /root -u root -- /bin/sh -c "tar xjf dvdomatic-$VERSION.tar.bz2 && cd dvdomatic-$VERSION && builds/chroot-deb $UBUNTU_VERSION $BITS"
+mkdir -p build/deb/$ID/
+echo "Copying $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_$CPU.deb to build/deb/$ID"
+sudo ls -lh $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_$CPU.deb
+sudo cp -v $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_$CPU.deb build/deb/$ID/
+ls -lh build/deb/$ID