[PATCH] fix genenv when using svn based enviroment directory

[PATCH] fix genenv when using svn based enviroment directory

[Tim Sander]

Hi

When setting the default env of barebox to a svn directory the build stops
with questions on removal and the barebox env is polluted with svn files.

The patch below fixes that.

Tested with 2011.03.1. Newer versions don't boot anymore on my pcm043 :-(.

Signed-off-by: Tim Sander <tim.sander@hbm.com>

---
 scripts/genenv |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/scripts/genenv b/scripts/genenv
index de8b4f1..c6bcd4b 100755
--- a/scripts/genenv
+++ b/scripts/genenv
@@ -13,7 +13,9 @@ tempdir=$(mktemp -d)
 for i in $*; do
        cp -r $i/* $tempdir
 done
+find $tempdir -name .svn |xargs rm -r
+
 $objtree/scripts/bareboxenv -s $tempdir $objtree/barebox_default_env
 
-rm -r $tempdir
+rm -rf $tempdir
 
-- 
1.7.0.4


Hottinger Baldwin Messtechnik GmbH, Im Tiefen See 45, 64293 Darmstadt, Germany | www.hbm.com 

Registered as GmbH (German limited liability corporation) in the commercial register at the local court of Darmstadt, HRB 1147  
Company domiciled in Darmstadt | CEO: Andreas Huellhorst | Chairman of the board: James Charles Webster

Als Gesellschaft mit beschraenkter Haftung eingetragen im Handelsregister des Amtsgerichts Darmstadt unter HRB 1147 
Sitz der Gesellschaft: Darmstadt | Geschaeftsfuehrung: Andreas Huellhorst | Aufsichtsratsvorsitzender: James Charles Webster

The information in this email is confidential. It is intended solely for the addressee. If you are not the intended recipient, please let me know and delete this email.

Die in dieser E-Mail enthaltene Information ist vertraulich und lediglich fur den Empfaenger bestimmt. Sollten Sie nicht der eigentliche Empfaenger sein, informieren Sie mich bitte kurz und loeschen diese E-Mail.


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

Re: [PATCH] fix genenv when using svn based enviroment directory

[Sascha Hauer]

Hi Tim,

On Fri, May 20, 2011 at 03:00:50PM +0200, Tim Sander wrote:
> Hi
> 
> When setting the default env of barebox to a svn directory the build stops
> with questions on removal and the barebox env is polluted with svn files.
> 
> The patch below fixes that.
> 
> Tested with 2011.03.1. Newer versions don't boot anymore on my pcm043 :-(.
> 
> Signed-off-by: Tim Sander <tim.sander@hbm.com>
> 
> ---
>  scripts/genenv |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/scripts/genenv b/scripts/genenv
> index de8b4f1..c6bcd4b 100755
> --- a/scripts/genenv
> +++ b/scripts/genenv
> @@ -13,7 +13,9 @@ tempdir=$(mktemp -d)
>  for i in $*; do
>         cp -r $i/* $tempdir
>  done
> +find $tempdir -name .svn |xargs rm -r
> +
>  $objtree/scripts/bareboxenv -s $tempdir $objtree/barebox_default_env
>  
> -rm -r $tempdir
> +rm -rf $tempdir

Is this second change intended? If yes, why?

Sascha


-- 
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

[PATCH] Re: [PATCH] fix genenv when using svn based enviroment directory

[Tim Sander]

Hi Sascha
> >  $objtree/scripts/bareboxenv -s $tempdir $objtree/barebox_default_env
> > 
> > -rm -r $tempdir
> > +rm -rf $tempdir
> 
> Is this second change intended? If yes, why?
If the barebox environment managed with subversion there are some read only 
directories within this dir, which make rm wait for a confirmation, which is 
more annoying when building with ptxdist.

But i made this change before the first one, i just checked that the -f option 
is not needed anymore since the environment clobbering .svn directories have 
been removed earlier.

So the more minimalistic patch version is attached below.
Best Regards
Tim


Signed-of-by: Tim Sander <tim.sander@hbm.com>
---
 scripts/genenv |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/scripts/genenv b/scripts/genenv
index de8b4f1..65c074e 100755
--- a/scripts/genenv
+++ b/scripts/genenv
@@ -13,6 +13,8 @@ tempdir=$(mktemp -d)
 for i in $*; do
        cp -r $i/* $tempdir
 done
+find $tempdir -name .svn |xargs rm -r
+
 $objtree/scripts/bareboxenv -s $tempdir $objtree/barebox_default_env
 
 rm -r $tempdir
-- 
1.7.0.4

PS: Forgot the list in reply, this is the manual forward.

Hottinger Baldwin Messtechnik GmbH, Im Tiefen See 45, 64293 Darmstadt, Germany | www.hbm.com 

Registered as GmbH (German limited liability corporation) in the commercial register at the local court of Darmstadt, HRB 1147  
Company domiciled in Darmstadt | CEO: Andreas Huellhorst | Chairman of the board: James Charles Webster

Als Gesellschaft mit beschraenkter Haftung eingetragen im Handelsregister des Amtsgerichts Darmstadt unter HRB 1147 
Sitz der Gesellschaft: Darmstadt | Geschaeftsfuehrung: Andreas Huellhorst | Aufsichtsratsvorsitzender: James Charles Webster

The information in this email is confidential. It is intended solely for the addressee. If you are not the intended recipient, please let me know and delete this email.

Die in dieser E-Mail enthaltene Information ist vertraulich und lediglich für den Empfaenger bestimmt. Sollten Sie nicht der eigentliche Empfaenger sein, informieren Sie mich bitte kurz und loeschen diese E-Mail.


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