[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-78-g5f20b2a

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  5f20b2af9e87dbf7d33ff055c2a1ed83eb181f5d (commit)
      from  4f6a93a988348aa816608217533a54b63d31a0d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5f20b2af9e87dbf7d33ff055c2a1ed83eb181f5d
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Feb 23 11:51:52 2012 +0100

    [BUILDROOT] 2012.02: re-add 151-buildroot-add_copy_method_for_download_helper.patch

-----------------------------------------------------------------------

Summary of changes:
 ...root-add_copy_method_for_download_helper.patch} |   36 ++++++++++----------
 1 files changed, 18 insertions(+), 18 deletions(-)
 copy patches/buildroot/{2011.05/150-buildroot-Adding_copy_method_for_download.patch => 2012.02/151-buildroot-add_copy_method_for_download_helper.patch} (63%)

diff --git a/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch b/patches/buildroot/2012.02/151-buildroot-add_copy_method_for_download_helper.patch
similarity index 63%
copy from patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
copy to patches/buildroot/2012.02/151-buildroot-add_copy_method_for_download_helper.patch
index 35bfc82..607e0bf 100644
--- a/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
+++ b/patches/buildroot/2012.02/151-buildroot-add_copy_method_for_download_helper.patch
@@ -6,8 +6,8 @@ Signed-off-by : Fabien Marteau <fab...@ar...>
 
 Index: buildroot/Config.in
 ===================================================================
---- buildroot.orig/Config.in	2011-05-27 16:18:21.000000000 +0200
-+++ buildroot/Config.in	2012-01-13 13:51:18.000000000 +0100
+--- buildroot.orig/Config.in	2012-02-12 23:22:29.000000000 +0100
++++ buildroot/Config.in	2012-02-23 11:31:44.000000000 +0100
 @@ -16,6 +16,10 @@
  
  menu "Commands"
@@ -21,18 +21,18 @@ Index: buildroot/Config.in
  	default "wget --passive-ftp -nd -t 3"
 Index: buildroot/package/Makefile.package.in
 ===================================================================
---- buildroot.orig/package/Makefile.package.in	2011-05-27 16:18:21.000000000 +0200
-+++ buildroot/package/Makefile.package.in	2012-01-13 13:52:21.000000000 +0100
-@@ -73,6 +73,7 @@
- SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET)
- BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET)
- GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET)
-+COPY:=$(call qstrip,$(BR2_COPY)) $(QUIET)
- 
- # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
- # used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the
-@@ -170,6 +171,24 @@
-   echo $(2)
+--- buildroot.orig/package/Makefile.package.in	2012-02-12 23:22:29.000000000 +0100
++++ buildroot/package/Makefile.package.in	2012-02-23 11:31:44.000000000 +0100
+@@ -92,6 +92,7 @@
+ SVN:=$(call qstrip,$(BR2_SVN))
+ BZR:=$(call qstrip,$(BR2_BZR))
+ GIT:=$(call qstrip,$(BR2_GIT))
++COPY:=$(call qstrip,$(BR2_COPY))
+ HG:=$(call qstrip,$(BR2_HG)) $(QUIET)
+ SCP:=$(call qstrip,$(BR2_SCP)) $(QUIET)
+ SSH:=$(call qstrip,$(BR2_SSH)) $(QUIET)
+@@ -262,6 +263,24 @@
+   echo $($(PKG)_SITE)/$($(PKG)_SOURCE)
  endef
  
 +
@@ -56,11 +56,11 @@ Index: buildroot/package/Makefile.package.in
  ################################################################################
  # DOWNLOAD -- Download helper. Will try to download source from:
  # 1) BR2_PRIMARY_SITE if enabled
-@@ -192,6 +211,7 @@
+@@ -287,6 +306,7 @@
  			git) $($(DL_MODE)_GIT) && exit ;; \
  			svn) $($(DL_MODE)_SVN) && exit ;; \
  			bzr) $($(DL_MODE)_BZR) && exit ;; \
 +			copy) $($(DL_MODE)_COPY) && exit ;; \
- 			*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
- 		esac ; \
- 	fi ; \
+ 			file) $($(DL_MODE)_LOCALFILES) && exit ;; \
+ 			scp) $($(DL_MODE)_SCP) && exit ;; \
+ 			hg) $($(DL_MODE)_HG) && exit ;; \


hooks/post-receive
-- 
armadeus