Merge lp:~joey-jiaojg/livecd-rootfs/trunk into lp:livecd-rootfs

[Joey Jiao]

phablet-dev-bootstrap support only four devices and with this commit, it also supports device still porting.
Meanwhile support multi jobs to build.
Use bash to bypass . build/envsetup.sh error

[lp:~joey-jiaojg/livecd-rootfs/trunk]

693. By Joey Jiao on 2013-04-04

Fix cp for porting device
Reset repo in case builddir not deleted and dirty

[Joey Jiao (joey-jiaojg)]

Add change 693 which fix some porting devices final zip file not in -$DEVICE.zip format

[Oliver Grawert (ogra)]

please stick to POSIX shell when supplying patches to shell scripts ("#!/bin/sh" and also "set -e" need to be set and the patch has various bashisms like the usage of == (use the checkbashisms script to verify the script) and see https://wiki.ubuntu.com/DashAsBinSh )

for the automated builds it is important that we do a fresh repo sync (since we are in a virgin chroot when building) so i guess the git reset vs. repo sync need to be conditional

removing the builddir is essntial on a livefs builder so this needs to always happen in automated builds

if only called with an ubuntu supported defined subarch (mako,maguro,grouper etc) the code needs to function the same as it did before the patch (adding -d isnt an option unless the BuildLiveCD script is updated alongside, an RT ticket is filed with the IS team and all the livefs builders are updated to the modified version of BuildLiveCD (which is a manual process that requires a datacenter admin))

review: Needs Fixing

[Joey Jiao (joey-jiaojg)]

One question:
sh doesn't support source command, but android needs source
build/envsetup.sh, right?

2013/4/9 Oliver Grawert <email address hidden>

> Review: Needs Fixing
>
> please stick to POSIX shell when supplying patches to shell scripts
> ("#!/bin/sh" and also "set -e" need to be set and the patch has various
> bashisms like the usage of == (use the checkbashisms script to verify the
> script) and see https://wiki.ubuntu.com/DashAsBinSh )
>
> for the automated builds it is important that we do a fresh repo sync
> (since we are in a virgin chroot when building) so i guess the git reset
> vs. repo sync need to be conditional
>
> removing the builddir is essntial on a livefs builder so this needs to
> always happen in automated builds
>
> if only called with an ubuntu supported defined subarch
> (mako,maguro,grouper etc) the code needs to function the same as it did
> before the patch (adding -d isnt an option unless the BuildLiveCD script is
> updated alongside, an RT ticket is filed with the IS team and all the
> livefs builders are updated to the modified version of BuildLiveCD (which
> is a manual process that requires a datacenter admin))
> --
> https://code.launchpad.net/~joey-jiaojg/livecd-rootfs/trunk/+merge/157155
> You are the owner of lp:~joey-jiaojg/livecd-rootfs/trunk.
>

--
-Joey Jiao

[Evan (ev)]

On Fri, Apr 12, 2013 at 9:43 AM, Joey Jiao <email address hidden> wrote:
>
> One question:
> sh doesn't support source command, but android needs source
> build/envsetup.sh, right?

`. build/envsetup.sh` is the POSIX equivalent:

http://pubs.opengroup.org/onlinepubs/009695399/utilities/dot.html

[Colin Watson (cjwatson)]

"source" is spelled "." in portable sh.

[Joey Jiao (joey-jiaojg)]

I tried on Ubuntu 12.10 but failed. Any comments
$ echo $SHELL
/bin/bash
$ sh
$ ls
abi build device gdk libnativehelper out
prebuilts vendor
android cts docs hardware log.log packages
sdk
bionic dalvik external kernel Makefile pdk
system
bootable development frameworks libcore ndk prebuilt tools
$ . build/envsetup.sh
sh: 1: build/envsetup.sh: Syntax error: "(" unexpected
$ echo $SHELL
/bin/bash
$ exit

2013/4/12 Colin Watson <email address hidden>

> "source" is spelled "." in portable sh.
>
> --
> https://code.launchpad.net/~joey-jiaojg/livecd-rootfs/trunk/+merge/157155
> You are the owner of lp:~joey-jiaojg/livecd-rootfs/trunk.
>

--
-Joey Jiao

[Oliver Grawert (ogra)]

> I tried on Ubuntu 12.10 but failed. Any comments
> ...

i tested it myself and there will currently be no easy way around all the bash array usage in the android build system. until this is fixed using #!/bin/bash wont be avoidable, i updated the main branch accordingly (please fix the non POIX bits anyway in your commit).

[Colin Watson (cjwatson)]

To clarify: this is not due to using '.' (which remains synonymous with
'source'), but because the code in build/envsetup.sh is itself
bash-specific.

[Dimitri John Ledkov (xnox)]

Do we still need this?

Unmerged revisions

693. By Joey Jiao on 2013-04-04

Fix cp for porting device
Reset repo in case builddir not deleted and dirty

692. By Joey Jiao on 2013-04-04

Fix No such file or directory when cp

691. By Joey Jiao on 2013-04-04

set -e will result in brunch failure

690. By Joey Jiao on 2013-04-04

Use bash interpreter \
As sh will report sh: 1: build/envsetup.sh: Syntax error: "(" unexpected

689. By Joey Jiao on 2013-04-04

- Support phablet-dev-bootstrap options
- Support JOBS for sync and build
- Support local_manifest.xml fetch
- Separate VENDORS for phablet-dev-bootstrap and DEVICE for brunch

688. By Joey Jiao on 2013-04-04

Fix sh interpreter

=== modified file 'ubuntu-touch-android.sh'
--- ubuntu-touch-android.sh	2013-03-28 18:35:11 +0000
+++ ubuntu-touch-android.sh	2013-04-04 20:02:22 +0000
@@ -1,18 +1,67 @@
-!#/bin/sh
-
-set -e
-
-codename=$1
-builddir=$codename-build
-
-[ "$(dpkg --print-architecture)" = "amd64" ] || exit 1
+#!/bin/bash
+
+usage(){
+	cat <<EOF
+usage: $(basename $0) <-d DEVICE> [-v VENDORS] [-h] [-j JOBS] [-p BUILD_JOBS] [-c] [-r REFERENCE]
+
+Phablet build script
+
+Required arguments:
+	-d DEVICE			Target device to build
+
+Optional arguments:
+	-v VENDORS			Comma separated list of devices to Setup such as
+						maguro, manta, mako, grouper
+	-h HELP				Show this help message and exit
+	-j JOBS				Amount of sync jobs
+	-c CONTINUE			Continue a previously started sync
+	-r REFERENCE		Use another dev enviroment as reference for git
+	-l LOCAL_MANIFEST 	Local manifest address
+	-p BUILD_JOBS		Amount of build jobs
+
+EOF
+	exit 1
+}
+
+JOBS=""
+CONTINUE=0
+REFERENCE=""
+LOCAL_MANIFEST=""
+BUILD_JOBS=$(grep processor /proc/cpuinfo | wc -l)
+
+while getopts hd:v:j:cr:l:p: opt; do
+	case $opt in
+		h) usage;;
+		d) DEVICE=$OPTARG;;
+		v) VENDORS=$OPTARG;;
+		j) JOBS=$OPTARG;;
+		c) CONTINUE=1;;
+		r) REFERENCE=$OPTARG;;
+		l) LOCAL_MANIFEST=$OPTARG;;
+		p) BUILD_JOBS=$OPTARG;;
+		*) usage;;
+	esac
+done
+
+[ "$DEVICE" == "" ] && usage
+
+# check if is root
+if [ "$(id -u)" == "0" ]; then
+	SUDO=""
+else
+	SUDO="sudo"
+fi
+
+builddir=phablet-build-$DEVICE
+
+[ "$(dpkg --print-architecture)" == "amd64" ] || exit 1
 
 # set up multiarch
 dpkg --print-foreign-architectures | grep -q i386 || dpkg --add-architecture i386
