[PATCH 1/1] genenv: fix files copy

[PATCH 1/1] genenv: fix files copy

[Jean-Christophe PLAGNIOL-VILLARD]

we may specify file in the defconfig

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 scripts/genenv |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/genenv b/scripts/genenv
index c84af0c..ff7972b 100755
--- a/scripts/genenv
+++ b/scripts/genenv
@@ -11,7 +11,11 @@ shift 2
 tempdir=$(mktemp -d tmp.XXXXXX)
 
 for i in $*; do
-	cp -r $i/* $tempdir
+	if [ -d $i ]; then
+		cp -r $i/* $tempdir
+	else
+		cp -a $i $tempdir
+	fi
 done
 
 find $tempdir -name '.svn' -o -name '*~' | xargs --no-run-if-empty rm -r
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/1] genenv: fix files copy

[Sascha Hauer]

On Tue, Sep 11, 2012 at 06:58:05AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> we may specify file in the defconfig

This was never intended to work, so this is no bug but a feature
addition. Can we rewrite the commit message to something like

'defenv: Allow to also specify files for the environment instead of only directories'

Sascha

> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  scripts/genenv |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/genenv b/scripts/genenv
> index c84af0c..ff7972b 100755
> --- a/scripts/genenv
> +++ b/scripts/genenv
> @@ -11,7 +11,11 @@ shift 2
>  tempdir=$(mktemp -d tmp.XXXXXX)
>  
>  for i in $*; do
> -	cp -r $i/* $tempdir
> +	if [ -d $i ]; then
> +		cp -r $i/* $tempdir
> +	else
> +		cp -a $i $tempdir
> +	fi
>  done
>  
>  find $tempdir -name '.svn' -o -name '*~' | xargs --no-run-if-empty rm -r
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox