summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove TAB character (and break line better)Lars Wirzenius2013-03-111-2/+2
* Merge branch 'staging' of git://git.baserock.org/baserock/baserock/morph into...Lars Wirzenius2013-03-114-76/+122
|\
| * Merge branch 'jonathan/update-find-artifacts' of ssh://trove.baserock.org/bas...Richard Maw2013-03-081-76/+20
| |\
| | * Update find-artifacts script to use call_in_artifact_directoryJonathan Maw2013-03-081-75/+18
| * | Merge branch 'baserock/richardmaw/brabch-and-merge-test-add-chunk-then-edit' ...Richard Maw2013-03-083-0/+102
| |\ \
| | * | Add test for adding a chunk then editing itRichard Maw2013-03-073-0/+102
| | |/
* | | Merge remote-tracking branch 'origin/baserock/richardholland/environment-logg...Lars Wirzenius2013-03-117-8/+102
|\ \ \
| * | | Change morph to reduce loogign of the environmentRic Holland2013-03-082-2/+20
| |/ /
| * | Merge branch 'liw/pre-commands' into stagingSam Thursfield2013-03-075-6/+82
| |\ \ |/ / /
| * | Fix copyright yearsSam Thursfield2013-03-072-2/+2
| * | Add pre- and post-commands to READMELars Wirzenius2013-03-051-0/+30
| * | Add pre- and post-commands for chunksLars Wirzenius2013-02-194-4/+50
* | | Merge remote-tracking branch 'origin/baserock/richardholland/fix-virtualbox-d...Lars Wirzenius2013-03-061-3/+5
|\ \ \
| * | | Fix virtualbox deploymentRic Holland2013-03-051-3/+5
* | | | Merge remote-tracking branch 'origin/baserock/richardholland/improve-output-m...Lars Wirzenius2013-03-061-4/+6
|\ \ \ \
| * | | | Improve "morph build" progress messages:Ric Holland2013-03-051-4/+6
| |/ / /
* | | | Merge remote-tracking branch 'origin/samthursfield/edit-morph-fix' into stagingLars Wirzenius2013-03-061-12/+10
|\ \ \ \
| * | | | Fix scripts/edit-morph to work correctlySam Thursfield2013-03-051-12/+10
| | |_|/ | |/| |
* | | | Merge branch 'baserock/richardmaw/bootstrap-fake-luc' of git://git.baserock.o...Richard Maw2013-03-061-0/+43
|\ \ \ \
| * | | | bootstrap: Install a dummy linux-user-chrootRichard Maw2013-03-051-0/+43
| |/ / /
* | | | Merge branch 'baserock/richardmaw/branch-and-merge-git-config-warnings-refact...Richard Maw2013-03-052-28/+54
|\ \ \ \ | |/ / / |/| | |
| * | | B&M: Share error message formatting codeRichard Maw2013-03-042-28/+54
|/ / /
* | | Merge branch 'baserock/richardmaw/branch-and-merge-git-config-warnings-v2' of...baserock/genivi/baseline/releases/F-0.1Richard Maw2013-03-012-2/+40
|\ \ \
| * | | B&M: Check git config before some subcommandsRichard Maw2013-03-012-0/+39
| * | | B&M: Commit to build branches with user's emailRichard Maw2013-03-011-2/+1
| |/ /
* | | Merge branch 'liw/hardlinking-symlinks' of git://git.baserock.org/baserock/ba...Richard Maw2013-03-011-4/+4
|\ \ \
| * | | Fix existence checks to not follow symlinksLars Wirzenius2013-03-011-4/+4
|/ / /
* | | Merge branch 'jonathanmaw/fix-tempdir-none' of ssh://trove.baserock.org/baser...Richard Maw2013-03-011-0/+5
|\ \ \ | |/ / |/| |
| * | Fix settings['tempdir'] not being setJonathan Maw2013-03-011-0/+5
|/ /
* | Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2013-02-2818-129/+794
|\ \
| * \ Merge branch 'jonathanmaw/hardlink-staging-area-rebase'Jonathan Maw2013-02-285-71/+223
| |\ \
| | * | Add the ability for chunk morphs to specify devicesJonathan Maw2013-02-283-0/+26
| | * | Perform *-commands in linux-user-chrootJonathan Maw2013-02-281-2/+17
| | * | Hardlink files into the staging-areaJonathan Maw2013-02-283-69/+180
| |/ /
| * | Merge branch 'richardmaw/artifact-inspection-plugin-rebase-v2' of git://git.b...Richard Maw2013-02-2713-58/+571
| |\ \
| | * | Add version guessing for autotools projectsJannis Pohlmann2013-02-211-1/+139
| | * | Add image inspection pluginJannis Pohlmann2013-02-218-0/+256
| | * | Add ExtractedTarball class and method to extract/mount an artifactJannis Pohlmann2013-02-214-1/+91
| | * | Move MountableImage class into morphlibJannis Pohlmann2013-02-214-57/+86
* | | | Merge branch 'liw/fix-plugin-import'Lars Wirzenius2013-02-281-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Install plugins as a Python package, not package dataLars Wirzenius2013-02-281-2/+1
|/ / /
* | | Merge branch 'liw/fix-artifact-walk'Lars Wirzenius2013-02-221-3/+3
|\ \ \
| * | | Avoid infinite looping when walking artifact dep graphLars Wirzenius2013-02-221-3/+3
|/ / /
* | | Allow building strata with 'morph build-morphology' againSam Thursfield2013-02-224-8/+7
|/ /
* | Fix ./check on SqueezeSam Thursfield2013-02-211-2/+11
* | Merge branch 'liw/build-progress2'Sam Thursfield2013-02-212-3/+14
|\ \
| * | Make BuildCommand report current and total build stepsLars Wirzenius2013-02-212-3/+14
* | | Merge branch 'samthursfield/only-build-systems' of git://git.baserock.org/bas...Richard Maw2013-02-2140-124/+267
|\ \ \
| * | | buildcommand: Refuse to build chunks or strata out of contextSam Thursfield2013-02-203-1/+37
| * | | tests.build: Don't build individual chunks or strataSam Thursfield2013-02-2026-128/+100