Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Re-implement "morph init" using the new Workspace class | Lars Wirzenius | 2013-07-31 | 3 | -45/+64 | |
| | | | | | | | | | | | | | | Move "morph init" into a plugin, and remove it from the previously existing plugin. This keeps all the old, tricky code in the old plugin, and moves new, clean code into a new plugin. Eventually the old plugin can be removed, since it'll be empty. | |||||
| * | Add a Workspace class | Lars Wirzenius | 2013-07-31 | 3 | -0/+190 | |
|/ | ||||||
* | Merge branch 'liw/b-and-m-yarns' | Lars Wirzenius | 2013-07-31 | 5 | -0/+875 | |
|\ | | | | | | | | | Briefly reviewed by Jonathan Maw and Tiago Gomes, but all responsibility is mine. | |||||
| * | Refactor code for clarity | Lars Wirzenius | 2013-07-31 | 1 | -4/+4 | |
| | | | | | | | | Reported-by: Tiago Gomes | |||||
| * | Remove commented out debug statements | Lars Wirzenius | 2013-07-31 | 1 | -2/+0 | |
| | | | | | | | | Reported-by: Jonathan Maw | |||||
| * | Add scenario (yarn) tests for most of branching and merging | Lars Wirzenius | 2013-07-30 | 5 | -0/+877 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These scenarios test the basics of most of the subcommands the branch and merge plugin provides. They don't purport to be complete, but give some indication that things work, and form a basis upon which further things can be built. Yarn also isn't included in a Baserock release yet, so we need to keep the cmdtests until Baserock 10 has been released. The existing cmdtest tests are not modified by this: they are left intact, until they can analysed in detail for things to be added to the scenarios. After that, the cmdtest tests will start to go away. Merging is not covered by these tests: it is not clear how merge should work, and the current code is known to do the wrong thing in many cases. Scenarios for merge will be added later. Building is also not covered. Testing builds well needs some additional, careful thinking, and that isn't ready for this patch series. It will be added later. | |||||
* | | Fix copyright year | Lars Wirzenius | 2013-07-31 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/jonathan/cross-bootstrap-rebase' | Lars Wirzenius | 2013-07-31 | 19 | -217/+641 | |
|\ \ | ||||||
| * | | Add morph cross-bootstrap | Sam Thursfield | 2013-07-30 | 19 | -217/+641 | |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross-bootstrap is a way to build baserock on an architecture that does not currently have Baserock. It can be used by `morph cross-bootstrap <ARCH> <REPO> <REF> <MORPH>`, and will build an artifact that can be used as a root filesystem with a basic build environment with a script named `native-bootstrap` which will build and install every chunk in the system. If done with a devel system, this will give you a suitable environment for building a proper Baserock system. This does not currently provide a kernel for the target architecture. Apart from adding the cross-bootstrap plugin, it also makes the following changes: * Moves the lit of valid_archs into morphlib (instead of locally-scoped in MorphologyFactory) * BuildCommand takes an extra argument, build_env * split BuildCommand's get_artifact_object into create_source_pool and resolve_artifacts (plus changes things that use get_artifact_object to use the new way) * setup_mounts finds out whether to do so by whether build_mode is 'staging', instead of by whether the setting 'staging-chroot' is true. * Makes ChunkBuilder's get_sources use the morphlib.builder2.extract_sources() method, and moved set_mtime_recursively into morphlib.builder2, since it's not currently used anywhere else. * moved ChunkBuilder's get_commands into the Morphology class (plus changes to anything that used get_commands) | |||||
* | | Merge branch 'jonathan/check-lorried-gitmodules-3' | Jonathan Maw | 2013-07-25 | 1 | -0/+121 | |
|\ \ | |/ |/| | | | Reviewed-by: Richard Maw <richard.maw@codethink.co.uk> | |||||
| * | Add a script to check every .gitmodules file in a system branch | Jonathan Maw | 2013-07-25 | 1 | -0/+121 | |
|/ | ||||||
* | Add ARGS to the foreach argument synopsis | Tiago Gomes | 2013-07-22 | 1 | -2/+2 | |
| | ||||||
* | Fix up code formatting | Lars Wirzenius | 2013-07-22 | 1 | -3/+4 | |
| | ||||||
* | show short sha of local cached artifact | Paul Sherwood | 2013-07-22 | 1 | -2/+3 | |
| | ||||||
* | Merge branch 'liw/copyright-years' | Lars Wirzenius | 2013-07-18 | 3 | -3/+3 | |
|\ | | | | | | | Pre-reviewed by Daniel Silverstone. | |||||
| * | Fix copyright years | Lars Wirzenius | 2013-07-18 | 3 | -3/+3 | |
|/ | ||||||
* | Merge branch 'liw/fix-localhost-in-tests' | Lars Wirzenius | 2013-07-18 | 5 | -5/+5 | |
|\ | | | | | | | Reviewed-by: Daniel Silverstone | |||||
| * | Use 127.0.0.1 instead of localhost | Lars Wirzenius | 2013-07-18 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | We do not currently install an /etc/hosts in Baserock, and thus the name localhost is not guaranteed to resolve as expected. This patch changes the tests to use 127.0.0.1 instead, since that is the IP address we want localhost to resolve to. | |||||
| * | Add missing copyright year | Lars Wirzenius | 2013-07-18 | 1 | -1/+1 | |
| | | ||||||
| * | Add missing copyright year | Lars Wirzenius | 2013-07-18 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'baserock/richardmaw/bugfix/trovectl-cannot-add-sshkey' | Richard Maw | 2013-07-18 | 1 | -1/+1 | |
|\ \ | |/ |/| | | | Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk> | |||||
| * | Pass stdin to ssh command, so trovectl can add ssh keys | Richard Maw | 2013-07-18 | 1 | -1/+1 | |
| | | ||||||
* | | Import morphlib as we are using morphlib.Error | Tiago Gomes | 2013-07-17 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'baserock/tiagogomes/gen-anifest2' | Tiago Gomes | 2013-07-12 | 1 | -1/+2 | |
|\ \ | ||||||
| * | | Fixups for the Manifest generator | Tiago Gomes | 2013-07-12 | 1 | -1/+2 | |
|/ / | ||||||
* | | Strip trailing whitespace in READMEbaserock-9 | Jonathan Maw | 2013-07-09 | 1 | -14/+14 | |
|/ | ||||||
* | Merge branch 'liw/subcommand-docs-2' | Lars Wirzenius | 2013-07-05 | 10 | -41/+618 | |
|\ | | | | | | | | | Reviewed by most of the team. This has their feedback incorporated. | |||||
| * | Improve docstring for "morph generate-manifest" | Lars Wirzenius | 2013-07-05 | 1 | -2/+29 | |
| | | ||||||
| * | Improve docstring for "morph tag" | Lars Wirzenius | 2013-07-05 | 1 | -1/+22 | |
| | | ||||||
| * | Improve docstring for "morph trovectl" | Lars Wirzenius | 2013-07-05 | 1 | -1/+22 | |
| | | ||||||
| * | Improve docstring for "morph show-dependencies" | Lars Wirzenius | 2013-07-05 | 1 | -1/+12 | |
| | | ||||||
| * | Improve docstring for "morph run-in-artifact" | Lars Wirzenius | 2013-07-05 | 1 | -1/+14 | |
| | | ||||||
| * | Improve docstring for "morph copy-artifacts" | Lars Wirzenius | 2013-07-05 | 1 | -2/+24 | |
| | | ||||||
| * | Improve docstring for "morph list-artifacts" | Lars Wirzenius | 2013-07-05 | 1 | -2/+15 | |
| | | ||||||
| * | Improve docstring for "morph expand-repo" | Lars Wirzenius | 2013-07-05 | 1 | -3/+21 | |
| | | ||||||
| * | Improve docstring for "morph workspace" | Lars Wirzenius | 2013-07-05 | 1 | -1/+1 | |
| | | ||||||
| * | Improve docstring for "morph update-gits" | Lars Wirzenius | 2013-07-05 | 1 | -1/+16 | |
| | | ||||||
| * | Improve docstring for "morph unpetrify" | Lars Wirzenius | 2013-07-05 | 1 | -1/+5 | |
| | | ||||||
| * | Improve docstring for "morph status" | Lars Wirzenius | 2013-07-05 | 1 | -1/+11 | |
| | | ||||||
| * | Improve docstring for "morph show-branch-root" | Lars Wirzenius | 2013-07-05 | 1 | -1/+10 | |
| | | ||||||
| * | Improve docstring for "morph show-system-branch" | Lars Wirzenius | 2013-07-05 | 1 | -1/+1 | |
| | | ||||||
| * | Improve docstring for "morph petrify" | Lars Wirzenius | 2013-07-05 | 1 | -3/+35 | |
| | | ||||||
| * | Improve docstring for "morph merge" | Lars Wirzenius | 2013-07-05 | 1 | -2/+14 | |
| | | ||||||
| * | Improve docstring for "morph init" | Lars Wirzenius | 2013-07-05 | 1 | -1/+22 | |
| | | ||||||
| * | Improve docstring for "morph graph-build-depends" | Lars Wirzenius | 2013-07-05 | 1 | -1/+29 | |
| | | ||||||
| * | Improve docstring for "morph foreach" | Lars Wirzenius | 2013-07-05 | 1 | -1/+20 | |
| | | ||||||
| * | Improve docstring for "morph edit" | Lars Wirzenius | 2013-07-05 | 1 | -1/+59 | |
| | | ||||||
| * | Improve docstring for "morph deploy" | Lars Wirzenius | 2013-07-05 | 1 | -7/+152 | |
| | | ||||||
| * | Improve docstring for "morph checkout" | Lars Wirzenius | 2013-07-05 | 1 | -1/+19 | |
| | | ||||||
| * | Improve docstring for "morph build-morphology" | Lars Wirzenius | 2013-07-05 | 1 | -3/+20 | |
| | |