summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Separate out build tests from general Morph testsSam Thursfield2013-02-2034-17/+152
* | | Merge branch 'samthursfield/edit-morph' of git://git.baserock.org/baserock/ba...Richard Maw2013-02-212-4/+213
|\ \ \
| * | | scripts/edit-morph: Add to-yaml and to-json commandsSam Thursfield2013-02-181-0/+42
| * | | Allow forcing output format (useful for edit-morph script)Sam Thursfield2013-02-181-4/+8
| * | | Add scripts/edit-morph.pySam Thursfield2013-02-181-0/+163
* | | | Merge branch 'samthursfield/morph-update-improvements' of git://git.baserock....Richard Maw2013-02-213-148/+258
|\ \ \ \ | |/ / /
| * | | Make writing morphologies back out properly non-destructiveSam Thursfield2013-02-183-154/+252
| * | | Handle morphs that are not dicts (By failing)Sam Thursfield2013-02-182-3/+6
| * | | Detect and abort on empty morphologiesSam Thursfield2013-02-182-0/+9
| * | | Catch only JSON parse exceptions, not ExceptionSam Thursfield2013-02-181-1/+1
* | | | Merge branch 'liw/debug-jjardon-assert-fail'Sam Thursfield2013-02-202-13/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Make rootfs-tarball build only the tarball also on ARMLars Wirzenius2013-02-202-13/+2
|/ /
* | Merge branch 'liw/build-ordering'Sam Thursfield2013-02-199-407/+134
|\ \ | |/ |/|
| * Add clarifying commentSam Thursfield2013-02-191-1/+3
| * Rewrite show-dependencies to work without BuildOrderLars Wirzenius2013-02-192-109/+66
| * Stop computing the old build orderingLars Wirzenius2013-02-194-267/+17
| * Replace builder order graph with just a single artifactLars Wirzenius2013-02-194-36/+54
|/
* Merge branch 'baserock/richardmaw/fix-edit-build-depends'Sam Thursfield2013-02-136-36/+117
|\
| * Amend tests to trigger failure to recursively update strataRichard Maw2013-02-135-3/+51
| * morph edit: Recursively edit strataRichard Maw2013-02-131-33/+66
* | Merge branch 'liw/disable-test-on-squeeze'Lars Wirzenius2013-02-121-2/+9
|\ \
| * | Disable deployment test on Python 2.6Lars Wirzenius2013-02-121-2/+9
|/ /