[Armadeus-commitlog] SF.net SVN: armadeus:[985] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 985
          http://armadeus.svn.sourceforge.net/armadeus/?rev=985&view=rev
Author:   jorasse
Date:     2009-01-03 19:36:06 +0000 (Sat, 03 Jan 2009)

Log Message:
-----------
[buildroot] Added alternate download site capabilities to autotool based package + mprf and tslib.
- This alternate download apply after 20 primary download failed.

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig

Added Paths:
-----------
    trunk/patches/063-buildroot_add_alternate_download_site.diff
    trunk/patches/064-buildroot_add_tslib_alternate_site.diff
    trunk/patches/065-buildroot_add_mpfr_alternate_site.diff
    trunk/patches/066-buildroot_add_autotool_alternate_site.diff

Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================

--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig	2009-01-03 12:47:43 UTC (rev 984)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig	2009-01-03 19:36:06 UTC (rev 985)
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Thu Dec 11 21:20:25 2008
+# Sat Jan  3 20:06:58 2009
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_VERSION="0.10.0-svn"
@@ -96,6 +96,7 @@
 # Build options
 #
 BR2_PRIMARY_SITE=""
+BR2_ALTERNATE_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
 BR2_WGET="wget --passive-ftp"
 BR2_SVN_CO="svn co"
 BR2_SVN_UP="svn up"

