diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-10 19:19:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-10 19:19:22 +0000 |
| commit | 45b61a7c4ee13ad54160657959d539bb627b75f6 (patch) | |
| tree | 036b9b4ebac40d0428168bd11c368d6aae36d80d /builds | |
| parent | ec42d15792f1de070e4836e33d2dd69c837566dd (diff) | |
Try to allow 64-bit deb builds too.
Diffstat (limited to 'builds')
| -rwxr-xr-x | builds/chroot-deb | 13 | ||||
| -rwxr-xr-x | builds/deb | 14 |
2 files changed, 20 insertions, 7 deletions
diff --git a/builds/chroot-deb b/builds/chroot-deb index a0f5f7d85..c7cc4641d 100755 --- a/builds/chroot-deb +++ b/builds/chroot-deb @@ -1,17 +1,24 @@ #!/bin/bash -e UBUNTU_VERSION=$1 -if [ "$UBUNTU_VERSION" == "" ]; then - echo "Syntax: $0 <ubuntu version>" +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 + cp builds/control-$UBUNTU_VERSION debian/control ./waf dist 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 "dvdomatic_$VERSION-1_$CPU.deb video extra" > debian/files rm -rf build/deb mkdir -p build/deb diff --git a/builds/deb b/builds/deb index fa98f349c..bb7e33cce 100755 --- a/builds/deb +++ b/builds/deb @@ -7,6 +7,12 @@ if [ "$UBUNTU_VERSION" == "" -o "$BITS" == "" ]; then 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` @@ -18,9 +24,9 @@ echo "tarball: $TARBALL" echo "version: $VERSION" 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" +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_i386.deb to build/deb/$ID" -sudo ls -lh $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_i386.deb -sudo cp -v $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_i386.deb 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/ |