X-Git-Url: http://git.onelab.eu/?p=omf.git;a=blobdiff_plain;f=Makefile;h=b4e0a602f78f2f463460e3f1563bc5e1e2d6d0f6;hp=d54c5e347bb80d2f75fdc5a41bc5e7caca4e54d0;hb=a5a13b20320ccc8d62b09b97bfaff9c5ff43aea2;hpb=b0505c54f17ab29f2587b52cf6701a0de8349f85

diff --git a/Makefile b/Makefile
index d54c5e3..b4e0a60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,35 @@
-# $Id: Makefile 16421 2010-01-04 11:29:55Z thierry $
-# $URL: svn+ssh://thierry@svn.planet-lab.org/svn/madwifi/trunk/Makefile $
 #
 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/
-REPO :=	http://mirror.onelab.eu/third-party/omf-5.3-federation-v1.1
+#REPO :=	http://mirror.onelab.eu/third-party/omf-5.3-federation-v1.1
+REPO :=		http://pkg.mytestbed.net/rpm/5.3/f14/x86_64/
 
 ALL += omf-resctl
-omf-resctl-URL		:= $(REPO)/omf-resctl-5.3-1ubuntu10-2.noarch.rpm
-omf-resctl-SHA1SUM	:= ab92e7213a1669214857b8d5f1c4819896a489ac
+omf-resctl-URL		:= $(REPO)/omf-resctl-5.3-1ubuntu11-2.noarch.rpm
+omf-resctl-SHA1SUM	:= e1cbc5cd4d492da16dc95d2d51c0a0e87836919a
 omf-resctl		:= $(notdir $(omf-resctl-URL))
 ALL += omf-common
-omf-common-URL		:= $(REPO)/omf-common-5.3-1ubuntu9-2.noarch.rpm
-omf-common-SHA1SUM	:= 24d7f6c96f25e71b470a4906405588987f59a015
+omf-common-URL		:= $(REPO)/omf-common-5.3-1ubuntu10-2.noarch.rpm
+omf-common-SHA1SUM	:= 9eb16107965ecc29bf54aca964ccfe898085c415
 omf-common		:= $(notdir $(omf-common-URL))
 ALL += liblog4r
 liblog4r-URL		:= $(REPO)/liblog4r-ruby1.8-1.2-1.noarch.rpm
-liblog4r-SHA1SUM	:= 4301cc01e65fdd1c136356ea8735ef935d997ccc
+liblog4r-SHA1SUM	:= d79d8efb0e80655e3b80c1260433dd4537529064
 liblog4r		:= $(notdir $(liblog4r-URL))
 ALL += libxmpp4r
 libxmpp4r-URL		:= $(REPO)/libxmpp4r-ruby1.8-1.0-1.noarch.rpm
-libxmpp4r-SHA1SUM	:= 3332f38a3de90a9e0947d50d48d955cb946eba35
+libxmpp4r-SHA1SUM	:= 29c985034d45d5aad8de4b1b87e9f4b753593e2a
 libxmpp4r		:= $(notdir $(libxmpp4r-URL))
-ALL += imagezip
-imagezip-URL		:= $(REPO)/imagezip-1.0.0-3.i386.rpm
-imagezip-SHA1SUM	:= 88088ca0aed57edc2b6ad6acc65a0038486fe67e
-imagezip		:= $(notdir $(imagezip-URL))
+#ALL += imagezip
+#imagezip-URL		:= $(REPO)/imagezip-1.0.0-3.i386.rpm
+#imagezip-SHA1SUM	:= 88088ca0aed57edc2b6ad6acc65a0038486fe67e
+#imagezip		:= $(notdir $(imagezip-URL))
 
 ALL += omf-expctl
-omf-expctl-URL		:= $(REPO)/omf-expctl-5.3-1ubuntu9-2.noarch.rpm
-omf-expctl-SHA1SUM	:= 9c98c498c8a760447ea63b6af766087d184e9ca0
+omf-expctl-URL		:= $(REPO)/omf-expctl-5.3-1ubuntu13-2.noarch.rpm
+omf-expctl-SHA1SUM	:= 44ea2bc89af5198d1a9f3d2d94bc3eeb93c30c7f
 omf-expctl		:= $(notdir $(omf-expctl-URL))
 
 all: $(ALL)
@@ -58,7 +57,7 @@ $(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,imagezip))
 
 $(eval $(call download_target,omf-expctl))