[libvirt] [PATCH] build: only create virt-login-shell for lxc builds
I noticed from an ./autobuild.sh run that we were installing a virt-login-shell.exe binary when cross-building for mingw, even though such a binary is necessarily worthless since the code depends on lxc which is a Linux-only concept. * tools/Makefile.am (conf_DATA, bin_PROGRAMS, dist_man1_MANS): Make virt-login-shell installation conditional. Signed-off-by: Eric Blake <eblake@redhat.com> --- I'm debating about pushing this under the build-breaker rule. tools/Makefile.am | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 74fae2d..4a3338f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -60,10 +60,10 @@ EXTRA_DIST = \ DISTCLEANFILES = confdir = $(sysconfdir)/libvirt -conf_DATA = virt-login-shell.conf +conf_DATA = bin_SCRIPTS = virt-xml-validate virt-pki-validate -bin_PROGRAMS = virsh virt-host-validate virt-login-shell +bin_PROGRAMS = virsh virt-host-validate libexec_SCRIPTS = libvirt-guests.sh if WITH_SANLOCK @@ -71,12 +71,20 @@ sbin_SCRIPTS = virt-sanlock-cleanup DISTCLEANFILES += virt-sanlock-cleanup endif +if WITH_LXC +conf_DATA += virt-login-shell.conf +bin_PROGRAMS += virt-login-shell +endif WITH_LXC + + dist_man1_MANS = \ virt-host-validate.1 \ virt-pki-validate.1 \ virt-xml-validate.1 \ - virt-login-shell.1 \ virsh.1 +if WITH_LXC +dist_man1_MANS += virt-login-shell.1 +endif WITH_LXC if WITH_SANLOCK dist_man8_MANS = virt-sanlock-cleanup.8 endif -- 1.8.3.1
On 08/30/13 22:37, Eric Blake wrote:
I noticed from an ./autobuild.sh run that we were installing a virt-login-shell.exe binary when cross-building for mingw, even though such a binary is necessarily worthless since the code depends on lxc which is a Linux-only concept.
* tools/Makefile.am (conf_DATA, bin_PROGRAMS, dist_man1_MANS): Make virt-login-shell installation conditional.
Signed-off-by: Eric Blake <eblake@redhat.com> ---
I'm debating about pushing this under the build-breaker rule.
tools/Makefile.am | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
ACK and worth fixing this before releasing it. Peter
On 08/30/2013 04:25 PM, Peter Krempa wrote:
On 08/30/13 22:37, Eric Blake wrote:
I noticed from an ./autobuild.sh run that we were installing a virt-login-shell.exe binary when cross-building for mingw, even though such a binary is necessarily worthless since the code depends on lxc which is a Linux-only concept.
* tools/Makefile.am (conf_DATA, bin_PROGRAMS, dist_man1_MANS): Make virt-login-shell installation conditional.
Signed-off-by: Eric Blake <eblake@redhat.com> ---
I'm debating about pushing this under the build-breaker rule.
tools/Makefile.am | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
ACK and worth fixing this before releasing it.
Thanks; pushed. I'll probably have a similar patch for the virtlockd files that are also tripping up ./autobuild.sh on a mingw rpm, once I can get past my current issue of 'make distcheck' not liking docs/Makefile.am. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Fri, Aug 30, 2013 at 02:37:20PM -0600, Eric Blake wrote:
I noticed from an ./autobuild.sh run that we were installing a virt-login-shell.exe binary when cross-building for mingw, even though such a binary is necessarily worthless since the code depends on lxc which is a Linux-only concept.
* tools/Makefile.am (conf_DATA, bin_PROGRAMS, dist_man1_MANS): Make virt-login-shell installation conditional.
Signed-off-by: Eric Blake <eblake@redhat.com> ---
I'm debating about pushing this under the build-breaker rule.
tools/Makefile.am | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
Unfortunately this will now break the libvirt.spec.in if %{with_lxc} is set to 0. Fortunately we don't do that by default for any platforms we support but still nice to fix it Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On 09/02/2013 05:35 AM, Daniel P. Berrange wrote:
On Fri, Aug 30, 2013 at 02:37:20PM -0600, Eric Blake wrote:
I noticed from an ./autobuild.sh run that we were installing a virt-login-shell.exe binary when cross-building for mingw, even though such a binary is necessarily worthless since the code depends on lxc which is a Linux-only concept.
* tools/Makefile.am (conf_DATA, bin_PROGRAMS, dist_man1_MANS): Make virt-login-shell installation conditional.
Signed-off-by: Eric Blake <eblake@redhat.com> ---
I'm debating about pushing this under the build-breaker rule.
tools/Makefile.am | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
Unfortunately this will now break the libvirt.spec.in if %{with_lxc} is set to 0. Fortunately we don't do that by default for any platforms we support but still nice to fix it
Okay, I'll post a followup patch later today. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (3)
-
Daniel P. Berrange -
Eric Blake -
Peter Krempa