Added: trunk/patches/063-buildroot_add_alternate_download_site.diff
===================================================================
--- trunk/patches/063-buildroot_add_alternate_download_site.diff	                        (rev 0)
+++ trunk/patches/063-buildroot_add_alternate_download_site.diff	2009-01-03 19:36:06 UTC (rev 985)
@@ -0,0 +1,30 @@
+--- buildroot/Config.in.ori	2009-01-03 16:55:05.000000000 +0100
++++ buildroot/Config.in	2009-01-03 16:50:34.000000000 +0100
+@@ -24,6 +24,15 @@
+ 	  default if the file is not found.
+ 	  NOTE: This only works for packages using the Makefile.autotools.in
+ 
++config BR2_ALTERNATE_SITE
++	string "Alternate download site"
++	default "ftp://ftp2.armadeus.com/armadeusw/download"
++	help
++	  Alternate site to download from. If this option is set then buildroot
++	  will try to download package source from this site if the file is not
++	  found on the default server.
++	  NOTE: This only works for packages using the Makefile.autotools.in
++
+ config BR2_WGET
+ 	string "Wget command"
+ 	default "wget --passive-ftp -nd"
+--- buildroot/project/Makefile.in.ori	2009-01-01 17:19:33.000000000 +0100
++++ buildroot/project/Makefile.in	2009-01-03 19:51:41.000000000 +0100
+@@ -55,6 +55,9 @@
+ TOPDIR_SUFFIX:=
+ endif
+ 
++ALTERNATE_SITE=$(strip $(subst ",, $(BR2_ALTERNATE_SITE)))
++#"))
++
+ DL_DIR=$(strip $(subst ",, $(BR2_DL_DIR)))
+ #"))
+ ifeq ($(DL_DIR),)

Added: trunk/patches/064-buildroot_add_tslib_alternate_site.diff
===================================================================
--- trunk/patches/064-buildroot_add_tslib_alternate_site.diff	                        (rev 0)
+++ trunk/patches/064-buildroot_add_tslib_alternate_site.diff	2009-01-03 19:36:06 UTC (rev 985)
@@ -0,0 +1,12 @@
+--- buildroot/package/tslib/tslib.mk.ref	2009-01-01 17:19:34.000000000 +0100
++++ buildroot/package/tslib/tslib.mk	2009-01-03 18:56:28.000000000 +0100
+@@ -10,7 +10,8 @@
+ TSLIB_DIR:=$(BUILD_DIR)/tslib-$(TSLIB_VERSION)
+ 
+ $(DL_DIR)/$(TSLIB_SOURCE):
+-	$(WGET) -P $(DL_DIR) $(TSLIB_SITE)/$(TSLIB_SOURCE)
++	-$(WGET) -P $(DL_DIR) $(TSLIB_SITE)/$(TSLIB_SOURCE)
++	$(Q)test -e $@ || $(WGET) -O $@ $(ALTERNATE_SITE)/$(TSLIB_SOURCE)
+ 
+ tslib-source: $(DL_DIR)/$(TSLIB_SOURCE)
+ 

Added: trunk/patches/065-buildroot_add_mpfr_alternate_site.diff
===================================================================
--- trunk/patches/065-buildroot_add_mpfr_alternate_site.diff	                        (rev 0)
+++ trunk/patches/065-buildroot_add_mpfr_alternate_site.diff	2009-01-03 19:36:06 UTC (rev 985)
@@ -0,0 +1,18 @@
+--- buildroot/package/mpfr/mpfr.mk.ori	2008-11-03 09:15:26.000000000 +0100
++++ buildroot/package/mpfr/mpfr.mk	2009-01-03 17:47:34.000000000 +0100
+@@ -21,11 +21,13 @@
+ MPFR_PATCH_SOURCE:=$(DL_DIR)/$(MPFR_PATCH_FILE)
+ 
+ $(MPFR_PATCH_SOURCE):
+-	$(WGET) -O $@ $(MPFR_SITE)/$(MPFR_PATCH)
++	-$(WGET) -O $@ $(MPFR_SITE)/$(MPFR_PATCH)
++	$(Q)test -e $@ || $(WGET) -O $@ $(ALTERNATE_SITE)/$(MPFR_PATCH)
+ endif
+ 
+ $(DL_DIR)/$(MPFR_SOURCE):
+-	 $(WGET) -P $(DL_DIR) $(MPFR_SITE)/$(MPFR_SOURCE)
++	-$(WGET) -P $(DL_DIR) $(MPFR_SITE)/$(MPFR_SOURCE)
++	$(Q)test -e $@ || $(WGET) -O $@ $(BR2_ALTERNATE_SITE)/$(MPFR_SOURCE)
+ 
+ $(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_PATCH_SOURCE)
+ 	$(MPFR_CAT) $(DL_DIR)/$(MPFR_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -

Added: trunk/patches/066-buildroot_add_autotool_alternate_site.diff
===================================================================
--- trunk/patches/066-buildroot_add_autotool_alternate_site.diff	                        (rev 0)
+++ trunk/patches/066-buildroot_add_autotool_alternate_site.diff	2009-01-03 19:36:06 UTC (rev 985)
@@ -0,0 +1,27 @@
+--- buildroot/package/Makefile.autotools.in.ori	2008-11-03 09:15:31.000000000 +0100
++++ buildroot/package/Makefile.autotools.in	2009-01-03 20:17:03.000000000 +0100
+@@ -135,16 +135,20 @@
+ $(BUILD_DIR)/%/.stamp_downloaded:
+ # support make source-check/external-deps
+ ifneq ($(SPIDER),)
+-	$(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
+-	$(if $($(PKG)_PATCH),$(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_PATCH))
++	-$(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
++	$(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $(ALTERNATE_SITE)/$($(PKG)_SOURCE)
++	-$(if $($(PKG)_PATCH),$(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_PATCH))
++	$(if $($(PKG)_PATCH),$(Q)test -e $(DL_DIR)/$($(PKG)_PATCH) || $(WGET) -P $(DL_DIR) $(ALTERNATE_SITE)/$($(PKG)_PATCH))
+ else
+ 	$(call MESSAGE,"Downloading")
+ ifneq ($(strip $(subst ",,$(BR2_PRIMARY_SITE))),)
+ #"))
+ 	-$(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $(BR2_PRIMARY_SITE)/$($(PKG)_SOURCE)
+ endif
+-	$(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
+-	$(if $($(PKG)_PATCH),$(Q)test -e $(DL_DIR)/$($(PKG)_PATCH) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_PATCH))
++	-$(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
++	$(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $(ALTERNATE_SITE)/$($(PKG)_SOURCE)
++	-$(if $($(PKG)_PATCH),$(Q)test -e $(DL_DIR)/$($(PKG)_PATCH) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_PATCH))
++	$(if $($(PKG)_PATCH),$(Q)test -e $(DL_DIR)/$($(PKG)_PATCH) || $(WGET) -P $(DL_DIR) $(ALTERNATE_SITE)/$($(PKG)_PATCH))
+ 	$(Q)mkdir -p $(@D)
+ 	$(Q)touch $@
+ endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


