on xenial help sign in
fix run_on_device for raring
496bb7aMichał Sawicz
run_on_device+3−2
@@ -33,6 +33,7 @@ exec_with_ssh() {
33exec_with_adb() {
33exec_with_adb() {
34 adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
34 adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
35}
35}
36+
36adb_root() {
37adb_root() {
37 adb root
38 adb root
38 adb wait-for-device
39 adb wait-for-device
@@ -55,11 +56,10 @@ setup_adb_forwarding() {
55
56
56install_dependencies() {
57install_dependencies() {
57 exec_with_adb apt-get -y install openssh-server
58 exec_with_adb apt-get -y install openssh-server
58− exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache gdb ninja-build
59+ exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache gdb ninja-build devscripts equivs
59 exec_with_ssh $SUDO add-apt-repository -y ppa:canonical-qt5-edgers/qt5-proper
60 exec_with_ssh $SUDO add-apt-repository -y ppa:canonical-qt5-edgers/qt5-proper
60 exec_with_ssh $SUDO add-apt-repository -s -y ppa:phablet-team/ppa
61 exec_with_ssh $SUDO add-apt-repository -s -y ppa:phablet-team/ppa
61 exec_with_ssh $SUDO apt-get update
62 exec_with_ssh $SUDO apt-get update
62− exec_with_ssh $SUDO apt-get -y build-dep $PACKAGE
63}
63}
64
64
65sync_code() {
65sync_code() {
@@ -69,6 +69,7 @@ sync_code() {
69}
69}
70
70
71build() {
71build() {
72+ exec_with_ssh $SUDO mk-build-deps -B -i $CODE_DIR/debian/control
72 exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build"
73 exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build"
73}
74}
74
75