search for: package_version_full

...E([PACKAGE_VERSION_MAJOR],[v2v_major],[Major version number.]) +AC_DEFINE([PACKAGE_VERSION_MINOR],[v2v_minor],[Minor version number.]) +AC_DEFINE([PACKAGE_VERSION_RELEASE],[v2v_release],[Release number.]) +AC_DEFINE_UNQUOTED([PACKAGE_VERSION_EXTRA],["$v2v_extra"],[Extra version string.]) +PACKAGE_VERSION_FULL="v2v_major.v2v_minor.v2v_release${v2v_extra}" +AC_DEFINE_UNQUOTED([PACKAGE_VERSION_FULL],["$PACKAGE_VERSION_FULL"],[Full version string.]) +AC_SUBST([PACKAGE_VERSION_FULL]) + dnl Early gnulib initialization. HEADING([Configuring Gnulib]) gl_EARLY @@ -79,8 +105,6 @@ dnl These...

...AJOR],[v2v_major],[Major version number.]) > +AC_DEFINE([PACKAGE_VERSION_MINOR],[v2v_minor],[Minor version number.]) > +AC_DEFINE([PACKAGE_VERSION_RELEASE],[v2v_release],[Release number.]) > +AC_DEFINE_UNQUOTED([PACKAGE_VERSION_EXTRA],["$v2v_extra"],[Extra version string.]) > +PACKAGE_VERSION_FULL="v2v_major.v2v_minor.v2v_release${v2v_extra}" > +AC_DEFINE_UNQUOTED([PACKAGE_VERSION_FULL],["$PACKAGE_VERSION_FULL"],[Full version string.]) > +AC_SUBST([PACKAGE_VERSION_FULL]) > + > dnl Early gnulib initialization. > HEADING([Configuring Gnulib]) > gl_EARLY...

In an effort to reduce the code, start to use few bits of GLib: - replace the gnulib c-type module - replace the gnulib getprogname module - use g_spawn_sync to launch curl, and drop a file reading function Pino Toscano (6): Include glib.h in p2v.h Use g_ascii_isspace instead of c_isspace from gnulib Use g_get_prgname instead of getprogname from gnulib build: remove no more used gnulib

...et feedback on the progress of configure. --- configure.ac | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/configure.ac b/configure.ac index 7f9c1dac0..5ccf6f821 100644 --- a/configure.ac +++ b/configure.ac @@ -76,11 +76,15 @@ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_FULL],["$PACKAGE_VERSION_FULL"],[Full versio AC_SUBST([PACKAGE_VERSION_FULL]) dnl Early gnulib initialization. +AS_ECHO +AS_ECHO(["Configuring Gnulib:"]) gl_EARLY gl_INIT dnl Check for external programs required to either build or run dnl libguestfs. +AS_ECHO +AS_ECHO([&quo...

Just refactoring. Rich.

...quot;) dirs in List.map (fun x -> x // prog) dirs diff --git a/mllib/guestfs_config.ml.in b/mllib/guestfs_config.ml.in index 68dbcbc20..15bebd582 100644 --- a/mllib/guestfs_config.ml.in +++ b/mllib/guestfs_config.ml.in @@ -22,5 +22,6 @@ let package_version = "@PACKAGE_VERSION@" let package_version_full = "@PACKAGE_VERSION_FULL@" let prefix = "@prefix@" let datadir = prefix ^ "/share" +let sysconfdir = "@sysconfdir@" let host_cpu = "@host_cpu@" let gnupg = "@GNUPG@" -- 2.12.0

...quot;) dirs in List.map (fun x -> x // prog) dirs diff --git a/mllib/guestfs_config.ml.in b/mllib/guestfs_config.ml.in index 68dbcbc20..15bebd582 100644 --- a/mllib/guestfs_config.ml.in +++ b/mllib/guestfs_config.ml.in @@ -22,5 +22,6 @@ let package_version = "@PACKAGE_VERSION@" let package_version_full = "@PACKAGE_VERSION_FULL@" let prefix = "@prefix@" let datadir = prefix ^ "/share" +let sysconfdir = "@sysconfdir@" let host_cpu = "@host_cpu@" let gnupg = "@GNUPG@" -- 2.12.0

...rt-v2v AC_PATH_PROGS([ZIP],[zip],[no]) AC_DEFINE_UNQUOTED([ZIP],["$ZIP"],[Name of zip program.]) diff --git a/mllib/guestfs_config.ml.in b/mllib/guestfs_config.ml.in index 4d1a5c5d0..68dbcbc20 100644 --- a/mllib/guestfs_config.ml.in +++ b/mllib/guestfs_config.ml.in @@ -23,3 +23,4 @@ let package_version_full = "@PACKAGE_VERSION_FULL@" let prefix = "@prefix@" let datadir = prefix ^ "/share" let host_cpu = "@host_cpu@" +let gnupg = "@GNUPG@" -- 2.12.0

After debugging a virt-p2v issue with a customer in the middle of the night on Tuesday, I felt it would have been helpful to know exactly which version(s) of virt-p2v and virt-v2v they were using. That wasn't very clear from the log file I was provided with, so this change makes sure the information is included every time. Rich.

...domnamev)) -NO_LIBVIRT (value v2v_libvirt_get_version (value unitv)) - -#endif /* !HAVE_LIBVIRT */ diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 277d8f2c7..c056aa787 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -59,16 +59,10 @@ let rec main () = prog Guestfs_config.package_name Guestfs_config.package_version_full Guestfs_config.host_cpu; - (* Print the libvirt version if debugging. Note that if - * we're configured --without-libvirt, then this will throw - * an exception, but some conversions should still be possible, - * hence the try block. - *) + (* Print the libvirt version if...

Hi, this series update libguestfs to a recent gnulib version, so that we can use its new getprogname module, and solve altogether one of the porting issues (the need for 'program_name' by the error module of gnulib), and have a single way to get the name of the current program. A number of changes in tools mostly, although mechanical. Thanks, Pino Toscano (3): Update gnulib to latest

...d5sum_virt_p2v" \ - -v "libexecdir=$libexecdir" \ -v "branding=$branding" \ -v "release_pkg=$release_pkg" \ -v "base_pattern=$base_pattern" \ @@ -229,7 +221,6 @@ fi gsub (/__PACKAGE_VERSION__/, "@PACKAGE_VERSION@"); gsub (/__PACKAGE_VERSION_FULL__/, "@PACKAGE_VERSION_FULL@"); gsub (/<!--__DEPENDENCIES__-->/, dependencies); - gsub (/__LIBEXECDIR__/, libexecdir); gsub (/__BRANDING__/, branding); gsub (/__RELEASE_PKG__/, release_pkg); gsub (/__BASE_PATTERN__/, base_pattern); diff --git a/p2v/virt-p2v-mak...

...or.libguestfs_minor.libguestfs_release) +# Headings within the configure script output. +m4_define([HEADING], + [AS_ECHO + AS_ECHO(["--- $1 ---"])]) + AC_CONFIG_AUX_DIR([build-aux]) AC_REQUIRE_AUX_FILE([guestfs-test-driver]) @@ -76,15 +81,13 @@ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_FULL],["$PACKAGE_VERSION_FULL"],[Full versio AC_SUBST([PACKAGE_VERSION_FULL]) dnl Early gnulib initialization. -AS_ECHO -AS_ECHO(["Configuring Gnulib:"]) +HEADING([Configuring Gnulib]) gl_EARLY gl_INIT dnl Check for external programs required to either build or run dnl libg...

