X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=fbe56224dc39f984594c363bcfcf820179c7cb29;hb=85bc798cde4c4fc8929e80eeed7b69cc28901630;hp=8e624a8199fdd514bec1a2435f3b82bc88d75fd4;hpb=b4f292f95db365643b79436d75c536ac73cd1429;p=omf.git

diff --git a/Makefile b/Makefile
index 8e624a8..fbe5622 100644
--- a/Makefile
+++ b/Makefile
@@ -20,11 +20,36 @@ ALL += libxmpp4r
 libxmpp4r-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/libxmpp4r-ruby1.8-1.0-1.noarch.rpm
 libxmpp4r-SHA1SUM	:= 7db1a6260435aca494f9b5e36517568a7f63e5c8
 libxmpp4r		:= $(notdir $(libxmpp4r-URL))
+ALL += imagezip
+imagezip-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/imagezip-1.0.0-3.i386.rpm
+imagezip-SHA1SUM	:= b96297e480dfbc2360bcb62ff4ee130794124849
+imagezip		:= $(notdir $(imagezip-URL))
+
+ALL += omf-expctl
+omf-expctl-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/omf-expctl-5.3-1ubuntu2-2.noarch.rpm
+omf-expctl-SHA1SUM	:= cb3fbc3e211c4cec48a55473ec3f1ba11caf487b
+omf-expctl		:= $(notdir $(omf-expctl-URL))
 
 all: $(ALL)
 .PHONY: all
 
 ##############################
+#define download_target
+#$(1): $($(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
+#endef
+
 define download_target
 $(1): $($(1))
 .PHONY: $($(1))
@@ -35,7 +60,8 @@ $($(1)):
 	    echo "sha1sum of the downloaded $($(1)) does not match the one from 'Makefile'" ; \
 	    echo "Local copy: $$$$($(SHA1SUM) $($(1)))" ; \
 	    echo "In Makefile: $($(1)-SHA1SUM)" ; \
-	    false ; \
+	    echo "Proceeding anyway .. " ; \
+	    ls -l $($(1)) ; \
 	else \
 	    ls -l $($(1)) ; \
 	fi
@@ -45,6 +71,9 @@ $(eval $(call download_target,omf-resctl))
 $(eval $(call download_target,omf-common))
 $(eval $(call download_target,liblog4r))
 $(eval $(call download_target,libxmpp4r))
+$(eval $(call download_target,imagezip))
+
+$(eval $(call download_target,omf-expctl))
 
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)