[PATCH] scripts: socfpga_get_sequencer: convert potential CRLF to LF

[PATCH] scripts: socfpga_get_sequencer: convert potential CRLF to LF

[Steffen Trumtrar]

If u-boot was generated under a DOS system, the sequencer files will have CRLF
linebreaks. The indent-tool has problems with this and as a result the code
will not compile anymore.
Fix up any CRLFs prior with the dos2unix tool.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 scripts/socfpga_get_sequencer | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/socfpga_get_sequencer b/scripts/socfpga_get_sequencer
index fb0ea6628b2a..e0f2e6de2abd 100755
--- a/scripts/socfpga_get_sequencer
+++ b/scripts/socfpga_get_sequencer
@@ -24,6 +24,8 @@ copy_source() {
 
 	unifdef -f ${sequencer_defines} $tgt -o $tgt
 
+	dos2unix $tgt
+
 	echo "	Fixing extern/static keywords..."
 	# Statify all global variables with missing static keyword
 	sed -i 's/^\(extern \|static \|\)\([^*#\/ 	][^(]* [^( ]*\((.*).*$\|=.*;.*$\)\)/static \2/g' $tgt
-- 
2.8.1


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

Re: [PATCH] scripts: socfpga_get_sequencer: convert potential CRLF to LF

[Sascha Hauer]

On Mon, Aug 08, 2016 at 12:51:09PM +0200, Steffen Trumtrar wrote:
> If u-boot was generated under a DOS system, the sequencer files will have CRLF
> linebreaks. The indent-tool has problems with this and as a result the code
> will not compile anymore.
> Fix up any CRLFs prior with the dos2unix tool.
> 
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
>  scripts/socfpga_get_sequencer | 2 ++
>  1 file changed, 2 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/scripts/socfpga_get_sequencer b/scripts/socfpga_get_sequencer
> index fb0ea6628b2a..e0f2e6de2abd 100755
> --- a/scripts/socfpga_get_sequencer
> +++ b/scripts/socfpga_get_sequencer
> @@ -24,6 +24,8 @@ copy_source() {
>  
>  	unifdef -f ${sequencer_defines} $tgt -o $tgt
>  
> +	dos2unix $tgt
> +
>  	echo "	Fixing extern/static keywords..."
>  	# Statify all global variables with missing static keyword
>  	sed -i 's/^\(extern \|static \|\)\([^*#\/ 	][^(]* [^( ]*\((.*).*$\|=.*;.*$\)\)/static \2/g' $tgt
> -- 
> 2.8.1
> 
> 
> _______________________________________________
> 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