summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Fix incorrect commentSam Thursfield2013-03-131-5/+0
|
* Skip some tests in ./check by defaultLars Wirzenius2013-03-131-3/+38
| | | | | | | Running all the checks takes over 20 minutes for me. This makes it likely that ./check doesn't get run very often. Dropping the slowest tests by default makes ./check more usefull. Add the --full option to enable the full test suite again.
* 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
| | | | | | | | | We already silently, automatically decompress if the artifact is compressed. It is thus safe to turn off compression. Compression saves disk space, but on ARM it takes up a lot extra time, and we have lots of disk space, so for speed, not compressing is a good idea.
* Fix deploy to not assume artifacts are compressedLars Wirzenius2013-03-131-2/+1
|
* Set exec permissions on installed deployment extensionsLars Wirzenius2013-03-121-0/+13
| | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
* Merge remote-tracking branch ↵Sam Thursfield2013-03-121-2/+2
|\ | | | | | | 'origin/baserock/richardholland/morph-deploy--tempdir'
| * Fixed 'morph deploy' to obey --tempdirRic Holland2013-03-071-2/+2
| | | | | | | | Allowed user to set the location of the temp directory using --tempdir
| * Merge branch 'baserock/richardholland/fix-virtualbox-deploy' into ↵Ric Holland2013-03-071-3/+5
| |\ | | | | | | | | | baserock/richardholland/improve-output-messages
* | \ Merge branch 'staging'Lars Wirzenius2013-03-1117-131/+342
|\ \ \ | | | | | | | | | | | | | | | | Merging all the things from the staging branch. They have all already been reviewed.
| * | | Remove TAB character (and break line better)Lars Wirzenius2013-03-111-2/+2
| | | |
| * | | Merge branch 'staging' of git://git.baserock.org/baserock/baserock/morph ↵Lars Wirzenius2013-03-114-76/+122
| |\ \ \ | | | | | | | | | | | | | | | into staging
| | * \ \ Merge branch 'jonathan/update-find-artifacts' of ↵Richard Maw2013-03-081-76/+20
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://trove.baserock.org/baserock/baserock/morph into staging This included a fixup for the copyright years and the call to call_in_artifact_directory being a shade too long.
| | | * | | 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
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of git://git.baserock.org/baserock/baserock/morph into staging Reviewed-by: Lars Wirzenius
| | | * | | Add test for adding a chunk then editing itRichard Maw2013-03-073-0/+102
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | This works sub-optimally, `morph edit $system $stratum` needs to be done first as `morph edit $system $stratum $chunk` fails if $chunk is not defined in the parent branch.
| * | | | Merge remote-tracking branch ↵Lars Wirzenius2013-03-117-8/+102
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'origin/baserock/richardholland/environment-logging' into staging Added a "pragma: no cover" to make the test suite pass.
| | * | | | Change morph to reduce loogign of the environmentRic Holland2013-03-082-2/+20
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added function log_dict_diff to identify and record changes in dicts to the debug log This new function was then implemented in app.py to log changes in the environment
| | * | | Merge branch 'liw/pre-commands' into stagingSam Thursfield2013-03-075-6/+82
| | |\ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: morphlib/morph2.py
| | * | | Fix copyright yearsSam Thursfield2013-03-072-2/+2
| | | | |
| | * | | Add pre- and post-commands to READMELars Wirzenius2013-03-051-0/+30
| | | | | | | | | | | | | | | | | | | | Suggested-by: Sam Thursfield
| | * | | Add pre- and post-commands for chunksLars Wirzenius2013-02-194-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already have configure-commands. Add pre-configure-commands and post-configure-commands. Likewise for build-command, test-commands, and install-commands. Added-to-pacify: Rob Kendrick
| * | | | Merge remote-tracking branch ↵Lars Wirzenius2013-03-061-3/+5
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | 'origin/baserock/richardholland/fix-virtualbox-deploy' into staging
| | * | | Fix virtualbox deploymentRic Holland2013-03-051-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was missing an import for sys. It did not have the size of the disk either, this has also been fixed
| * | | | Merge remote-tracking branch ↵Lars Wirzenius2013-03-061-4/+6
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | 'origin/baserock/richardholland/improve-output-messages' into staging
| | * | | Improve "morph build" progress messages:Ric Holland2013-03-051-4/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | Added chunk name in status when starting build Added the name of parent artifact (chunk that installing chunk was installed for) to start of build message
| * | | 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 ↵Richard Maw2013-03-061-0/+43
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git://git.baserock.org/baserock/baserock/morph into staging Reviewed-by: Lars Wirzenius
| | * | | bootstrap: Install a dummy linux-user-chrootRichard Maw2013-03-051-0/+43
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass 3 is built with a staging filler, hence uses linux-user-chroot. Unfortunately, linux-user-chroot does not work inside a chroot, since it tries to mount / as private, and / inside the chroot is not the mount point, so the kernel thinks it's been given a dodgy path. Instead we provide a dummy that just chroots, without the extra mounts, since we only use it to make some directories read-only right now.
| * | | Merge branch ↵Richard Maw2013-03-052-28/+54
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | 'baserock/richardmaw/branch-and-merge-git-config-warnings-refactor' of git://git.baserock.org/baserock/baserock/morph into staging Reviewed-by: Lars Wirzenius
| * | | B&M: Share error message formatting codeRichard Maw2013-03-042-28/+54
|/ / / | | | | | | | | | | | | | | | | | | This makes the warning messages include how to fix the problem. morphlib.git.check_config_set will return the values of the keys which were set, so it can be used to get git config.
* | | Merge branch 'baserock/richardmaw/branch-and-merge-git-config-warnings-v2' ↵baserock/genivi/baseline/releases/F-0.1Richard Maw2013-03-012-2/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | of git://git.baserock.org/baserock/baserock/morph Reviewed-by: Sam Thursfield Reviewed-by: Lars Wirzenius
| * | | B&M: Check git config before some subcommandsRichard Maw2013-03-012-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some subcommands use git to create commits, in which case user config needs to be set. Others imply commits may be created, e.g. by cloning a repository, at which point it is useful to have a reminder that the configuration needs to be set.
| * | | B&M: Commit to build branches with user's emailRichard Maw2013-03-011-2/+1
| |/ / | | | | | | | | | | | | | | | While it may be useful to have the username and machine the commit was made on, it's more useful to have the committer's email address, and the email field is for email addresses.
* | | Merge branch 'liw/hardlinking-symlinks' of ↵Richard Maw2013-03-011-4/+4
|\ \ \ | | | | | | | | | | | | git://git.baserock.org/baserock/baserock/morph
| * | | Fix existence checks to not follow symlinksLars Wirzenius2013-03-011-4/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we hardlink the staging area tree, we were checking if the target file already exists with os.path.exists. Unfortunately, this follows a symlink, and in this case, we don't want to: if the symlink target exists, and is a symlink, we want to remove the symlink only, and we don't care about its target. The target file may exists because of overlapping files in chunks. Reported-By: Paul Sherwood
* | | Merge branch 'jonathanmaw/fix-tempdir-none' of ↵Richard Maw2013-03-011-0/+5
|\ \ \ | |/ / |/| | | | | ssh://trove.baserock.org/baserock/baserock/morph
| * | 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
| |\ \ | | | | | | | | | | | | Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
| | * | Add the ability for chunk morphs to specify devicesJonathan Maw2013-02-283-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Within a linux-user-chroot, we do not want to allow arbitrary code to create device nodes, but still want it to be possible to create a device node. This commit creates and handles the 'devices' field in a chunk morphology, which takes: * filename. A string, e.g. "/dev/null" * uid. The ID of the user the file belongs to, e.g. 0 for root. * gid. The ID of the group the file belongs to, e.g. 0 for root. * type. A string of either 'c' for a character device or 'b' for a block device. * major. The device's major number. * minor. The device's minor number. * permissions. A string of the octal number that would be passed to chmod e.g. '0777'
| | * | Perform *-commands in linux-user-chrootJonathan Maw2013-02-281-2/+17
| | | |
| | * | Hardlink files into the staging-areaJonathan Maw2013-02-283-69/+180
| |/ / | | | | | | | | | | | | | | | Instead of repeatedly unpacking tarballs into a succession of staging- areas, it will unpack each tarball only once, then hardlink all the files into the staging-area instead.
View Lorry Controller Status