Phablet Tools

Merge lp:~ogra/phablet-tools/phablet-bootchart-fix into lp:phablet-tools

  1. phablet-bootchart-fix
  2. Merge into trunk
Proposed by Oliver Grawert
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 333
Merged at revision: 332
Proposed branch: lp:~ogra/phablet-tools/phablet-bootchart-fix
Merge into: lp:phablet-tools
Diff against target: 40 lines (+9/-5)
1 file modified
phablet-bootchart (+9/-5)
To merge this branch: bzr merge lp:~ogra/phablet-tools/phablet-bootchart-fix
Reviewer Review Type Date Requested Status
Christopher Lee (community) Approve
Ricardo Salveti (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+240564@code.launchpad.net

Commit message

update phablet-bootchart for new developer mode and password handling (LP: #1384450)

Description of the change

adjust phablet-bootchart for new developer mode and password handling

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/422/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/103

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

review: Approve (continuous-integration)
lp:~ogra/phablet-tools/phablet-bootchart-fix updated
333. By Oliver Grawert

force skipping of flash-kernel, some arches are unsupported in that tool, make sure the cleaning of the bootchart output dir uses the sudoo password

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:333
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/423/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/104

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

review: Approve (continuous-integration)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

LGTM

review: Approve
Revision history for this message
Christopher Lee (veebers) wrote :

I just tried this branch out and it doesn't work for me, I get the same error as the initial bug:
http://pastebin.ubuntu.com/8842093/

Revision history for this message
Christopher Lee (veebers) wrote :

> I just tried this branch out and it doesn't work for me, I get the same error
> as the initial bug:
> http://pastebin.ubuntu.com/8842093/
Also forgot to mentino that I tried this manually on my device and it still failed with the mentioend error:

$ FLASH_KERNEL_SKIP=true sudo apt-get install bootchart

Revision history for this message
Oliver Grawert (ogra) wrote :

this is the wrong order, the var needs to be inside the sudo call ... hmm, and that might actually be an issue with the script ... (exporting in the users env via ~/.,profile wont help either)
(try: sudo FLASH_KERNEL_SKIP=true apt-get install bootchart)

lp:~ogra/phablet-tools/phablet-bootchart-fix updated
334. By Oliver Grawert

use an explicit install commend for the bootchart package and make sure FLASH_KERNEL_SKIP=true is ending up in the right environment

Revision history for this message
Oliver Grawert (ogra) wrote :

latest change should meake it work everywhere.

Revision history for this message
Christopher Lee (veebers) wrote :

Oops, yeah I copied and pasted the wrong command, I tried both.

But I just tried the updated branch and it works for me! Thanks for fixing that.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'phablet-bootchart'
2--- phablet-bootchart 2014-06-19 15:08:19 +0000
3+++ phablet-bootchart 2014-11-06 11:14:05 +0000
4@@ -55,7 +55,7 @@
5 adb $ADBOPTS reboot bootloader || \
6 ERROR="can not reboot to bootloader" exit 1
7 fi
8- FLASHOPTS="--channel devel-proposed --bootstrap --wipe"
9+ FLASHOPTS="--developer-mode --password 0000 --channel devel-proposed --bootstrap"
10 [ -n "$1" ] && FLASHOPTS="${FLASHOPTS} --revision $1"
11 ubuntu-device-flash $FLASHOPTS
12 adb $ADBOPTS wait-for-device
13@@ -114,11 +114,15 @@
14 phablet-network $PNOPTS || \
15 ERROR="need working network on the device" exit 1
16
17-echo "Making Image writable and installing bootchart"
18-phablet-config writable-image -p bootchart || \
19- ERROR="could not install bootchart package" exit 1
20+echo "Making Image writable"
21+phablet-config writable-image || \
22+ ERROR="could not make image writable" exit 1
23 reboot_and_wait 30
24
25+echo "Installing bootchart"
26+adb $ADBOPTS shell "echo 0000|sudo -p \"\" -S \
27+ FLASH_KERNEL_SKIP=true apt-get install -yq --force-yes bootchart"
28+
29 echo "Disabling Welcome Wizard"
30 phablet-config welcome-wizard --disable || \
31 ERROR="could not disable welcome wizard" exit 1
32@@ -131,7 +135,7 @@
33 reboot_and_wait 60
34 reboot_and_wait 60
35 reboot_and_wait 1
36-adb $ADBOPTS shell rm -rf /var/log/bootchart/*
37+adb $ADBOPTS shell "echo 0000|sudo -p \"\" -S rm -rf /var/log/bootchart/*"
38 sleep 60
39
40 echo "Pulling and processing bootchart tarball"

Subscribers

People subscribed via source and target branches