summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixup device detectionbaserock/pedroalvarez/rawdisk-to-device2Your Name2014-11-071-1/+1
|
* Don't create the rawdisk image inside of create_local_systemYour Name2014-11-075-1/+4
| | | | | Now we can use create_local_system to deploy create a system in a device or in a rawdisk image.
* Move DISK_SIZE detection inside create_raw_disk_imageYour Name2014-11-071-5/+5
|
* Disable loop mount, leave the system decideYour Name2014-11-071-1/+1
|
* force mkfs.btrfsYour Name2014-11-071-1/+1
|
* Add location detection to check if it's a driveYour Name2014-11-071-1/+6
|
* 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
| * stagingarea: Remove vestigial pre-command mounting logicRichard Maw2014-10-301-22/+2
| |
| * Make build commands use containerised_cmdlineRichard Maw2014-10-301-31/+14
| |
| * Make deployment extensions use unshared_cmdlineRichard Maw2014-10-301-4/+1
| |
| * Make system-integration commands use containerised_cmdlineRichard Maw2014-10-301-55/+5
| |
| * Move unsharing and containerising logic to utilRichard Maw2014-10-301-0/+114
| | | | | | | | | | This way the build commands, system integration commands and deployment extension commands can all share the logic.
| * Allow invert_paths to skip the top level directoryRichard Maw2014-10-291-0/+5
|/ | | | | | We're going to be passing it "$CHROOT/" as a writable directory by default, so it needs to be able to tell that it means to leave everything writable.
* Fix lines longer than 79 charactersSam Thursfield2014-10-292-3/+4
|
* Merge remote-tracking branch 'origin/sam/build-fix-3'Sam Thursfield2014-10-295-17/+38
|\ | | | | | | | | Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
| * Fix distbuild to allow passing a commit instead of a named ref to be builtSam Thursfield2014-10-275-17/+38
| | | | | | | | | | | | | | | | | | | | | | The recent changes to the BuildCommand.build() function caused distbuild to break, because I didn't make the same change to the InitiatorBuildCommand.build() function but did change how it was called. This commit adds the ability to have optional fields in distbuild messages. This is used to add an optional 'original_ref' field, which will get passed to `morph serialise-artifact` by new distbuild controllers, and will be ignored by older ones.
* | Make pushed_build_branch always return (url, commit, ref)Richard Ipsum2014-10-281-2/+7
|/
* Merge branch 'baserock/ps/message-fix'Sam Thursfield2014-10-271-1/+1
|\ | | | | | | | | Reviewed-By: Daniel Silverstone <daniel.silverstone@codethink.co.uk> Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
| * Fix confusing messagebaserock/ps/message-fixPaul Sherwood2014-10-271-1/+1
| |
| * Merge branch 'master' of git://git.baserock.org/baserock/baserock/morph into ↵Paul Sherwood2014-10-2713-100/+229
| |\ | |/ |/| | | HEAD
* | Merge branch 'sam/build-fix-2'Sam Thursfield2014-10-275-26/+49
|\ \ | | | | | | | | | | | | | | | Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk> Reviewed-By: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
| * | build: Resolve the ref being built in the user's local definitions.gitSam Thursfield2014-10-243-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most usefully, this patch means that Morph no longer updates its cached copy of definitions.git every time you run `morph build`. Also, it prevents confusion in the following situation. Imagine I have run: morph checkout baserock:baserock/definitions master I then wait a while, during which time someone pushes to 'master' in the definitions.git repo that I cloned from. Now I run: cd master morph build systems/whatever.morph Which commit does it build, the local head of 'master' or the remote head of 'master'? The answer, both before and after this patch, is that it builds the local version of master. But previously, this only happened because of the magic that we have to detect local changes. With this patch, the local change detection could be disabled and `morph build` would still build what the user had checked out as 'master' locally, not whatever 'master' pointed to in the remote repo.
| * | build: Allow passing in the name of the original ref to create_source_pool()Sam Thursfield2014-10-242-7/+15
| | | | | | | | | | | | | | | This means that we can force the building of a specific commit without losing the original branch name in the metadata of the resulting system.
| * | build: Restructure how BuildCommand.build() is calledSam Thursfield2014-10-242-15/+19
|/ / | | | | | | | | | | | | | | | | Rather than take a list of triplets to build, the BuildCommand.build() function now takes a single repo/ref/morph triplet. Iterating through multiple sets of triplets is now done in the build plugin. There are a couple of cosmetic changes to the status output at the start and end of a build as a result.
* | Merge branch 'baserock/richardmaw/parallelism-improvements'Richard Maw2014-10-243-11/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | This stripped out the commit from the patch series on the mailing list to remove /dev/shm. Reviewed-by: Sam Thursfield Reviewed-by: Daniel Silverstone
| * | stagingarea: Mount proc and ccache inside the namespaceRichard Maw2014-10-242-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works towards allowing multiple concurrent builds in the same system, which has the same problem as deployments. This is the easy bit, since linux-user-chroot has support for bind mounts and /proc mounts. We also need to get rid of the /dev/shm mount to be able to build in parallel though.
| * | deploy extensions: Don't crash if someone builds at the same timeRichard Maw2014-10-241-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | If a build happens, it creates a new network namespace, and if this happens while you have a disk image mounted, then you can't remove the mount-point, because the other namespace is using it. We can avoid the other namespace keeping this mount-point open by creating the disk image in a private mount namespace, so it never sees it. The nicest way to do this is to have every extension run in a private mount namespace, since you'd have to have extensions re-exec themselves, since the appropriate system calls aren't exposed very well.
* | Merge branch 'baserock/richardmaw/test-system-integrations'Richard Maw2014-10-245-54/+152
|\ \ | | | | | | | | | | | | | | | Reviewed-by: Sam Thursfield Reviewed-by: Pedro Alvarez Reviewed-by: Daniel Silverstone
| * | yarns: Add yarns for system-integrationsRichard Maw2014-10-242-0/+38
| | | | | | | | | | | | | | | These were previously completely untested, so their unsafe mounting wasn't noticed, but now both are fixed.
| * | Run system-integrations in a namespaceRichard Maw2014-10-241-23/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All temporary mounts should be done inside a namespace, so that they don't interfere with other namespaces. system-integrations may need capabilities that regular builds don't have, so they're chrooted, rather than linux-user-chrooted, which means it's more complicated to do namespaces. In the absence of a better command for it, we can do this with an in-lined shell script. This also stops us using the run-parts inside the system, and executes the integrations directly.
| * | yarns: Fix missing FINALLYRichard Maw2014-10-241-0/+1
| | |
| * | test-shell: Allow to be used in system-integrationsRichard Maw2014-10-241-39/+49
| | | | | | | | | | | | | | | | | | It now works when passed a file, rather than a command to run, and ignores comments and set commands, so the generated preamble is accepted.
| * | test-shell: add create file commandRichard Maw2014-10-241-0/+20
|/ /
* | Merge branch 'sam/fix-edit-synopsis'Sam Thursfield2014-10-221-1/+1
|\ \ | | | | | | | | | | | | Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-By: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
| * | Fix synopsis of `morph edit` commandSam Thursfield2014-10-221-1/+1
|/ / | | | | | | | | Previously it was incorrect in the `morph help` output and in Morph's man page.
* | Merge remote-tracking branch 'origin/sam/validation-fixes'Sam Thursfield2014-10-171-8/+4
|\ \ | | | | | | | | | | | | Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk> Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
| * | Give clearer error when the same 'name' is used by two strataSam Thursfield2014-10-161-5/+4
| | |