| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Instead of logging every command for ourselves, use the shell X-ray
mode. As side effect, each command argument will now be printed out in
its evaluated form, which aids debugging.
Also, improve the visual separation between the different build steps,
and display those steps with finer granularity.
Change-Id: I16ebe9ba4ac46fef82e37d0b3e05f42d14249de8
|
|
|
|
|
|
|
| |
This is probably a sign that something is broken, but it's better to
cope with it rather than crashing.
Change-Id: I4e9c40d0b7db031ea271143938db61c4ad70a888
|
|
|
|
|
|
|
|
|
|
|
|
| |
The system-integration field in a chunk .morph file defines which of the
chunk artifacts the integration script should live. If you list an
artifact that doesn't exist, the integration script will not go anywhere
and the commands won't run.
Ideally system-integration commands will be become a bit more simple to
use, but hopefully this warning helps in the meantime.
Change-Id: I10a068e79eb46f98f0bd308a5caf3c445dda22ed
|
|
|
|
|
|
|
| |
Chunk commands will currently block if they read from stdin.
To fix this we set stdin to /dev/null so that the first read returns EOF.
Change-Id: I143396f4c443c098b2880c5925e6f0907cb4fb17
|
|
|
|
|
|
|
|
|
|
|
| |
It's quite easy to forget that "true" and "false" are special words in YAML,
and write "false" to halt the build process while debugging. This was treated
as a Boolean instead of a string, so causes an unhelpful error in morph.
Since there is no use for booleans in morphologies, they should be treated as
strings.
Change-Id: I7c872f9696611920febec5f375b599eee89d040e
|
|
|
|
| |
Change-Id: I19a6c31979aa36ff3c03f41e16e2d25ef407533b
|
|
|
|
|
|
|
|
| |
Do not remove this code for now as its possible that new versions
of morph build old sytems without the install-essential-files
extension
Change-Id: I5e49d0bc6baee73bedf16469d922822e76286bc1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I had a stratum artifact in my artifact cache which for some reason was
0 bytes long. When building a system that included this stratum, `morph
build` gave me the following output
2015-04-13 13:48:57 ERROR Traceback (most recent call last):
File "/src/morph/morphlib/builder.py", line 539, in build_and_cache
self.unpack_strata(fs_root)
File "/src/morph/morphlib/builder.py", line 600, in unpack_strata
chunks = [ArtifactCacheReference(c) for c in json.load(f)]
File "/usr/lib/python2.7/json/__init__.py", line 290, in load
**kw)
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads
return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode
obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 384, in raw_decode
raise ValueError("No JSON object could be decoded")
ValueError: No JSON object could be decoded
With this patch, I get a better error:
ERROR: Corruption detected: No JSON object could be decoded while
loading
/src/build/cache/artifacts/8b4422c58ecb2a085b142fbba74b760f501f65d4b2885bf707994973230e0c58.stratum.build-essential-minimal
Change-Id: I0ad359901c5da75bd26d5a1a8108ef4e6f1d7708
|
|
|
|
| |
Change-Id: Ibda7a938cd16e35517a531140f39ef4664d85c72
|
|\ |
|
| |
| |
| |
| | |
Change-Id: I992dc0c1d40f563ade56a833162d409b02be90a0
|
|/
|
|
| |
Change-Id: I771c3de9cecda7a503f4d36ae5d9fabc040892e4
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
This helps refactoring morph to get rid of treeishes.
|
|
|
|
|
|
|
|
| |
When making a copy of the repository to build from, builder copies the
.git directory then checks out the ref it wants.
However sometimes this doesn't add the files to the working directory,
possibly because the files it is missing weren't changed in the difference
between what the .git thought HEAD was and what is now checked out.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
I found the write_cache_metadata and prepare_binary_metadata methods
be confusingly similar, when skimming code. Since write_cache_metadata
was very short and only used from one place, inlined it, which removes
the confusion without, I think, adding complexity.
|
|
|
|
|
|
|
|
| |
The --target-cflags option is really just a temporary solution. At some
point we will want to have a proper target architecture/device
description that morph uses to define compiler flags etc.
For now, I hope this will do.
|
| |
|
| |
|
|
|
|
|
| |
The system images will later need to be read, so useful commands
want to be shared
|
|
|
|
| |
It only needs a morph, not a blob
|
|
|
|
|
| |
This is achieved by copying vmlinuz, System.map and extlinux.conf
to the default subvolume.
|
| |
|
| |
|
|\ |
|
| |
| |
| |
| |
| |
| | |
This should stop tar from replacing symbolic links with directories
and instead follow the symbolic links, extracting the files into
the linked directories
|
| |
| |
| |
| | |
f.write does not add them
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
Previously, we could get a situation where chunks named the same way
in two morphologies could interfere with each other: they could generate
the same cache key, resulting in their chunks overwriting each other.
Now this won't happen anymore.
|
| |
| |
| |
| | |
The mkimage.sh script should now be unnecessary again.
|
| | |
|
| |
| |
| |
| |
| | |
Add PREFIX to the whitelist of environment variables that
can affect the cache keys.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previous change would share the same environment between all Builders
this may not have broken anything yet, but this change in behaviour
was unintentional.
The relevant cache keys are not altered by Builders and they are set
at the time the Builder is created, so the build string can be cached
rather than generated every time a cache key is needed
|
|/
|
|
|
|
| |
env is created in Builder's constructor from app.clean_env
cache keys now contain parts of the environment that may cause
chunks to be built differently
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
| |
|
|
|
|
| |
We can use self.app.settings instead.
|
|
|
|
|
| |
This is better done in morph, I think, since it is clear policy,
and should not be buried deep in the call stack.
|
| |
|