summaryrefslogtreecommitdiff
path: root/morphlib/builder.py
Commit message (Collapse)AuthorAgeFilesLines
...
* morphlib/builder.py: bring it closer to mkimage.shRichard Maw2012-03-081-23/+21
| | | | | | | | | Use dd and sfdisk instead of qemu-img, parted and install-mbr Write files without using tee, that was only required when we were not expecting morph to be run as root partx has not been touched, I don't know enough about how to process the output in python and I don't speak awk
* Return nothing from do_build/build; fix unassigned built_items bug.Jannis Pohlmann2012-03-061-13/+5
|
* Remove unused argument from Builder.build and build_single methodsLars Wirzenius2012-03-021-2/+2
|
* Remove unnecessary Builder.settings attributeLars Wirzenius2012-03-021-2/+2
| | | | We can use self.app.settings instead.
* Move cleaning of environment into morphLars Wirzenius2012-03-021-87/+12
| | | | | This is better done in morph, I think, since it is clear policy, and should not be buried deep in the call stack.
* Simplify instantiation of BlobBuilder subclassesLars Wirzenius2012-03-021-27/+21
|
* Remove unused app parameter and attribute to BlobBuilderLars Wirzenius2012-03-021-5/+4
|
* Remove unnecessary variableLars Wirzenius2012-03-021-1/+0
|
* Remove unnecessary method (which also had an unhelpful name)Lars Wirzenius2012-03-021-4/+1
|
* Remove unused kwargs usage from prepare_binary_metadataLars Wirzenius2012-03-021-3/+1
|
* Refactor to clarify code a tiny bit by moving variable setting close to useLars Wirzenius2012-03-021-1/+1
|
* Simplify how files are created in the cache directoryLars Wirzenius2012-03-021-11/+6
| | | | | | | | | The "cache prefix" concept is not immediately clear, and it's generally speaking best to centralize the construction of filenames in the cache to the CacheDir class anyway. Also, use SaveFile for writing the log file, instead of writing it to a temporary file and then copying, which is unnecessary I/O.
* Simplify how BlobBuilder.builds gets implemented/inheritedLars Wirzenius2012-03-021-4/+10
| | | | | | | It needs to be different for each subclass, yet SystemBuilder was sharing the implementation with ChunkBuilder, which worked, but only by happenstance. Now each class has their own implementation and the base class has a NotImplemented implementation.
* Simplify what the BlobBuilder.build method doesLars Wirzenius2012-03-021-38/+38
| | | | | | It's not really the blob builder's job to unpack chunks, or determine whether something needs building or not. Moved those things to better places.
* Remove unnecessary variableLars Wirzenius2012-03-021-7/+2
|
* Refactor SystemBuilder and add helper classLars Wirzenius2012-03-021-125/+171
| | | | | | | | The helper class, Factory, has unit tests, which is why it's currently separate. It may later get integrated with BlobBuilder, or the other way around. Classes that don't have unit tests are marked out of coverage.
* Remove unnecessary import of time moduleLars Wirzenius2012-02-281-1/+1
|
* Add comment explaining PATH trickery when running ldconfigLars Wirzenius2012-02-281-0/+7
|
* Builder.build and build_single also do not need to return values anymoreLars Wirzenius2012-02-281-6/+1
|
* Remove unused needs_built methodLars Wirzenius2012-02-281-4/+0
|
* Set sensible defaults for git-base-url, bundle-server, cachedir, max-jobsLars Wirzenius2012-02-281-4/+1
| | | | | | | | | | | | | | Also, change builder.py to always obey the --max-jobs setting, unless a morphology has a max-jobs field. The defaults have been chosen so that they work for everyone equally well. It may be useful to have a local mirror and then set the options to point there, but it's not reasonable to try to guess such things, so the defaults can be adapated to that. Collect the defaults into one place so they're easier to overview. The cliapp interface for adding settings is verbose enough that the defaults were getting buried.
* Make ./check check for long lines (with excptions); fix long linesLars Wirzenius2012-02-271-1/+2
|
* Create chunks, strata in cache via temporary filesLars Wirzenius2012-02-271-5/+13
| | | | | This avoids problems with files with the right names but partial content, if morph is killed in the middle of writing the file.
* Hide git output from unit test outputLars Wirzenius2012-02-271-1/+1
| | | | | | | | | | | | This makes it easier to check the output with vgrep for errors or problems. Voluminous git output made that hard. The key is that "git bundle create" has no --quiet optio (meh), so we have to redirect stderr to /dev/null. However, that would hide real errors, which we want to catch. Luckily, we can just replace the call to subprocess.call with a call to subprocess.check_call, and then we'll at least abort if there's an error, instead of silently ignoring it.
* morph: drop special case .git in mtime settingRichard Maw2012-02-271-6/+4
| | | | | | | | | | | | | Either all .gits need to be left alone, including submodules, or all of them get changed. Doing all gets surprisingly complicated, as bottom-up traversal is needed for directories to have their mtimes set, which means that either we check the path for a .git component, or we do our own traversal function, to top-down exclude .git and bottom-up set mtimes. This is more effort than it is worth when git probably doesn't care so let's just drop it entirely.
* morph: use right dir for set mtimeRichard Maw2012-02-271-1/+1
|
* morph: set mtime after submodule extractRichard Maw2012-02-271-1/+1
| | | | | | | | Setting mtimes can fail if it is a symbolic link and it points to a non-existant file. This has happened when we had symbolic links pointing to files in a submodule, so we set mtimes after submodules have been checked out.
* Exclude the .git directory from mtime changing, just in caseLars Wirzenius2012-02-241-5/+7
|
* Set mtime of all files after git checkout of source tree for buildingLars Wirzenius2012-02-241-0/+19
|
* Use "cp -a" and "git checkout" to unpack sources in the build tree.Jannis Pohlmann2012-02-221-2/+9
| | | | | | | | | This is done to keep the git repository intact with history and all that. cp + checkout turns out to be faster than a regular "git clone". In order to avoid roundtrips to the internet whenever a chunk tries to do something with submodules, we force the submodule URLs to point to our locally cached repos.
* builder.py: use sh -c instead of writing a scriptRichard Maw2012-02-211-11/+2
| | | | | | | | | | | | | | | | Putting the commands in a file made it more difficult to tell what happened in scripts, until the self.msg was added. After then it made the commands more difficult to reproduce So if it can safely be done in a single command it should be more readable. This approach uses sh -c to cd then evaluate the remaining options The command is 'cd "$1" && shift && eval "$@"', then passes the command as arguments to the shell script, so the program does not need to do any escaping of strings. If the commands were a list of strings instead of a quoted string then it would be a bit safer, but less flexible for use.
* Add Assert to make sure the destdir muckery is safeLars Wirzenius2012-02-171-0/+1
|
* Remove staging path prefix from $DESTDIR when we run things in chrootLars Wirzenius2012-02-171-0/+7
|
* Show the commands to be run in chrootLars Wirzenius2012-02-171-0/+1
|
* Merge branch 'master' of gitorious.org:baserock/morphLars Wirzenius2012-02-161-1/+2
|\
| * build-system: autotools now runs autoreconfRichard Maw2012-02-161-1/+2
| |
* | Fix how ldconfig is runLars Wirzenius2012-02-161-2/+2
| | | | | | | | Now it should actually work.
* | Build non-bootstrap chunks inside a staging chrootLars Wirzenius2012-02-161-4/+27
|/ | | | | | This adds options --staging-filler and --staging-chroot. The wisdom of these options needs to be re-considered at some point, but for now they're OK.
* Fix overriding of build system commandsLars Wirzenius2012-02-151-1/+15
| | | | | This time, with testing. For a five line method, this was surprisingly tricky to get right. Should sleep properly at night...
* Allow *-commands to override commands provided by build systemLars Wirzenius2012-02-151-18/+25
| | | | | | | | | | | | | This allows us to do this: "build-system": "autotools", "configure-commands": [ "./configure --prefix=$PREFIX --disable-nls --enable-foo" ] The explicit command is used for configure, but the commands provided by the autotools build-system will be used for build-commands, test-commands, and install-commands.
* Revert "Add --prefix option, adjust autotools system and env variables."Jannis Pohlmann2012-02-141-26/+6
| | | | This reverts commit 63cab3e0e2f550a0bfe470d018063a8b91a759bd.
* Revert "Set environment variables needed to build in a different prefix."Jannis Pohlmann2012-02-141-21/+19
| | | | This reverts commit e0fb97f08156af97ec2341ec8061fe514ae358e5.
* Set environment variables needed to build in a different prefix.Jannis Pohlmann2012-02-111-19/+21
| | | | This only includes PKG_CONFIG_PATH and LD_LIBRARY_PATH at the moment.
* Add --prefix option, adjust autotools system and env variables.Jannis Pohlmann2012-02-111-6/+26
|
* Extract chunk submodule repos into the build directory directly.Jannis Pohlmann2012-02-081-18/+22
| | | | | | | | | | | | | This change requires the latest version of cliapp to be installed. Rather than creating an archive from the cached git repositories, moving this tarball archive into the cache and then extracting it from there into the build directory, we now directly extract the sources into the build directory. We also recursively extract all submodules into the corresponding paths inside the build directory. (Recursing has not been tested yet, however.)
* Set GIT_DIR when running git archive. Drop --remote.Jannis Pohlmann2012-02-021-1/+2
| | | | | This change is necessary because upstream git no longer allows --remote to be combined with an arbitrary SHA1.
* Save the build log of each blob as $cache_prefix.log.Jannis Pohlmann2012-01-311-2/+24
| | | | | This may not be the optimal way of doing it but it is a start towards making debugging failed builds a little easier.
* Properly unpack dependencies into the staging area in build-single.Jannis Pohlmann2012-01-311-21/+24
| | | | | | | | | | | | This requires build-single to take a dependency context tuple when building chunks of a stratum. This context tuple is the surrounding stratum which is used to construct the dependency graph in the worker and then do a breadth-first search to collect all dependencies that need to be added to the staging area. Implementing this required a few hash/eq changes in Blob, Morphology and Treeish as well as a few adjustments in the corresponding unit tests.
* Add a "build-single" command to build a blob without its dependencies.Jannis Pohlmann2012-01-261-2/+35
| | | | | ...while at the same time making sure that all dependencies are marked for staging prior to building the blob itself.
* Disable logging in SourceManager (too verbose), save build times again.Jannis Pohlmann2012-01-231-1/+3
|
View Lorry Controller Status