summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* check now uses git config file in morph/scriptsRic Holland2013-03-202-0/+5
* Merge branch 'baserock/richardholland/shorten-build-errors'Jonathan Maw2013-03-201-1/+7
|\
| * 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
|\
| * Changed the error message in log when morph fails to find gitmodulesRic Holland2013-03-201-1/+1
|/
* Merge branch 'samthursfield/staging-filler-warning'Jonathan Maw2013-03-201-1/+5
|\
| * Warn if staging fillers are usedSam Thursfield2013-03-201-1/+5
|/
* Merge branch 'liw/attach_disks'Jonathan Maw2013-03-203-2/+27
|\
| * 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 'baserock/richardholland/add-metadata-dir-setting-to-branch-from...Jonathan Maw2013-03-152-3/+10
|\
| * 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
* | Fix long lineSam Thursfield2013-03-151-1/+2
* | Merge branch 'samthursfield/arch'Sam Thursfield2013-03-1516-157/+172
|\ \
| * | 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
| * | 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
| * | Only build systems againSam Thursfield2013-03-144-3/+4
* | | Merge branch 'samthursfield/build-essential-2-rebase'Sam Thursfield2013-03-1545-1842/+675
|\ \ \ | |/ /
| * | Allow unknown values of build-mode through with just a warningSam Thursfield2013-03-131-3/+4
| * | Only bind mount necessary directories in chrootSam Thursfield2013-03-131-7/+5
| * | Don't install bootstrapped chunks when building artifacts in other strataSam Thursfield2013-03-133-20/+128
| * | Don't include bootstrap chunks in output strataSam Thursfield2013-03-133-3/+83
| * | Add 'prefix' property for chunks within strataSam Thursfield2013-03-1315-18/+190
| * | Add 'build-mode' field for chunks in a stratumSam Thursfield2013-03-1319-42/+84
| * | Set environment variables defining target for build-essentialSam Thursfield2013-03-137-40/+60
| * | Refactor build processSam Thursfield2013-03-1311-134/+130
| * | Remove support for bootstrap mode in staging areaSam Thursfield2013-03-133-39/+16
| * | Remove features used by old bootstrap methodSam Thursfield2013-03-1311-91/+53
| * | Remove old bootstrap mechanismsSam Thursfield2013-03-137-1518/+0
| * | Fix incorrect commentSam Thursfield2013-03-131-5/+0
| * | Skip some tests in ./check by defaultLars Wirzenius2013-03-131-3/+38
| * | Change test to also verify that artifact is not compressedLars Wirzenius2013-03-132-0/+8
| * | Test that chunk artifacts are NOT compressedLars Wirzenius2013-03-131-1/+7
| * | Turn off rootfs-tarball compressionLars Wirzenius2013-03-131-3/+1
| * | Do not compress chunk artifacts upon creationLars Wirzenius2013-03-131-1/+1
| * | Fix deploy to not assume artifacts are compressedLars Wirzenius2013-03-131-2/+1
* | | Merge branch 'liw/simplify-system-kind'Sam Thursfield2013-03-1313-289/+19
|\ \ \
| * | | Remove tests for non-rootfs-tarball system-kindsLars Wirzenius2013-03-1210-287/+0
| * | | Fix test caseLars Wirzenius2013-03-121-1/+7
| * | | Emit warning if system-kind != rootfs-tarballLars Wirzenius2013-03-122-1/+12
* | | | Rewrite test to not use with for gzip.GzipFileLars Wirzenius2013-03-131-2/+3
| |_|/ |/| |