Merge lp:~cjwatson/phablet-tools/click-buddy-pass-framework into lp:phablet-tools

[Colin Watson]

click-buddy: Pass -f$FRAMEWORK to click chroot.

click-buddy needs to pass -f$FRAMEWORK to click chroot, otherwise: (a) it isn't possible to use it to build apps for the ubuntu-sdk-14.04 framework; (b) I can't change the default framework in click chroot without breaking click-buddy.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/300/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/72

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/300/rebuild

review: Approve (continuous-integration)

=== modified file 'click-buddy'
--- click-buddy	2014-02-24 22:39:42 +0000
+++ click-buddy	2014-04-08 13:04:26 +0000
@@ -155,8 +155,8 @@
 		echo "click chroot still doesn\'t support sessions and deps outside the"
 		echo "default sdk were requested, you can optionally use click maint"
 		echo "to install $EXTRA_DEPS by running"
-		echo "    click chroot -a$ARCH maint apt-get update"
-		echo "    click chroot -a$ARCH maint apt-get install $EXTRA_DEPS"
+		echo "    click chroot -a$ARCH -f$FRAMEWORK maint apt-get update"
+		echo "    click chroot -a$ARCH -f$FRAMEWORK maint apt-get install $EXTRA_DEPS"
 		echo
 		echo "Your chroot will be unclean from then on, so if you want to"
 		echo "guarantee clean builds the chroot would need to be recreated."
@@ -166,14 +166,14 @@
 	fi
 	cd "$SOURCE"
 	if [ -n "$MAINTMODE" ]; then
-		trap 'click chroot -a$ARCH maint apt-get autoremove --yes $EXTRA_DEPS' \
+		trap 'click chroot -a$ARCH -f$FRAMEWORK maint apt-get autoremove --yes $EXTRA_DEPS' \
 		   	EXIT HUP INT TERM
-		click chroot -a$ARCH maint apt-get update
-		click chroot -a$ARCH maint apt-get install --yes $EXTRA_DEPS
+		click chroot -a$ARCH -f$FRAMEWORK maint apt-get update
+		click chroot -a$ARCH -f$FRAMEWORK maint apt-get install --yes $EXTRA_DEPS
 	fi
-	click chroot -a$ARCH run cmake $CMAKE_PARAMS
-	click chroot -a$ARCH run make
-    click chroot -a$ARCH run make DESTDIR=$installdir install
+	click chroot -a$ARCH -f$FRAMEWORK run cmake $CMAKE_PARAMS
+	click chroot -a$ARCH -f$FRAMEWORK run make
+    click chroot -a$ARCH -f$FRAMEWORK run make DESTDIR=$installdir install
 fi
 
 if [ ! -f "$installdir/manifest.json" ]; then