summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add deployment pluginLars Wirzenius2013-02-064-1/+203
| | | | | | | | | | | This adds a new optional field to system morphologies: "configuration-extensions". The deployment plugin relies heavily on code from the branch and merge plugin. This needs to be eventually fixed by refactoring the codebase so that the shared code is in morphlib and not in plugins. However, doing that is beyond the scope of adding a deployment plugin.
* Merge remote-tracking branch 'remotes/origin/samthursfield/drive-by-fixes'Lars Wirzenius2013-02-064-45/+18
|\
| * Remove deprecated functionsSam Thursfield2013-02-061-24/+0
| |
| * Avoid confusing error when staging area is emptySam Thursfield2013-02-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Morph to work it's necessary for the staging area to contain a full FHS heirarchy. However, if the staging area is empty we want to give the user an obvious error. Previously we would say something like: OSError: [Errno 2] No such file or directory: '/tmp/ccache' This makes it seem like the problem is with ccache. With this patch, we will instead get as far as: /bin/sh: No such file or directory This should make the real problem clearer. Also, aborting while trying to mount the ccache directory causes the /proc and /dev/shm mounts to persist which is fixed by this patch.
| * Tidy up create_cachedir()Sam Thursfield2013-02-062-19/+15
| |
* | Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2013-02-069-114/+153
|\ \ | |/
| * Merge branch 'liw/soft-pyyaml-dep'Sam Thursfield2013-01-297-112/+151
| |\ | | | | | | | | | Merge commit fixes up a copyright year and removes EOL whitespace
| | * Make yaml be an optional dependencyLars Wirzenius2013-01-297-111/+151
| | | | | | | | | | | | | | | This can go away when we have made a release with yaml in it, and its staging filler.
| * | scripts/bootstrap: Fix eglibc2 buildSam Thursfield2013-01-291-1/+1
| | |
| * | Fix copyright yearSam Thursfield2013-01-291-1/+1
| | |
* | | Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2013-01-291-2/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'samthursfield/no-distcc'Sam Thursfield2013-01-291-2/+3
| |\ |/ / | | | | Reviewed-By: Lars Wirzenius (on IRC)
| * Disable distcc by defaultSam Thursfield2013-01-291-2/+3
|/ | | | | | | | | | | | | | | Current versions of build-essential in the Baserock morphologies don't contain distcc, but Morph tries to use distcc anyway. Since useful operation of distcc requires setting up a distcc network, there's no reason for it to be on by default. This change fixes bootstrap, and means that users of the build-essential staging filler no longer have to set no-distcc=true manually. In the future, cliapp will grow automatic boolean negation, which will allow us to turn this setting into a 'distcc' setting that defaults to false rather than the current rather ugly double negative.
* Fix cwd parsing in setup.pyLars Wirzenius2013-01-291-1/+2
| | | | | | If __file__ has no directory in it, dirname will return the empty string, which in turn will break subprocess.Popen. The fix is to use '.' instead of the empty string.
* Merge branch 'jjardon/yaml-v2'Sam Thursfield2013-01-2818-129/+314
|\
| * Remove unneded json module importsJavier Jardón2013-01-284-9/+3
| |
| * Change build tests to use YAML morphologiesJavier Jardón2013-01-285-96/+64
| |
| * Fix testsRichard Maw2013-01-223-5/+89
| | | | | | | | | | | | | | | | Invalid text changed to be something that doesn't parse as YAML either, and catch convert the YAMLError to the expected exception. Ideally there wouldn't be any `#pragma: no cover`s, but I could not trigger these code paths.
| * Parse as YAML if not valid JSONRichard Maw2013-01-225-9/+147
| | | | | | | | | | Tests are currently broken, one because invalid JSON can be valid YAML, and coverage is incomplete.
| * Move OrderedDict and json loading to morphlib.utilRichard Maw2013-01-222-11/+12
| | | | | | | | | | | | | | | | This way everyone who needs json or an OrderedDict doesn't have to worry about it. Currently morph2 is the only one that needs this complex behaviour, other users of the json module don't need object_pairs_hook.
* | Merge remote-tracking branch 'origin/baserock/richardmaw/morph-version'Lars Wirzenius2013-01-287-7/+216
|\ \
| * | Add regression test for metadata including versionRichard Maw2013-01-282-0/+100
| | |
| * | Include morph-version in artifact metadataRichard Maw2013-01-281-0/+7
| | | | | | | | | | | | | | | | | | This can be used to rebuild an artifact with the exact same version of morph. Eventually there may be a tool to do this, but it allows for expert diagnosis until that point.
| * | Make morph get its version from git.Richard Maw2013-01-284-7/+109
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When morph is built, it writes various version information from git into morphlib. When morphlib is loaded it attempts to read this version information. if it cannot be found then it checks whether morphlib is being run from inside a git checkout, if it is then it reads the information that way. If it isn't in a git checkout then it raises an exception as builds made in such a fashion are not reproducible. The git version information retained is: 1. The output of git describe This is a relatively human-friendly way of knowing a version and gives a reasonably short output string. This will end with `-unreproducible` if there were uncommitted changes. 2. The commit sha1, so the exact part of Morph's history can be found 3. The tree sha1, so if the branch has been rebased rather than merged such that the commit is lost, you may still be able to find it, though it requires a git-wizard to check it out 4. The branch of morph, so that it's easier to see if the Further possible changes to increase reproducibility include: 1. Not allowing `python setup.py build` if there are uncommitted changes 2. Failing to run with uncommitted changes (recommended against since it will just annoy developers who are making changes to morph, and make them commit just to shut it up, then destroy the history later) Requiring an extra flag to build in this case may work better. 3. Reading the uncommitted changes into a tree object and including that would allow it to be recovered if the tree was later committed. 4. Checking whether the commit has been pushed upstream as well. Too annoying to work.
* | Merge remote-tracking branch ↵Lars Wirzenius2013-01-282-3/+61
|\ \ | | | | | | | | | | | | | | | 'origin/baserock/richardmaw/temp-build-ref-commit-fix' Broke a long line to make test suite pass.
| * | Add test for committed removes being trackedRichard Maw2013-01-251-0/+56
| | | | | | | | | | | | This was the only case found which was fixed by the previous commit.
| * | Make temporary build refs count changes against HEADRichard Maw2013-01-251-3/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before it would determine which files are changed by comparing your working tree to This gets even weirder, since it's effectively comparing your working tree, the last commit on the temporary build ref, and the last commit of your HEAD, so committing a change to remove a file isn't noticed, because it was in the temporary build branch. It could also cause a strange case of a file being both added and untracked. Now the working tree and HEAD are compared, and committed on top of the temporary build ref. Better handling of the status output is still required, a deleted file is treated identically to an added one if it is only removed in the index. It would also be nicer to keep the user's index, since they may have added or removed files from it.
* | Fix copyright yearSam Thursfield2013-01-281-1/+1
| |
* | Merge remote-tracking branch 'origin/samthursfield/build-essential'Lars Wirzenius2013-01-282-0/+558
|\ \ | |/ |/| | | Fixed long lines in scripts/bootstrap while merging.
| * Run ldconfig after populating staging chrootSam Thursfield2013-01-241-0/+3
| | | | | | | | | | | | | | | | After installing libraries into the staging area, we need to run ldconfig to update the shared library cache. I presume that this wasn't required until now because the cache in the staging filler tarball was enough.
| * Add script to manually create a build-essential staging fillerSam Thursfield2013-01-241-0/+553
|/ | | | | | | | | | | | | This functionality, of building a build-essential staging filler using host tools rather than a staging chroot, will eventually be done by Morph (and best of all, it will be done automatically when changes are made to the build-essential stratum). The script doesn't handle fetching source, so to use the script, you require a base directory which must contain a 'gits' subdirectory with a checkout of each chunk. Beyond this the build process is handled by the script, except for installing fhs-dirs (which requires root priviliges and must be done manually).
* Remove scripts/clean-git-cacheSam Thursfield2013-01-221-240/+0
| | | | | | | This script has not worked for some time, and is not particularly useful ('rm -r' can do pretty much the same thing). Reviewed-By: Richard Maw <richard.maw@codethink.co.u>
* Merge branch 'baserock/richardmaw/fix-morph-check-on-squeeze'Richard Maw2013-01-223-0/+42
|\
| * Reinstate check for python 2.7Richard Maw2013-01-222-0/+6
| |
| * Revert "Remove unneded scripts/python-check script"Richard Maw2013-01-221-0/+36
|/ | | | | | | This reverts commit 053c0993bb62dd5e1a73d3367ea04c70874f3bd1. It is needed, since tar.add(..., filter=func) is not available in python2.7, so tarball system kind tests need to be disabled.
* Fix copyright yearsSam Thursfield2013-01-224-4/+4
|
* Merge branch 'samthursfield/branch-fixes'Sam Thursfield2013-01-2211-47/+4
|\ | | | | | | Reviewed-By: Lars Wirzenius (on IRC)
| * Remove needless git output from test resultSam Thursfield2013-01-222-14/+4
| | | | | | | | | | This output varies depending on the version of git, which currently causes the test to fail on systems with git 1.7.10.
| * Rename morph tag tests to follow patternSam Thursfield2013-01-229-0/+0
| | | | | | | | The pattern is COMMAND-assertion, not morph-COMMAND-assertion.
| * Remove superfluous testSam Thursfield2013-01-222-33/+0
|/ | | | | tests.branching/edit-uses-ref-from-stratum tests behaviour that is already verified by tests.branching/edit-clones-chunk
* Merge branch 'jjardon/python_compatibility_fixes' of ↵Richard Maw2013-01-2125-173/+64
|\ | | | | | | | | | | | | | | | | | | ssh://git.baserock.org/baserock/baserock/morph This includes the following fixups: - altering the bootstrap script to install ordereddict and simplejson. - Adding a comment to clarify that it is intentional to use simplejson if collections does not have OrderedDict - Amending the copyright years to include 2013
| * Remove unneded scripts/python-check scriptJavier Jardón2013-01-181-36/+0
| |
| * tests.merging/*: Remove check to run only the teset with Python 2.7Javier Jardón2013-01-186-18/+0
| | | | | | | | | | As we use ordererdict for python < 2.7 as well See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
| * tests.branching/*: Remove check to run only the teset with Python 2.7Javier Jardón2013-01-186-18/+0
| | | | | | | | | | As we use ordererdict for python < 2.7 as well See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
| * tests.as-root/*: Remove check to run only the teset with Python 2.7Javier Jardón2013-01-189-25/+0
| | | | | | | | | | As we use ordererdict for python < 2.7 as well See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
| * morph2_tests: checks for python2.7 are not needed anymoreJavier Jardón2013-01-181-33/+27
| | | | | | | | | | As we use ordererdict for python < 2.7 as well See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
| * morph2: Improve compatibility with python < 2.7Javier Jardón2013-01-181-20/+9
|/
* Merge remote-tracking branch 'origin/jonathanmaw/ccache-local-fix'Lars Wirzenius2013-01-032-5/+16
|\ | | | | | | Fixed a copyright year to make ./check happy.
| * Make ccache use the same directory for repos that are clonesJonathan Maw2013-01-031-4/+15
| | | | | | | | | | | | | | | | | | This patch makes morph store its ccaches by the url's basename instead of using the whole url. This fixes the problem of morph choking when it tries to mount a directory with a colon in its path, and also makes all clones of one repository use the same cache (probably). This will cause projects with the same name to use the same cache, but that is not likely to cause serious problems.
* | Merge remote-tracking branch 'origin/samthursfield/stable-glob'Lars Wirzenius2013-01-031-2/+2
|\ \ | |/ |/|
View Lorry Controller Status