diff --git a/debian/changelog b/debian/changelog index e7d9cefc..77397524 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.131) UNRELEASED; urgency=low * drop hardcoded packagelists for ubuntu-touch, this is dealt with by the ubuntu-touch seed/task/metapackage + * drop android build script, we will instead use a package -- Oliver Grawert Tue, 07 May 2013 14:19:03 +0200 diff --git a/ubuntu-touch-android.sh b/ubuntu-touch-android.sh deleted file mode 100755 index 76ba937e..00000000 --- a/ubuntu-touch-android.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -set -e - -codename=$1 -builddir=$codename-build -release=raring - -[ "$(dpkg --print-architecture)" = "amd64" ] || exit 1 - -# set up a build chroot -case $(hostname --fqdn) in - *.buildd) - MIRROR=http://ftpmaster.internal/ubuntu - ;; - *) - MIRROR=http://archive.ubuntu.com/ubuntu - ;; -esac -debootstrap --components=main,universe $release $builddir $MIRROR - -mkdir -p $builddir/dev/pts -mount -t devpts devpts $builddir/dev/pts -chroot $builddir mount -t proc proc /proc -chroot $builddir mount -t sysfs sys /sys - -# set up multiarch inside the chroot -chroot $builddir dpkg --add-architecture i386 -chroot $builddir apt-get update - -# add cross build env including the needed i386 packages -chroot $builddir apt-get -y install git gnupg flex bison gperf build-essential \ - zip bzr curl libc6-dev libncurses5-dev:i386 x11proto-core-dev \ - libx11-dev:i386 libreadline6-dev:i386 libgl1-mesa-glx:i386 \ - libgl1-mesa-dev g++-multilib mingw32 tofrodos phablet-tools \ - python-markdown libxml2-utils xsltproc zlib1g-dev:i386 schedtool \ - openjdk-6-jdk - -# create an in chroot script to get the git tree and build it -cat << 'EOF' > $builddir/build-android.sh -#!/bin/bash - -phablet-dev-bootstrap -v $codename $builddir -cd $builddir -repo sync -. build/envsetup.sh -brunch $codename -EOF - -chmod +x $builddir/build-android.sh - -chroot $builddir /build-android.sh - -cp $builddir/$builddir/out/target/product/$codename/*-$codename.zip ./livecd.ubuntu-touch-$codename.zip -for image in system recovery boot; do - cp $builddir/$builddir/out/target/product/$codename/$image.img ./livecd.ubuntu-touch-$codename.$image.img -done - -umount -l $builddir/sys -umount -l $builddir/proc -umount -l $builddir/dev/pts - -rm -rf $builddir