+++ This bug was initially created as a clone of Bug #896145 +++ +++ This bug was initially created as a clone of Bug #893724 +++ With the cloned bug fixed, we can make |./flash.sh gaia| do flash only without (re)-building gaia.

Code to simplify: https://github.com/mozilla-b2g/B2G/blob/master/flash.sh#L251-L269

Comment on attachment 8408094 [details] mozilla-b2g:master PR#18410 With bug 896145 fixed, we can remove the .b2g.mk added in bug 893724. I will submit patch to B2G repo and make ./flash.sh gaia call |make push| instead of |make install-gaia|.

This is the intended change for |./flash.sh|. I did some clean up here too because the only important thing to figure out here is GAIA_INSTALL_PARENT. I think we have a problem here though. I think the B2G repo is not versioned, so this change will not work with release branches of Gaia. If we want to fix that we need something creative, like grep the Gaia Makefile for "push: " to figure out what to call. Alternatively we could patch all branches of Gaia, but I don't know whether or not it's feasible.

I don't think we actually want to do pushing separately from building - the real problem is that building takes way too long. Not to say a separate push command isn't useful, but it seems like it's more of a shortcut around the slow build system in most cases. The gaia build should try to avoid rebuilding what hasn't changed. As to compatibility, I think we can run make push, check the return code, and then do make install-gaia if make push failed.

(In reply to Michael Wu [:mwu] from comment #5) > I don't think we actually want to do pushing separately from building - the > real problem is that building takes way too long. Not to say a separate push > command isn't useful, but it seems like it's more of a shortcut around the > slow build system in most cases. The gaia build should try to avoid > rebuilding what hasn't changed. Fix is on the way for that. So, hey, |push| might one day obsolete :) > As to compatibility, I think we can run make push, check the return code, > and then do make install-gaia if make push failed. I will cancel review of the B2G repo part of the patch and add that.

Comment on attachment 8408103 [details] ./flash.sh changes Set r? again

Comment on attachment 8408103 [details] ./flash.sh changes Just one thing - I think that we should default to installing to /system if we can't determine if gaia is installed to /data/ via /data/local/webapps/webapps.json. This would cover the case where there is no profile to check, so gaia might currently be installed in /system.

mozilla-b2g/B2G:master: https://github.com/mozilla-b2g/B2G/commit/6b939817194724473c47d596994087b8f1cd6466 gaia:master: https://github.com/mozilla-b2g/gaia/commit/651ade1a3105038c5d742f69ac3e600413ab1185