similar to: [PATCH] builder: complete architecture handling

Add support for non-integer revisions of entries, comparing them as integer when possible. --- builder/builder.ml | 9 ++++++++- builder/cache.ml | 2 +- builder/cache.mli | 6 +++--- builder/downloader.mli | 2 +- builder/index.ml | 4 ++-- builder/index.mli | 2 +- builder/index_parser.ml | 4 ++-- builder/utils.ml | 7 +++++++ 8 files changed, 25

On Tuesday 11 March 2014 10:09:45 Richard W.M. Jones wrote: > On Mon, Mar 10, 2014 at 02:28:20PM +0100, Pino Toscano wrote: > > Add the possibility to choose which architecture use to build the > > wanted image (--arch). Since this implies that running commands on > > the guest is usually not possible when the architecture is > > different than the host one, another new

Change Index.arch to the type (Arch of string | GuessedArch of string). In a future commit, the index parser will allow arch not to be set for some cases. Thus arch value will be guessed by inspecting the image. However we need to distinguish between a set value and a guessed one. Using this new type will help it: match arch with | Arch s -> (* This is a set value *) |

Change Index.arch to the type (Arch of string | GuessedArch of string). In a future commit, the index parser will allow arch not to be set for some cases. Thus arch value will be guessed by inspecting the image. However we need to distinguish between a set value and a guessed one. Using this new type will help it: match arch with | Arch s -> (* This is a set value *) |

In a future commit, the index parser will allow arch not to be set for some cases. In such cases, it will be guessed by inspecting the image, but we need to distinguish between a set value and a guessed one. Using the '(string, string option) maybe' type will help it: match arch with | Either s -> (* This is a set value *) | Or Some s -> (* This is a guessed value *)

These are now passed using a curl configuration file, which is a little bit safer than using command lines. virt-builder doesn't need to pass usernames and passwords to curl, but if it ever does in future this will be a lot safer. --- builder/Makefile.am | 1 + builder/builder.ml | 6 +-- builder/downloader.ml | 94

Move the index and entry definitions in an own Index module, together with the (previously internal to Index_parser) print_entry debugging function. --- builder/Makefile.am | 2 + builder/builder.ml | 36 +++++++-------- builder/index.ml | 117 +++++++++++++++++++++++++++++++++++++++++++++++ builder/index.mli | 41 +++++++++++++++++ builder/index_parser.ml | 96

--- builder/Makefile.am | 1 + builder/builder.ml | 69 +++++++++++++++++++++++++---------------------------- builder/cmdline.ml | 37 ++++++++++++++++++++++++---- builder/cmdline.mli | 44 ++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 41 deletions(-) create mode 100644 builder/cmdline.mli diff --git a/builder/Makefile.am b/builder/Makefile.am index 6742822..993cc7b

Introduce a mandatory arch= key in all the entries of index files, to identify which architecture is each. Adapt the long and JSON list outputs to print also this new field. This introduces an incompatibility with index files created with virt-builder < 1.26, as they will be rejected until entries will have the arch= key added (which is ignored by older virt-builder, so adding it will not

When caching all the templates, use the architecture of each template, instead of the architecture passed as --arch (or the host architecture, as default). This way, the right destination filename will be used. Fixes commit b1cf6246f3c80762cf27dbdb24168589a34daf00. Thanks to: Erik Skultety. --- builder/Makefile.am | 2 + builder/builder.ml | 4 +-

Create a single temporary directory for all the files created during the virt-builder run (except big disk images, which already use the libguestfs cache directory). A single directory means there is no need to manually schedule all the temporary files and directories for removal when the application quits. --- builder/builder.ml | 12 ++++++++++-- builder/downloader.ml |

Create a single temporary directory for all the files created during the virt-builder run (except big disk images, which already use the libguestfs cache directory). A single directory means there is no need to manually schedule all the temporary files and directories for removal when the application quits. --- builder/builder.ml | 12 ++++++++++-- builder/downloader.ml |

If you have a struct containing ?field?, eg: type t = { field : int } then previously to pattern-match on this type, eg. in function parameters, you had to write: let f { field = field } = (* ... use field ... *) In OCaml >= 3.12 it is possible to abbreviate cases where the field being matched and the variable being bound have the same name, so now you can just write: let f {

Copy the information about the proxy of a source in all the entries of that source; this way it is possible to use it later when accessing to the actual image of an entry. --- builder/index_parser.ml | 2 ++ builder/index_parser.mli | 1 + 2 files changed, 3 insertions(+) diff --git a/builder/index_parser.ml b/builder/index_parser.ml index 2040656..40b2116 100644 --- a/builder/index_parser.ml

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++- builder/index.mli | 3 + builder/index_parser.ml | 54 ++++++++++++++++++ builder/index_parser.mli | 4 ++

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++- builder/index.mli | 3 + builder/index_parser.ml | 54 ++++++++++++++++++ builder/index_parser.mli | 4 ++

get_index now gets a new template parameter. Setting it to true will make the index parsing less picky about missing important data. This can be used to parse a partial index file. --- builder/index_parser.ml | 46 ++++++++++++++++++++++++++++++++++++++-------- builder/index_parser.mli | 5 ++++- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/builder/index_parser.ml

get_index now gets a new template parameter. Setting it to true will make the index parsing less picky about missing important data. This can be used to parse a partial index file. --- builder/index_parser.ml | 44 ++++++++++++++++++++++++++++++++++++-------- builder/index_parser.mli | 5 ++++- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/builder/index_parser.ml

get_index now gets a new template parameter. Setting it to true will make the index parsing less picky about missing important data. This can be used to parse a partial index file. --- builder/index_parser.ml | 51 ++++++++++++++++++++++++++++++++++++++++-------- builder/index_parser.mli | 5 ++++- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/builder/index_parser.ml

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++- builder/index.mli | 3 + builder/index_parser.ml | 46 +++++++++++++++ builder/index_parser.mli | 4 ++