X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=4167a10a1b791ccb538e5a359e62470d5be78890;hb=aac35ff7cc1f07f192bec9476ad0971262545a9a;hp=e5a7b988bfcf4c9412f0038b8fc440cc40812f61;hpb=b43e5b8a6da765ea993f24dcd601f0ce826309ea;p=omf.git

diff --git a/Makefile b/Makefile
index e5a7b98..4167a10 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,16 @@
 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://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
 
 ALL += omf-resctl
-omf-resctl-URL		:= $(REPO)/omf-resctl-5.3-1ubuntu2-2.noarch.rpm
-omf-resctl-SHA1SUM	:= 73f65d323088d4b1f3eaf6d22a652dbac40c10e9
+omf-resctl-URL		:= $(REPO)/omf-resctl-5.3-1ubuntu7-2.noarch.rpm
+omf-resctl-SHA1SUM	:= c757123d216e7a11ab971101d2e9fdf450dd301d
 omf-resctl		:= $(notdir $(omf-resctl-URL))
 ALL += omf-common
-omf-common-URL		:= $(REPO)/omf-common-5.3-1ubuntu3-2.noarch.rpm
-omf-common-SHA1SUM	:= 1426245402343bc961984f7a243ea36e3415eecb
+omf-common-URL		:= $(REPO)/omf-common-5.3-1ubuntu6-2.noarch.rpm
+omf-common-SHA1SUM	:= f79ecfc7e6bad69fa4b980c8e8ec3ea35723f83c
 omf-common		:= $(notdir $(omf-common-URL))
 ALL += liblog4r
 liblog4r-URL		:= $(REPO)/liblog4r-ruby1.8-1.2-1.noarch.rpm
@@ -48,29 +49,11 @@ $($(1)):
 	    echo "In Makefile: $($(1)-SHA1SUM)" ; \
 	    false ; \
 	else \
-	    Ls -l $($(1)) ; \
+	    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
-#CLEAN += $($(1))
-#endef
-
 $(eval $(call download_target,omf-resctl))
 $(eval $(call download_target,omf-common))
 $(eval $(call download_target,liblog4r))
@@ -83,6 +66,14 @@ 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)