From: thierry <thierry@8c455092-636d-4788-adf5-e71def0336e8>
Date: Tue, 25 May 2010 09:20:32 +0000 (+0000)
Subject: use stable/tagged rpms from omf-5.3-federation-v1.1
X-Git-Tag: omf-5.3-3~2
X-Git-Url: http://git.onelab.eu/?p=omf.git;a=commitdiff_plain;h=b43e5b8a6da765ea993f24dcd601f0ce826309ea

use stable/tagged rpms from omf-5.3-federation-v1.1
---

diff --git a/Makefile b/Makefile
index fbe5622..e5a7b98 100644
--- a/Makefile
+++ b/Makefile
@@ -4,36 +4,55 @@
 WEBFETCH		:= curl -H Pragma: -O -R -S --fail --show-error
 SHA1SUM			:= sha1sum
 
+REPO :=	http://pkg.mytestbed.net/omf-5.3-federation-v1.1/yum/base/8/i386/
+
 ALL += omf-resctl
-omf-resctl-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/omf-resctl-5.3-1ubuntu2-2.noarch.rpm
-omf-resctl-SHA1SUM	:= 6f48dd1cb7505ba9301c55f9889fd78842510b68
+omf-resctl-URL		:= $(REPO)/omf-resctl-5.3-1ubuntu2-2.noarch.rpm
+omf-resctl-SHA1SUM	:= 73f65d323088d4b1f3eaf6d22a652dbac40c10e9
 omf-resctl		:= $(notdir $(omf-resctl-URL))
 ALL += omf-common
-omf-common-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/omf-common-5.3-1ubuntu3-2.noarch.rpm
-omf-common-SHA1SUM	:= aceaca433ffa6b3ea2b8f62dd57fc739ed01c442
+omf-common-URL		:= $(REPO)/omf-common-5.3-1ubuntu3-2.noarch.rpm
+omf-common-SHA1SUM	:= 1426245402343bc961984f7a243ea36e3415eecb
 omf-common		:= $(notdir $(omf-common-URL))
 ALL += liblog4r
-liblog4r-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/liblog4r-ruby1.8-1.2-1.noarch.rpm
-liblog4r-SHA1SUM	:= daf29f5e23665d835a922cb2dda693ba9aca4e07
+liblog4r-URL		:= $(REPO)/liblog4r-ruby1.8-1.2-1.noarch.rpm
+liblog4r-SHA1SUM	:= 4301cc01e65fdd1c136356ea8735ef935d997ccc
 liblog4r		:= $(notdir $(liblog4r-URL))
 ALL += libxmpp4r
-libxmpp4r-URL		:= http://pkg.mytestbed.net/yum/base/8/i386/libxmpp4r-ruby1.8-1.0-1.noarch.rpm
-libxmpp4r-SHA1SUM	:= 7db1a6260435aca494f9b5e36517568a7f63e5c8
+libxmpp4r-URL		:= $(REPO)/libxmpp4r-ruby1.8-1.0-1.noarch.rpm
+libxmpp4r-SHA1SUM	:= 3332f38a3de90a9e0947d50d48d955cb946eba35
 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-URL		:= $(REPO)/imagezip-1.0.0-3.i386.rpm
+imagezip-SHA1SUM	:= 88088ca0aed57edc2b6ad6acc65a0038486fe67e
 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-URL		:= $(REPO)/omf-expctl-5.3-1ubuntu2-2.noarch.rpm
+omf-expctl-SHA1SUM	:= ed8da06921ddf6870ae20ab3673276ec611106ed
 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
+CLEAN += $($(1))
+endef
+
 #define download_target
 #$(1): $($(1))
 #.PHONY: $($(1))
@@ -44,29 +63,14 @@ all: $(ALL)
 #	    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
+#CLEAN += $($(1))
 #endef
 
-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)" ; \
-	    echo "Proceeding anyway .. " ; \
-	    ls -l $($(1)) ; \
-	else \
-	    ls -l $($(1)) ; \
-	fi
-endef
-
 $(eval $(call download_target,omf-resctl))
 $(eval $(call download_target,omf-common))
 $(eval $(call download_target,liblog4r))
@@ -75,6 +79,10 @@ $(eval $(call download_target,imagezip))
 
 $(eval $(call download_target,omf-expctl))
 
+clean:
+	rm -f $(CLEAN)
+.PHONY: clean
+
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)
 # make ++foo : idem but verbose, i.e. foo=$(foo)