summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* writeexts.py: convert 'mount' to context managerbaserock/pedroalvarez/rawdisk-to-device8Pedro Alvarez2014-12-013-78/+58
|
* Update rawdisk.check to support device deploymentsPedro Alvarez2014-12-011-8/+10
|
* Modify rawdisk.write to allow the deployment to devicesPedro Alvarez2014-12-011-6/+14
| | | | | | | This patch also modifies rawdisk.write to use the UPGRADE environment variable to figure out when is doing an upgrade or a fresh deployment. This change is important because os.path.isfile doesn't work with devices.
* Split create_local_system on various methodsPedro Alvarez2014-12-011-4/+19
| | | | | | This way we can still use create_local_system to create a raw disk, but also reuse bits of it to be able e.g. to deploy to devices.
* Don't loop mount when mounting a devicePedro Alvarez2014-12-011-1/+4
|
* Add force flag to 'mkfs.btrfs'Pedro Alvarez2014-12-011-1/+1
| | | | | | This way when deploying to a device it will format it without asking the user if the device already has format.
* Add 'is_device' function to check if we are deploying to a devicePedro Alvarez2014-12-011-0/+11
|
* Merge branch 'master' of https://github.com/petefoth/morphRichard Maw2014-12-012-3/+10
|\ | | | | | | | | | | This merges in more documentation improvements Reviewed-by: Richard Maw
| * Merge branch 'pf-document-extensions'Pete Fotheringham2014-12-015-38/+147
| |\ | | | | | | | | | Reviewed-by: Richard Maw
* | \ Merge branch 'master' of https://github.com/petefoth/morphRichard Maw2014-12-015-37/+139
|\ \ \ | |/ / |/| | | | | Reviewed-by: Richard Maw
| * | Merge branch 'pf-document-extensions'Pete Fotheringham2014-12-015-37/+139
| |\ \ |/ / / | | _ | | Reviewed-by: Richard Maw
| * Action review commentsPete Fotheringham2014-12-012-6/+28
| | | | | | | | | | - Document different ways of calling parameters - Allowed values for boolean parameters
| * More complete help documentationPete Fotheringham2014-11-281-3/+84
| |
| * Refere to .write.help file for documentationPete Fotheringham2014-11-282-26/+11
| |
| * Improve readability by adding blank linesPete Fotheringham2014-11-281-0/+6
| |
| * Add more information on existing parameters.Pete Fotheringham2014-11-261-8/+16
|/ | | | Add AUTOSTART parameter
* Merge remote-tracking branch 'pf/pf-document-extensions'Richard Maw2014-11-262-28/+30
|\ | | | | | | | | Reviewed-by: Richard Maw Reviewed-by: Pete Fotheringham
| * Document the write extension in the write.help filePete Fotheringham2014-11-262-23/+26
| | | | | | | | | | - Move docstring from .write to .write.help - Rework the content and formatting of the help information
| * Whitespace and line endings?Pete Fotheringham2014-11-251-11/+10
|/
* Merge branch 'sam/ensure-git-directory-exists'Sam Thursfield2014-11-172-12/+31
|\ | | | | | | | | Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
| * Check that directory passed to GitDirectory is a git repoSam Thursfield2014-11-172-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, creating a GitDirectory object for something that wasn't a Git repository would succeed, but most operations would raise a cliapp.AppException with the following error message: ERROR: Command failed: git config -z core.bare Now, the constructor will raise a NoGitRepoError if the directory isn't a Git repo, which (unless handled) gives the user the following sort of message: ERROR: Directory /src/ws/definitions is not a Git repository
* | Merge branch 'sam/fix-list-artifacts'Sam Thursfield2014-11-141-1/+1
|\ \ | | | | | | | | | Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
| * | Fix list-artifacts commandSam Thursfield2014-11-141-1/+1
| | | | | | | | | | | | | | | Silly mistake caused this to be broken, and there are no tests for this command inside the morph.git source tree.
* | | Merge branch 'baserock/richardmaw/fixup-ro-integrations' of ↵Richard Maw2014-11-146-101/+73
|\ \ \ | |/ / |/| | | | | | | | | | | | | | git://git.baserock.org/baserock/baserock/morph Reviewed-by: Sam Thursfield Reviewed-by: Pedro Alvarez
| * | Unrevert "Make system-integration commands use containerised_cmdline"baserock/richardmaw/fixup-ro-integrationsRichard Maw2014-11-121-55/+5
| | | | | | | | | | | | | | | The bug in the generated command lines has been fixed, so we can have this cleanup back now.
| * | Make invert_paths work more reliably for writable-allRichard Maw2014-11-122-41/+51
| | |
| * | yarns: Report stderr on morph failureRichard Maw2014-11-122-3/+8
| | |
| * | test-shell: Report write failuresRichard Maw2014-11-121-2/+9
|/ /
* | Revert "Make system-integration commands use containerised_cmdline"Richard Maw2014-11-111-5/+55
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 203f34b2b19b1d3dc51a956ae9329d064ea294dd. The path inversion logic is still buggy for the case of wanting to keep the top-level directory writable. This escaped detection in the test suite because it resulted in directories two levels down being made read-only, and I was only testing one level down.
* | Merge branch 'sam/fix-deploy'baserock-14.46Sam Thursfield2014-11-111-1/+0
|\ \ | |/ |/| | | | | Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
| * Allow `morph deploy` to cache missing Git repos if it needs toSam Thursfield2014-11-111-1/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c63f4e61f69820c71c2d8e9b96ce9bdec0d476a1. This change was introduced back when the Baserock system definitions used named Git refs rather than exact SHA1s. Morph would thus need to update each repo involved in a build and resolve each ref before it could build. Now that the system definitions use SHA1s, the 'updating gits' phase is much less slow. The problem with forcing 'no-git-update' is that it makes `morph deploy` depend on the remote repo cache. In the case that all repos involved in the build are avaiable in the remote repo cache (Trove), there is no need for them to have been cached locally just to construct a build graph. But if the network connection to the Trove is unreliable Morph will need to fall back to the local repo cache. Unless Morph has done a full local build of the system being built, it might not have every repo cached locally. Often, cached artifacts from the Trove or distbuild may be used instead of locally building everything. In this case the user sees `morph deploy` failing with errors such as: Repository upstream:binutils-redhat is not cached yet
* Merge branch 'sam/source-resolver-cleanup'Sam Thursfield2014-11-108-148/+217
|\ | | | | | | | | Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
| * Add docstring to SourceResolver class.Sam Thursfield2014-11-101-1/+22
| |
| * Set the 'update' flag in the SourceResolver constructorSam Thursfield2014-11-101-12/+14
| |
| * Move create_source_pool code into new 'sourceresolver' moduleSam Thursfield2014-11-106-136/+189
| | | | | | | | | | | | | | | | This code is an essential part of 'morph build'. It's quite complex and really shouldn't be mixed in with the base Application class. Given a dedicated class we can store some state in the object and avoid functions with seven parameters, too.
| * Remove one place where we pass the Application instance aroundSam Thursfield2014-11-063-14/+7
|/ | | | | | The MorphologyFactory class only uses the status() function of the morphlib.Application instance that it gets passed. So make it require only a status callback.
* Merge branch 'sam/gitdir-fixes-v2'Sam Thursfield2014-11-064-14/+39
|\ | | | | | | | | Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
| * Improve documentation of GitDirectory classSam Thursfield2014-11-051-5/+13
| | | | | | | | Clarify that bare repositories are supported, and other fixes.
| * Only search for repository root in GitDirectory constructor if told toSam Thursfield2014-11-054-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GitDirectory() constructor, if passed a 'dirname' that doesn't contain a '.git' subdirectory, can search upwards to find the real root of the repository. This is used by the `add-binary`, `push`, and `pull` commands. This causes very confusing behaviour in the case that 'dirname' points to a directory that should be a Git repository, but isn't, and that directory is a path inside the working tree of another Git repository. Rather than raising an error, in this case the GitDirectory class would perform operations on a different repository to the one the caller expected. This 'search_for_root' behaviour is now opt-in, to avoid confusion.
* | Merge branch 'sam/gitdir-ref-exists'Sam Thursfield2014-11-062-0/+14
|\ \ | | | | | | | | | | | | Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-By: Jim MacArtuhur <jim.macarthur@codethink.co.uk>
| * | Add GitDirectory.ref_exists() methodSam Thursfield2014-11-052-0/+14
| |/ | | | | | | | | This allows checking if a ref exists without requiring the caller to use a try:, except: block.
* | Merge branch 'baserock/pedroalvarez/upgrades-to-default'Pedro Alvarez2014-11-052-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Reviewed-by: - Sam Thursfield - Emmet Hikory - Paul Sherwood
| * | Use the default symlink when creating the orig subvolume.Pedro Alvarez2014-11-052-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch solves the issue caused by upgrading a system without a factory version. Currently we are only using the factory version to snapshot its orig subvolume to make faster the transfer of the new content (rsync won't have to send everything). The default symlink may not be present, but it can't be deleted easily using system-version-manager. This is a quick fix, but in the future we may want to not harcode the path from where we snapshot the orig subvolume. Or improve system-version-manager to make sure that the default symlink is always present.
* | Merge branch 'baserock/franred/check-for-commit-object-in-submodule-path'Francisco Redondo Marchena2014-11-051-1/+1
|\ \ | |/ |/| | | | | Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-by: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
| * Check for commit object in submodule pathbaserock/franred/check-for-commit-object-in-submodule-pathFrancisco Redondo Marchena2014-11-041-1/+1
|/ | | | | Fix checking for commit object in submodules which their path and name are not the same.
* Merge remote-tracking branch 'origin/sam/transfer-status'Sam Thursfield2014-10-314-15/+45
|\ | | | | | | | | Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk> Reviewed-By: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
| * Echo stderr of subcommands that do network IO when --verbose is usedSam Thursfield2014-10-294-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | Morph can appear to hang in situations where it is actually waiting on a slow network operation. This change gives users a way to see the output of the subcommands that are doing the network IO (either 'wget', 'git clone' or 'git remote update'). The status information goes onto stderr, because that is where the subcommands write it. Morph tends to put its status output on stdout, but (a) some commands are machine-parsed, such as `serialise-artifact` and (b) it's tricky to get Git to put status output on stdout.
| * Remove workaround for an old version of GitSam Thursfield2014-10-291-6/+2
| |
| * Don't say 'Updating git repository xxx' unless we actually areSam Thursfield2014-10-291-1/+2
| | | | | | | | | | | | | | This fixes an issue where various branch-and-merge commands appeared to be updating Git repos even when --no-git-update was specified. The flag was actually honoured but the message made it seem as if it was being ignored.
* | Merge branch 'baserock/richardmaw-os/unify-namespace-logic'Richard Maw2014-10-305-112/+141
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | This removes the last case of global mounting that could cause issues for being able to run multiple builds in parallel. There's still concurrent access to caches and git servers that could cause issues, but with this, it's possible to run morph in the test-suite in parallel. Reviewed-by: Daniel Silverstone Reviewed-by: Sam Thursfield