similar to: [PATCH] osinfo: parse also single-digit version numbers

Make use of the common version code, and avoid a separate regexp. --- src/osinfo.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/osinfo.c b/src/osinfo.c index 4a4cbfc..f4e2c71 100644 --- a/src/osinfo.c +++ b/src/osinfo.c @@ -65,8 +65,6 @@ #include "guestfs.h" #include "guestfs-internal.h" -COMPILE_REGEXP (re_major_minor,

Split lib/osinfo.c to provide an API for other pieces of code (namely mllib) to reuse it. The ISO-related processing is thus moved into a lib/osinfo-iso.c file. --- lib/Makefile.am | 2 + lib/osinfo-iso.c | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/osinfo.c | 422 +------------------------------------------------- lib/osinfo.h | 27 ++++ 4 files changed, 493

Split lib/osinfo.c to provide an API for other pieces of code (namely mllib) to reuse it. The ISO-related processing is thus moved into a lib/osinfo-iso.c file. --- lib/Makefile.am | 2 + lib/osinfo-iso.c | 464 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/osinfo.c | 424 +------------------------------------------------- lib/osinfo.h | 27 ++++ 4 files changed, 495

Split lib/osinfo.c to provide an API for other pieces of code (namely mllib) to reuse it. The ISO-related processing is thus moved into a lib/osinfo-iso.c file. --- lib/Makefile.am | 2 + lib/osinfo-iso.c | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/osinfo.c | 420 +------------------------------------------------- lib/osinfo.h | 27 ++++ 4 files changed, 493

Split lib/osinfo.c to provide an API for other pieces of code (namely mllib) to reuse it. The ISO-related processing is thus moved into a lib/osinfo-iso.c file. --- lib/Makefile.am | 2 + lib/osinfo-iso.c | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/osinfo.c | 420 +------------------------------------------------- lib/osinfo.h | 27 ++++ 4 files changed, 493

src/osinfo.c has generic code to read the libosinfo DB. Add a wrapper around it to expose it in mllib for use in ocaml code. --- lib/Makefile.am | 2 + lib/osinfo-iso.c | 464 ++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/osinfo.c | 477 ++++++------------------------------------------------ lib/osinfo.h | 27 ++++ mllib/Makefile.am | 11 +- mllib/osinfo-c.c | 100

The "sles" distribution string in libguestfs represents both SLES and SLED, so map the osinfo descriptions of "sled" distributions as "sles". --- src/osinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osinfo.c b/src/osinfo.c index 907580e..7fdaf1c 100644 --- a/src/osinfo.c +++ b/src/osinfo.c @@ -625,7 +625,7 @@ parse_distro (guestfs_h

Hi all, Here is an update of the series fixing Pino's latest comment. It just doesn't implement the change based on never-accepted run commands patch. Cédric Bosdonnat (9): lib/osinfo.c: Extract xml processing into a callback lib: extract osinfo DB traversing API mllib: ocaml wrapper for lib/osinfo builder: rename docs test script builder: add a template parameter to get_index

Hi all, Here is a new version of the virt-builder-repository series taking care of Pino's comments. It has also been rebased on recent master. Cédric Bosdonnat (7): mllib: factorize code to add Checksum.get_checksum function Move xml and xpath_helpers OCAML code to mllib mllib: expose libosinfo DB reading functions in mllib builder: rename docs test script builder: add

Hi all, Here is an updated version of that patch series. Diff to v5: * Apply Pino's comments * Fix indentation issues * Add a default value for arch in builder/index_parser.ml if template is set * Improved new images filtering: don't process image that didn't change. This has been uncovered by introduction of --no-compression Cédric Bosdonnat (10): lib/osinfo.c:

Hi guys, Here is a v3 of the series, including changes to answer Richard's comments. Cédric Bosdonnat (10): mllib: factorize code to add Checksum.get_checksum function Move xml and xpath_helpers OCAML code to mllib mllib: add Xml.parse_file helper lib/osinfo.c: Extract xml processing into a callback lib: extract osinfo DB traversing API mllib: ocaml wrapper for lib/osinfo

Hi all, Here is the v5 of my patches series applying the latest comments from Pino. Cédric Bosdonnat (10): lib/osinfo.c: Extract xml processing into a callback lib: extract osinfo DB traversing API mllib: ocaml wrapper for lib/osinfo builder: rename docs test script builder: add a template parameter to get_index builder: add Index.write_entry function dib: move do_cp to

Hi all, Here is a v4 of my series. It includes the changes according to Pino and Richard's comments. However, the perrorf/debug problem is addressed differently: instead of adding an implementation for the internal function names when building for mllib, I redefine these macros. Obviously this is not perfect, but at least easier to understand. Pino's comment about the Notes regex

More recent versions of libosinfo switched the internal directory with the XML files of OSes to a different layout (still with the same XML format), causing libguestfs to not read them anymore. Furthermore, the internal directory is going to disappear soon, replaced by a public osinfo database [1]. Revamp the way libguestfs reads the data: first try the upcoming osinfo layout, falling back to

This just duplicated libosinfo information, and because it was never tested it didn't work most of the time. --- docs/C_SOURCE_FILES | 2 - generator/actions_inspection.ml | 67 --- generator/actions_inspection_deprecated.ml | 61 +++ inspector/Makefile.am | 11 +- inspector/example-debian-netinst-cd.xml | 23 -

Use the version struct in inspect_fs to hold the version of a filesystem, adapting the inspection code to that. Also, move the parts of the version parsing to helper functions of the version struct, so common bits like parsing "X.Y" or "X" version strings is done only once. --- v2 changes: - adapt to v2 changes in patch #1 src/guestfs-internal.h | 8 +-

--- src/osinfo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/osinfo.c b/src/osinfo.c index 0454b45..f7e1548 100644 --- a/src/osinfo.c +++ b/src/osinfo.c @@ -492,7 +492,9 @@ parse_distro (guestfs_h *g, xmlNodePtr node, struct osinfo *osinfo) content = (char *) xmlNodeGetContent (node); if (content) { - if (STREQ (content, "centos")) + if

On Tuesday, 7 March 2017 15:26:57 CET Cédric Bosdonnat wrote: > In order to further reuse the osinfo database parsing in OCAML, this > commit extracts the XML processing for the distro ISOs and places it > into a newly created callback. > > This will later help other code to traverse the osinfo DB files and > let them extract what they need from them. > --- Mostly LGTM, just

CentOS 8 is represented with a simpler "centos8" osinfo ID. --- lib/inspect-osinfo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/inspect-osinfo.c b/lib/inspect-osinfo.c index 90b7ffd86..ba07e4564 100644 --- a/lib/inspect-osinfo.c +++ b/lib/inspect-osinfo.c @@ -40,7 +40,9 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root) if (STREQ

On Tuesday, 12 September 2017 09:03:08 CEST Cédric Bosdonnat wrote: > From: Pino Toscano <ptoscano@redhat.com> > > The C osinfo database parser has been deprecated, reimplement the base > of it in ocaml for virt-builder-repository to use. This provides an > Osinfo.iterate_db() function traversing the files of the osinfo database > and calling a function on each of them.