3:41 a.m.
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(a)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
4:49 a.m.
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(a)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#)
6:38 a.m.
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(a)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
6:43 a.m.
On Fri, May 31, 2013 at 01:38:06PM +0200, Olaf Hering wrote:
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.
Actually I thought zypp support was complete? Oh well, how far off is
complete zypp support in supermin?
On the slightly related subject, I need to add dnf/libsolv support to
supermin. I don't know how much code could be shared. Unfortunately
I suspect not very much since although both zypper and dnf are using
the same underlying library, there's not much else in common.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/
7 a.m.
On Fri, May 31, Richard W.M. Jones wrote:
On Fri, May 31, 2013 at 01:38:06PM +0200, Olaf Hering wrote:
> 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.
Actually I thought zypp support was complete? Oh well, how far off is
complete zypp support in supermin?
supermin can not be used in a chroot when called as builduser, because
there is no repo configured inside that chroot.
supermin need to handle the case '--root X --reposd-dir Y', which is
triggered by the '--packager-config <conf>' option. Currently the
<conf>
file is expected in X//<conf>, which will fail.
The new code has to parse <conf>, look for reposdir=<dir> and replace
the current hardcode path Y with the one from <conf> so that libzypp
continues to oerate below X (--root X --repos-dir <dir>).
I think there is some odd ocaml-iniparser package, which I could use.
Or I just grep for reposdir= and use that.
On the slightly related subject, I need to add dnf/libsolv support
to
supermin. I don't know how much code could be shared. Unfortunately
I suspect not very much since although both zypper and dnf are using
the same underlying library, there's not much else in common.
I dont know much about the underlying libsolv, its very likely that in
the end libzypp does all the required work.
Olaf
4:37 a.m.
On Fri, May 31, Richard W.M. Jones wrote:
On Fri, May 31, 2013 at 01:38:06PM +0200, Olaf Hering wrote:
> 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.
Actually I thought zypp support was complete? Oh well, how far off is
complete zypp support in supermin?
One thing thats still missing is the --exclude= part.
I think zypp_rpm_resolve_dependencies_and_download_no_installed should
iterate over pkgs, call rpm -qp %{NAME} for every package and skip
packages matching the regex. The same should be done in
zypp_rpm_resolve_dependencies_and_download_use_installed with pkg_names.
Olaf
4530
days inactive
4540
days old
5 comments
2 participants
participants (2)
-
Olaf Hering -
Richard W.M. Jones