Olaf Hering
2013-May-31 08:41 UTC
[Libguestfs] [PATCH] Change fallback name for external supermin helper
Use basename of external helper instead of 'no' for external supermin helpers. This gives a clear error messages what binary is actually missing, and it is now possible to install the missing package without recompiling libguestfs. In addition its now also possible to use private builds of supermin (if they are in PATH) with a given libguestfs binary package. Signed-off-by: Olaf Hering <olaf@aepfle.de> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 30af871..8f025d0 100644 --- a/configure.ac +++ b/configure.ac @@ -442,9 +442,9 @@ AC_SUBST([ENABLE_APPLIANCE]) dnl Check for supermin >= 4.1.0 or febootstrap >= 3.20. AC_CHECK_PROGS([SUPERMIN], - [supermin febootstrap],[no]) + [supermin febootstrap],[supermin]) AC_CHECK_PROGS([SUPERMIN_HELPER], - [supermin-helper febootstrap-supermin-helper],[no]) + [supermin-helper febootstrap-supermin-helper],[supermin-helper]) dnl Pass supermin --packager-config option. dnl
Richard W.M. Jones
2013-May-31 09:49 UTC
Re: [Libguestfs] [PATCH] Change fallback name for external supermin helper
On Fri, May 31, 2013 at 10:41:47AM +0200, Olaf Hering wrote:> Use basename of external helper instead of 'no' for external supermin > helpers. This gives a clear error messages what binary is actually > missing, and it is now possible to install the missing package without > recompiling libguestfs. In addition its now also possible to use private > builds of supermin (if they are in PATH) with a given libguestfs binary > package. > > Signed-off-by: Olaf Hering <olaf@aepfle.de> > --- > configure.ac | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 30af871..8f025d0 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -442,9 +442,9 @@ AC_SUBST([ENABLE_APPLIANCE]) > > dnl Check for supermin >= 4.1.0 or febootstrap >= 3.20. > AC_CHECK_PROGS([SUPERMIN], > - [supermin febootstrap],[no]) > + [supermin febootstrap],[supermin])Currently later code in configure.ac checks if "x$SUPERMIN" = "xno" and gives an error. That error would be broken/ineffective after this change. Also it does a version check on $SUPERMIN to make sure it's not the ancient febootstrap 2.x which doesn't work.> AC_CHECK_PROGS([SUPERMIN_HELPER], > - [supermin-helper febootstrap-supermin-helper],[no]) > + [supermin-helper febootstrap-supermin-helper],[supermin-helper])This part of the change OTOH seems OK. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#)
Olaf Hering
2013-May-31 11:38 UTC
Re: [Libguestfs] [PATCH] Change fallback name for external supermin helper
On Fri, May 31, Richard W.M. Jones wrote:> On Fri, May 31, 2013 at 10:41:47AM +0200, Olaf Hering wrote: > > Use basename of external helper instead of 'no' for external supermin > > helpers. This gives a clear error messages what binary is actually > > missing, and it is now possible to install the missing package without > > recompiling libguestfs. In addition its now also possible to use private > > builds of supermin (if they are in PATH) with a given libguestfs binary > > package. > > > > Signed-off-by: Olaf Hering <olaf@aepfle.de> > > --- > > configure.ac | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/configure.ac b/configure.ac > > index 30af871..8f025d0 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -442,9 +442,9 @@ AC_SUBST([ENABLE_APPLIANCE]) > > > > dnl Check for supermin >= 4.1.0 or febootstrap >= 3.20. > > AC_CHECK_PROGS([SUPERMIN], > > - [supermin febootstrap],[no]) > > + [supermin febootstrap],[supermin]) > > Currently later code in configure.ac checks if "x$SUPERMIN" = "xno" > and gives an error. That error would be broken/ineffective after this > change. Also it does a version check on $SUPERMIN to make sure it's > not the ancient febootstrap 2.x which doesn't work.But this requires that febootstrap or supermin is in BuildRequires:, while this change removes the hard dependency of BuildRequires:. But I see, if the appliance is enabled then it would now fail with this change. In my packaging the appliance is not enabled because zypp support in supermin is not yet complete, so I did not spot this part. So just drop this patch for mow, unless you want to remove the version check as well. Olaf