-apt-get update
+$SUDO apt-get update
 
 # add cross build env including the needed i386 packages
-apt-get -y install git gnupg flex bison gperf build-essential \
+$SUDO 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 \
@@ -20,17 +69,27 @@
 	openjdk-6-jdk
 
 # get the git tree
-phablet-dev-bootstrap -v $codename $builddir
+[ "$VENDORS" == "" ] || ARGS=" -v $VENDORS"
+[ "$JOBS" == "" ] || ARGS="$ARGS -j $JOBS"
+[ "$CONTINUE" == "0" ] || ARGS="$ARGS -c"
+[ "$REFERENCE" == "" ] || ARGS="$ARGS -r $REFERENCE"
+phablet-dev-bootstrap $ARGS $builddir
 
 cd $builddir
-repo sync
+repo forall -c 'git reset --hard && git clean -xdf'
+
+# get local manifest
+[ "$LOCAL_MANIFEST" == "" ] || curl -L -o .repo/local_manifest.xml -O -L $LOCAL_MANIFEST
+
+[ "$JOBS" == "" ] || JOBS=" -j $JOBS"
+repo sync $JOBS
 
 . build/envsetup.sh
-brunch $codename
+brunch $DEVICE -j $BUILD_JOBS
 
 cd -
-cp $builddir/out/target/product/$codename/*-$codename.zip ./livecd.ubuntu-touch-$codename.zip
+cp $builddir/out/target/product/$DEVICE/*-*$DEVICE.zip ./livecd.ubuntu-touch-$DEVICE.zip
 for image in system recovery boot; do
-	cp $builddir/out/target/product/$codename/$image.img ./livecd.ubuntu-touch-$codename.$image.img
+	cp $builddir/out/target/product/$DEVICE/$image.img ./livecd.ubuntu-touch-$DEVICE.$image.img
 done
-rm -rf $buildir
+#rm -rf $builddir