summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix condition for showing the staging-filler warningLars Wirzenius2013-03-201-1/+1
| | | | | | | If there is no staging-filler setting in a configuration file, it defaults to the empty string, not None. Reviewed-by: Jonathan Maw over the shoulder
* Merge branch 'liw/detabify'Lars Wirzenius2013-03-202-3/+4
|\ | | | | | | | | | | (I am not going through the normal patch review process for this.) Reviewed-by: Lars Wirzenius
| * Break long source lineLars Wirzenius2013-03-201-1/+2
| |
| * Replace spaces with tabsLars Wirzenius2013-03-201-2/+2
|/
* Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2013-03-201-1/+1
|\
| * Merge branch 'liw/check-fix'Jonathan Maw2013-03-201-1/+1
| |\ | | | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
| | * Use a relative symlink in test chunkLars Wirzenius2013-03-201-1/+1
| |/ | | | | | | | | | | The absolute one made the test suite fail in my VM, and is not the right thing to do anyway. $DESTDIR/usr/bin and $DESTDIR/bin are meant to be the same directory here, not $DESTDIR/usr/bin and /bin.
* | Merge remote-tracking branch 'origin/jonathan/copy-artifacts-plugin'Lars Wirzenius2013-03-203-67/+107
|\ \ | |/ |/|
| * Remove obsolete scriptJonathan Maw2013-03-141-67/+0
| |
| * Acknowledge the lack of test coverageJonathan Maw2013-03-142-0/+5
| |
| * Add copy-artifacts-plugin.pyJonathan Maw2013-03-141-0/+102
| |
* | Merge branch 'baserock/richardholland/git-config-check'Jonathan Maw2013-03-202-0/+5
|\ \ | | | | | | | | | Reviwed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
| * | check now uses git config file in morph/scriptsRic Holland2013-03-202-0/+5
|/ / | | | | | | | | To remove need of configuring git to check new system .gitconfig file added to morph/scripts and check set to use this file.
* | Merge branch 'baserock/richardholland/shorten-build-errors'Jonathan Maw2013-03-201-1/+7
|\ \ | | | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
| * | Added exception to give smaller error messageRic Holland2013-03-201-1/+7
|/ /
* | Merge branch 'baserock/richardholland/stop-morph-logging-gitmodule-error'Jonathan Maw2013-03-201-1/+1
|\ \ | | | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
| * | Changed the error message in log when morph fails to find gitmodulesRic Holland2013-03-201-1/+1
|/ / | | | | | | morph.log will now show an INFO message rther than a ERROR
* | Merge branch 'samthursfield/staging-filler-warning'Jonathan Maw2013-03-201-1/+5
|\ \ | | | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
| * | Warn if staging fillers are usedSam Thursfield2013-03-201-1/+5
|/ / | | | | | | | | The 'master' branch of baserock:baserock/morphs no longer requires a staging filler.
* | Merge branch 'liw/attach_disks'Jonathan Maw2013-03-203-2/+27
|\ \ | | | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
| * | Implement ATTACH_DISKS in virtualbox-ssh.writeLars Wirzenius2013-03-201-1/+11
| | |
| * | Add ATTACH_DISKS support to kvmLars Wirzenius2013-03-202-1/+16
|/ /
* | Merge branch 'ps/prettier-log'Sam Thursfield2013-03-182-9/+13
|\ \
| * | Fix long linesSam Thursfield2013-03-182-4/+8
| | |
| * | show commit we want to build for each chunkPaul Sherwood2013-03-171-2/+2
| | |
| * | add short sha1 for each actual build line in logPaul Sherwood2013-03-161-2/+2
| | |
| * | make logs prettier - put chunkname after buildnumber in most casesPaul Sherwood2013-03-161-7/+7
|/ /
* | Merge branch ↵Jonathan Maw2013-03-152-3/+10
|\ \ | | | | | | | | | | | | | | | 'baserock/richardholland/add-metadata-dir-setting-to-branch-from-image' Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
| * | Changed test script to agree with changes made to branch-from-imageRic Holland2013-03-141-1/+1
| | |
| * | Changed metadata_dir from an optional argument to a settingRic Holland2013-03-141-2/+9
| | | | | | | | | | | | morph branch-from-image
* | | Fix long lineSam Thursfield2013-03-151-1/+2
| | |
* | | Merge branch 'samthursfield/arch'Sam Thursfield2013-03-1516-157/+172
|\ \ \ | | | | | | | | | | | | Reviewed-By: concensus
| * | | Update Morph man page regarding environment variablesSam Thursfield2013-03-151-39/+20
| | | |
| * | | Change hardcoded cache key in testSam Thursfield2013-03-151-1/+1
| | | |
| * | | One 'arch' to rule them allSam Thursfield2013-03-159-96/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a specific set of 4 architectures that Morph supports, and only expose that value to morphologies. Since GNU triplets are very common we also expose a GNU triplet. Other morphologies should work out their configuration based on MORPH_ARCH. This commit also removes the morphlib.util.arch() function, which detected the machine Morph is running on via 'uname -m'. Morph's architecture names do not necessarily map to the output of 'uname -m' so we should not rely on it anywhere.
| * | | Fix trebuchet plugin to not depend on host architectureSam Thursfield2013-03-151-8/+20
| | | |
| * | | Enable syslinux systembuilder on all systemsSam Thursfield2013-03-141-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | This is a kludge which I am only doing because we are removing this plugin soon. Morph no longer has a way to detect the architecture that it is running on and no longer needs one anywhere else.
| * | | Only build systems againSam Thursfield2013-03-144-3/+4
| | | | | | | | | | | | | | | | | | | | We can no longer build strata individually because we don't know what architecture they are for.
* | | | Merge branch 'samthursfield/build-essential-2-rebase'Sam Thursfield2013-03-1545-1842/+675
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | Conflicts: morphlib/bins_tests.py Reviewed-By: consensus
| * | Allow unknown values of build-mode through with just a warningSam Thursfield2013-03-131-3/+4
| | | | | | | | | | | | | | | | | | | | | This gives us some forward compatibility leeway to introduce new build modes, as long as they are compatible with staging. As suggested by Richard Maw.
| * | Only bind mount necessary directories in chrootSam Thursfield2013-03-131-7/+5
| | | | | | | | | | | | | | | If for example /bin is a symlink, we shouldn't and can't mount the host system's /bin over the top.
| * | Don't install bootstrapped chunks when building artifacts in other strataSam Thursfield2013-03-133-20/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a stratum artifact it's easy to only include chunks that were built in 'staging' mode. Constructing the staging area doesn't use that code path, though, so we need an extra hack to filter out those artifacts while building. It may be neater to express stratum build-depends as actual dependencies on the stratum artifact, rather than each of its constituent chunks as we do now.
| * | Don't include bootstrap chunks in output strataSam Thursfield2013-03-133-3/+83
| | | | | | | | | | | | | | | This is necessary so that the build-essential stratum doesn't end up containing three different compilers.
| * | Add 'prefix' property for chunks within strataSam Thursfield2013-03-1315-18/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | Morph no longer supports setting the prefix using the --prefix argument / setting. This was only used in tests and during bootstrap. If a chunk build-depends on a chunk within a stratum which has a custom prefix, that prefix is appended to the PATH in the build environment.
| * | Add 'build-mode' field for chunks in a stratumSam Thursfield2013-03-1319-42/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allowed values: staging: build with a staging chroot (default) test: build with the host's tools bootstrap: build with the host's tools, and do not include this chunk in the final stratum artifact In the past, 'normal mode' has been used to describe building a chunk with the host's tools. We don't want that mode to ever be used, because it is a huge hole in reproducability, but we need to keep it around to avoid making Morph's cmdtest suite depend on Baserock. Hopefully naming it 'test' should discourage potential abusers. It is unfortunate that the build tests now take a separate code path compared to real-world usage of Morph. However, this is necessary to avoid a circular dependency between Morph's test suite and the build-essential stratum in Baserock. We do whole-build testing of Baserock, too, so the 'staging' code path is still tested outside of Morph. However, testing a staging area requires populating it with at minimum a working shell, and this is a bit too complex to go in Morph's test suite.
| * | Set environment variables defining target for build-essentialSam Thursfield2013-03-137-40/+60
| | | | | | | | | | | | | | | | | | In the future we will allow this to be modified to provide a cross-bootstrap mode, but for now we use the same target as the host compiler.
| * | Refactor build processSam Thursfield2013-03-1311-134/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganise the build_artifact() and build_artifacts() functions to allow more complex work when setting up chunk builds in build_artifact(). The staging area now holds the BuildEnvironment object (the environment variables that should be set during build). This makes sense because all build commands should be run inside the staging area and therefore through the StagingArea object. The BuildEnvironment object is now considered immutable after it is created. The environment is used in cache key computation when computing what artifacts are required; if it changes after that point we risk either computing different artifact keys for the same artifact or missing data in the cache key that should be included in the hash. Better to force changes into a separate 'extra_env' variable.
| * | Remove support for bootstrap mode in staging areaSam Thursfield2013-03-133-39/+16
| | | | | | | | | | | | | | | This involved having a staging area with split personalities and was generally a bit ugly.
| * | Remove features used by old bootstrap methodSam Thursfield2013-03-1311-91/+53
| | | | | | | | | | | | | | | | | | That means that bootstrapping Baserock is currently not possible with this branch of Morph, but there's no reason it cannot be bootstrapped using an older version of Morph instead.
| * | Remove old bootstrap mechanismsSam Thursfield2013-03-137-1518/+0
| | | | | | | | | | | | | | | | | | That means that bootstrapping Baserock is currently not possible with this branch of Morph, but there's no reason it cannot be bootstrapped using an older version of Morph instead.
View Lorry Controller Status