Setting tag omf-5.3-11

[omf.git] / Makefile

diff --git a/Makefile b/Makefile
index d54c5e3..960d2c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,29 @@
-# $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
+#http://pkg.mytestbed.net/rpm/5.3/f14/noarch/ and x86_64
+REPO :=        http://mirror.onelab.eu/third-party/omf-5.3-federation-v1.3
 
 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-5.3.1-1.noarch.rpm
+omf-resctl-SHA1SUM     := 7dcac5c8b0942566d2f0a503ce28126e79e60dbb
 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-5.3.1-1.noarch.rpm
+omf-common-SHA1SUM     := fa7df2e9513f165856699aeceff7d044dd709729
 omf-common             := $(notdir $(omf-common-URL))
 ALL += liblog4r
 liblog4r-URL           := $(REPO)/liblog4r-ruby1.8-1.2-1.noarch.rpm
-liblog4r-SHA1SUM       := 4301cc01e65fdd1c136356ea8735ef935d997ccc
+liblog4r-SHA1SUM       := 32809abc26d26d9341a3bf14169701818ec61c5f
 liblog4r               := $(notdir $(liblog4r-URL))
 ALL += libxmpp4r
 libxmpp4r-URL          := $(REPO)/libxmpp4r-ruby1.8-1.0-1.noarch.rpm
-libxmpp4r-SHA1SUM      := 3332f38a3de90a9e0947d50d48d955cb946eba35
+libxmpp4r-SHA1SUM      := 6847f8a74e7f1e54af76f0cedd6d7582011fa037
 libxmpp4r              := $(notdir $(libxmpp4r-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-5.3.1-1.noarch.rpm
+omf-expctl-SHA1SUM     := 10ffd10a56c93db4d909cdb4e720f845ab11cf72
 omf-expctl             := $(notdir $(omf-expctl-URL))
 
 all: $(ALL)
@@ -58,7 +51,6 @@ $(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))
 
@@ -66,14 +58,6 @@ clean:
        rm -f $(CLEAN)
 .PHONY: clean
 
-repobase:=$(subst http://pkg.mytestbed.net/,,$(subst /yum/base/8/i386/,,$(REPO)))
-# this echoes a script that can be ran on the mirror
-mirror: 
-       @( echo mkdir -p $(repobase); echo cd $(repobase) ; \
-         $(foreach target,$(ALL), echo curl -O $(REPO)/$($(target)) ; ) )
-
-.PHONY: mirror
-
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)
 # make ++foo : idem but verbose, i.e. foo=$(foo)