handle rpm flag: _without_vbox

[libvirt.git] / Makefile

diff --git a/Makefile b/Makefile
index 0b9fec8..a07837a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,10 @@ SHA1SUM                 := sha1sum
 # tried to download this on the fly using git archive at git://libvirt.org/libvirt.git
 # but it feels like git archive is not supported/allowed there
 ALL                     += libvirt
-libvirt-URL            := ftp://libvirt.org/libvirt/libvirt-0.10.2.2.tar.gz
-libvirt-SHA1SUM        := 689866fad0374de95477c9ccbcb47915e78fbf8b
-libvirt                := $(notdir $(libvirt-URL))
+libvirt-URL1           := http://mirror.onelab.eu/third-party/libvirt-1.0.4.tar.gz
+libvirt-URL2           := http://planet-lab.org/third-party/libvirt-1.0.4.tar.gz
+libvirt-SHA1SUM        := 45e74a9a4c3a88c98ac4ae5d8200ea65c42b6951
+libvirt                := $(notdir $(libvirt-URL1))
 
 all: $(ALL)
 .PHONY: all
@@ -14,18 +15,20 @@ all: $(ALL)
 ##############################
 define download_target
 $(1): $($(1))
-.PHONY: $($(1))
+.PHONY: $(1)
 $($(1)): 
-               @if [ ! -e "$($(1))" ] ; then echo "$(WEBFETCH) $($(1)-URL)" ; $(WEBFETCH) $($(1)-URL) ; fi
-               @if [ ! -e "$($(1))" ] ; then echo "Could not download source file: $($(1)) does not exist" ; exit 1 ; fi
-               @if test "$$$$($(SHA1SUM) $($(1)) | awk '{print $$$$1}')" != "$($(1)-SHA1SUM)" ; then \
-                       echo "sha1sum of the downloaded $($(1)) does not match the one from 'Makefile'" ; \
-                       echo "Local copy: $$$$($(SHA1SUM) $($(1)))" ; \
-                       echo "In Makefile: $($(1)-SHA1SUM)" ; \
-                       false ; \
-               else \
-                       ls -l $($(1)) ; \
-               fi
+       @if [ ! -e "$($(1))" ] ; then \
+       { echo Using primary; echo "$(WEBFETCH) $($(1)-URL1)" ; $(WEBFETCH) $($(1)-URL1) ; } || \
+       { echo Using secondary; echo "$(WEBFETCH) $($(1)-URL2)" ; $(WEBFETCH) $($(1)-URL2) ; } ; fi
+       @if [ ! -e "$($(1))" ] ; then echo "Could not download source file: $($(1)) does not exist" ; exit 1 ; fi
+       @if test "$$$$($(SHA1SUM) $($(1)) | awk '{print $$$$1}')" != "$($(1)-SHA1SUM)" ; then \
+           echo "sha1sum of the downloaded $($(1)) does not match the one from 'Makefile'" ; \
+           echo "Local copy: $$$$($(SHA1SUM) $($(1)))" ; \
+           echo "In Makefile: $($(1)-SHA1SUM)" ; \
+           false ; \
+       else \
+           ls -l $($(1)) ; \
+       fi
 endef
 
 $(eval $(call download_target,libvirt))
@@ -44,7 +47,7 @@ BUILDOPTS = --without xen --without qemu --without hyperv --without phyp --witho
                        --without netcf --without avahi --without polkit --without sasl --without audit \
                        --without storage-iscsi --without storage-scsi --without storage-disk \
                        --without storage-rbd --without selinux --without dtrace --without sanlock \
-                       --without libxl --with capng --with udev --with interface \
+                       --without libxl --without vbox --with capng --with udev --with interface \
                        --define 'packager PlanetLab'
 
 trees: sources