Hi, as it was already discussed on this list, here it is my attempt in splitting virt-p2v in an own repository. Sadly there are things that must be copied from libguestfs, as it cannot be avoided. The approach taken was to run a script (will send separately) to just get the "p2v" subdirectory with its history as own repository, and then add in few followup commits all the bits needed

...quot;; + print $fh "\n" + } + + print $fh <<"EOF"; +/** + * Print the conversion parameters and other important information. + */ +void +print_config (struct config *c, FILE *fp) +{ + size_t i; + + fprintf (fp, \"%-20s %s\\n\", \"local version\", PACKAGE_VERSION_FULL); + fprintf (fp, \"%-20s %s\\n\", \"remote version\", + v2v_version ? v2v_version : \"unknown\"); +EOF + + generate_field_print($fh, undef, "c->", @fields); + + print $fh <<"EOF"; +} +EOF +} + +sub find_alias { + my $name = sh...

...t;cannot parse -n option"); + break; + + case 'x': + guestfs_set_trace (g, 1); + break; + + case 'v': + guestfs_set_verbose (g, 1); + break; + + case 'V': + printf ("%s %s\n", + getprogname (), + PACKAGE_VERSION_FULL); + exit (EXIT_SUCCESS); + + case HELP_OPTION: + usage (EXIT_SUCCESS); + + default: + usage (EXIT_FAILURE); + } + } + + if (n == -1) + error (EXIT_FAILURE, 0, "either -n NR_DISKS or --max must be specified"); + + if (n == 0) { + n = get_max_disks (g); +...

Diff to v1: * Use access rather than stat in gui.c * Remove now uneeded and missplaced include for stat.h Cédric Bosdonnat (4): p2v: use yast2 lan on SUSE distros rather than NM p2v: fix dependencies for SLES / openSUSE p2v: add virt-p2v-make-kiwi to generate kiwi config p2v: add -x option to nm-online .gitignore | 3 + configure.ac | 2 +

Diff to v2: * remove leftover variable declaration in gui.c Cédric Bosdonnat (4): p2v: use yast2 lan on SUSE distros rather than NM p2v: fix dependencies for SLES / openSUSE p2v: add virt-p2v-make-kiwi to generate kiwi config p2v: add -x option to nm-online .gitignore | 3 + configure.ac | 2 + p2v/Makefile.am | 31 +++++-

...+ printf (" percent = %.1f\n", activities[i].percent); + } +} + +/* Print some information that will allow us to determine the test + * system when reviewing the results in future. + */ +static void +print_info (void) +{ + size_t i; + + printf ("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION_FULL); + + printf ("Host:\n"); + ignore_value (system ("uname -a")); + ignore_value (system ("grep '^model name' /proc/cpuinfo | head -1")); + + /* We can dig some information about qemu and the appliance out of + * the events. + */ + printf ("Applianc...

These are a prelude to fixing https://bugzilla.redhat.com/show_bug.cgi?id=1590220 A lot of the virt-p2v configuration code was duplicated manually. These changes make sure that most of it is generated. Rich.